Commit b91a45ae authored by PRUVOST Florent's avatar PRUVOST Florent

save number of MPI process and print it with main informations in timings

parent f7f2eda1
...@@ -117,7 +117,7 @@ enum iparam_examples { ...@@ -117,7 +117,7 @@ enum iparam_examples {
IPARAM_INVERSE, IPARAM_INVERSE,
IPARAM_NCUDAS, IPARAM_NCUDAS,
IPARAM_NDOM, IPARAM_NMPI,
IPARAM_P, /* Parameter for 2D cyclic distribution */ IPARAM_P, /* Parameter for 2D cyclic distribution */
IPARAM_Q, /* Parameter for 2D cyclic distribution */ IPARAM_Q, /* Parameter for 2D cyclic distribution */
/* Added for StarPU version */ /* Added for StarPU version */
...@@ -182,7 +182,7 @@ static void init_iparam(int iparam[IPARAM_SIZEOF]){ ...@@ -182,7 +182,7 @@ static void init_iparam(int iparam[IPARAM_SIZEOF]){
iparam[IPARAM_INVERSE ] = 0; iparam[IPARAM_INVERSE ] = 0;
iparam[IPARAM_NCUDAS ] = 0; iparam[IPARAM_NCUDAS ] = 0;
iparam[IPARAM_NDOM ] = 1; iparam[IPARAM_NMPI ] = 1;
iparam[IPARAM_P ] = 1; iparam[IPARAM_P ] = 1;
iparam[IPARAM_Q ] = 1; iparam[IPARAM_Q ] = 1;
iparam[IPARAM_PROFILE ] = 0; iparam[IPARAM_PROFILE ] = 0;
......
...@@ -400,6 +400,10 @@ print_header(char *prog_name, int * iparam) { ...@@ -400,6 +400,10 @@ print_header(char *prog_name, int * iparam) {
"# CHAMELEON %d.%d.%d, %s\n" "# CHAMELEON %d.%d.%d, %s\n"
"# Nb threads: %d\n" "# Nb threads: %d\n"
"# Nb GPUs: %d\n" "# Nb GPUs: %d\n"
#if defined(CHAMELEON_USE_MPI)
"# Nb mpi: %d\n"
"# PxQ: %dx%d\n"
#endif
"# NB: %d\n" "# NB: %d\n"
"# IB: %d\n" "# IB: %d\n"
"# eps: %e\n" "# eps: %e\n"
...@@ -410,6 +414,10 @@ print_header(char *prog_name, int * iparam) { ...@@ -410,6 +414,10 @@ print_header(char *prog_name, int * iparam) {
prog_name, prog_name,
iparam[IPARAM_THRDNBR], iparam[IPARAM_THRDNBR],
iparam[IPARAM_NCUDAS], iparam[IPARAM_NCUDAS],
#if defined(CHAMELEON_USE_MPI)
iparam[IPARAM_NMPI],
iparam[IPARAM_P], iparam[IPARAM_Q],
#endif
iparam[IPARAM_NB], iparam[IPARAM_NB],
iparam[IPARAM_IB], iparam[IPARAM_IB],
eps ); eps );
...@@ -472,7 +480,7 @@ main(int argc, char *argv[]) { ...@@ -472,7 +480,7 @@ main(int argc, char *argv[]) {
iparam[IPARAM_INVERSE ] = 0; iparam[IPARAM_INVERSE ] = 0;
iparam[IPARAM_NCUDAS ] = 0; iparam[IPARAM_NCUDAS ] = 0;
iparam[IPARAM_NDOM ] = 1; iparam[IPARAM_NMPI ] = 1;
iparam[IPARAM_P ] = 1; iparam[IPARAM_P ] = 1;
iparam[IPARAM_Q ] = 1; iparam[IPARAM_Q ] = 1;
iparam[IPARAM_PROFILE ] = 0; iparam[IPARAM_PROFILE ] = 0;
...@@ -615,6 +623,7 @@ main(int argc, char *argv[]) { ...@@ -615,6 +623,7 @@ main(int argc, char *argv[]) {
#if defined(CHAMELEON_USE_MPI) #if defined(CHAMELEON_USE_MPI)
MPI_Comm_size( MPI_COMM_WORLD, &nbnode ); MPI_Comm_size( MPI_COMM_WORLD, &nbnode );
iparam[IPARAM_NMPI] = nbnode;
/* Check P */ /* Check P */
if ( (iparam[IPARAM_P] > 1) && if ( (iparam[IPARAM_P] > 1) &&
(nbnode % iparam[IPARAM_P] != 0) ) { (nbnode % iparam[IPARAM_P] != 0) ) {
......
...@@ -43,7 +43,7 @@ enum iparam_timing { ...@@ -43,7 +43,7 @@ enum iparam_timing {
IPARAM_INVERSE, IPARAM_INVERSE,
IPARAM_NCUDAS, IPARAM_NCUDAS,
IPARAM_NDOM, IPARAM_NMPI,
IPARAM_P, /* Parameter for 2D cyclic distribution */ IPARAM_P, /* Parameter for 2D cyclic distribution */
IPARAM_Q, /* Parameter for 2D cyclic distribution */ IPARAM_Q, /* Parameter for 2D cyclic distribution */
/* Added for StarPU version */ /* Added for StarPU version */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment