X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..cfbe67c7c286e364fd628fd361dac67690bfe333:/src/smpi/colls/allreduce-smp-binomial.c diff --git a/src/smpi/colls/allreduce-smp-binomial.c b/src/smpi/colls/allreduce-smp-binomial.c index 97183fb5d4..25f9837321 100644 --- a/src/smpi/colls/allreduce-smp-binomial.c +++ b/src/smpi/colls/allreduce-smp-binomial.c @@ -11,11 +11,6 @@ It uses 2-layer communication: binomial for both intra-communication inter-communication*/ -/* change number of core per smp-node - we assume that number of core per process will be the same for all implementations */ -#ifndef NUM_CORE -#define NUM_CORE 8 -#endif /* ** NOTE ** Use -DMPICH2 if this code does not compile. @@ -41,11 +36,13 @@ int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf, int tag = COLL_TAG_ALLREDUCE; int mask, src, dst; - - 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)); + } MPI_Status status; comm_size=smpi_comm_size(comm);