X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..954676b700e711f38ec4d286d33d5427d3f4ca46:/src/smpi/colls/allgather-smp-simple.c diff --git a/src/smpi/colls/allgather-smp-simple.c b/src/smpi/colls/allgather-smp-simple.c index 1a38857619..e54c75b5b9 100644 --- a/src/smpi/colls/allgather-smp-simple.c +++ b/src/smpi/colls/allgather-smp-simple.c @@ -5,9 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "colls_private.h" -#ifndef NUM_CORE -#define NUM_CORE 8 -#endif int smpi_coll_tuned_allgather_smp_simple(void *send_buf, int scount, MPI_Datatype stype, void *recv_buf, @@ -17,10 +14,13 @@ int smpi_coll_tuned_allgather_smp_simple(void *send_buf, int scount, int src, dst, comm_size, rank; comm_size = smpi_comm_size(comm); - int num_core = simcall_host_get_core(SIMIX_host_self()); - // do we use the default one or the number of cores in the platform ? - // if the number of cores is one, the platform may be simulated with 1 node = 1 core - if (num_core == 1) num_core = NUM_CORE; + if(smpi_comm_get_leaders_comm(comm)==MPI_COMM_NULL){ + smpi_comm_init_smp(comm); + } + int num_core=1; + if (smpi_comm_is_uniform(comm)){ + num_core = smpi_comm_size(smpi_comm_get_intra_comm(comm)); + } if(comm_size%num_core) THROWF(arg_error,0, "allgather SMP simple algorithm can't be used with non multiple of NUM_CORE=%d number of processes ! ", num_core);