X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd37de87d7609dfe0b73aee81f3dd8c571b6f2db..36fa571a13985879dc627c70ecc2340af606aa42:/src/smpi/colls/smpi_intel_mpi_selector.c diff --git a/src/smpi/colls/smpi_intel_mpi_selector.c b/src/smpi/colls/smpi_intel_mpi_selector.c index e2fbbe9271..bdcb1b70cd 100644 --- a/src/smpi/colls/smpi_intel_mpi_selector.c +++ b/src/smpi/colls/smpi_intel_mpi_selector.c @@ -8,10 +8,8 @@ #include "colls_private.h" - // This selector is based on information gathered on the Stampede cluster, with Intel MPI 4.1.3.049, and from the intel reference manual. The data was gathered launching runs with 1,2,4,8,16 processes per node. - #define INTEL_MAX_NB_THRESHOLDS 32 #define INTEL_MAX_NB_NUMPROCS 12 #define INTEL_MAX_NB_PPN 5 /* 1 2 4 8 16 ppn */ @@ -46,8 +44,7 @@ MPI_Allreduce 7 - Shumilin's ring algorithm 8 - Ring algorithm - -//as Shumilin's ring algorithm is unknown, default to ring' + as Shumilin's ring algorithm is unknown, default to ring' */ @@ -2278,8 +2275,8 @@ ret smpi_coll_tuned_ ## cat ## _impi (COLL_UNPAREN args)\ if (smpi_comm_is_uniform(comm)) {\ local_size = smpi_comm_size(smpi_comm_get_intra_comm(comm));\ }\ - while(local_size!=intel_ ## cat ## _table[i].ppn\ - && i < INTEL_MAX_NB_PPN)\ + while(i < INTEL_MAX_NB_PPN &&\ + local_size!=intel_ ## cat ## _table[i].ppn)\ i++;\ if(i==INTEL_MAX_NB_PPN) i=0;\ while(comm_size>intel_ ## cat ## _table[i].elems[j].max_num_proc\