X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/smpi/colls/bcast-SMP-binary.c

diff --git a/src/smpi/colls/bcast-SMP-binary.c b/src/smpi/colls/bcast-SMP-binary.c
index 19cf892bef..5264ca3648 100644
--- a/src/smpi/colls/bcast-SMP-binary.c
+++ b/src/smpi/colls/bcast-SMP-binary.c
@@ -5,9 +5,7 @@
  * 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 bcast_SMP_binary_segment_byte = 8192;
 
@@ -27,13 +25,17 @@ int smpi_coll_tuned_bcast_SMP_binary(void *buf, int count,
 
   rank = smpi_comm_rank(comm);
   size = smpi_comm_size(comm);
-  int host_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 (host_num_core == 1) host_num_core = NUM_CORE;
-
-  if(size%host_num_core)
-    THROWF(arg_error,0, "bcast SMP binary can't be used with non multiple of NUM_CORE=%d number of processes ! ",host_num_core);
+  if(smpi_comm_get_leaders_comm(comm)==MPI_COMM_NULL){
+    smpi_comm_init_smp(comm);
+  }
+  int host_num_core=1;
+  if (smpi_comm_is_uniform(comm)){
+    host_num_core = smpi_comm_size(smpi_comm_get_intra_comm(comm));
+  }else{
+    //implementation buggy in this case
+    return smpi_coll_tuned_bcast_mpich( buf , count, datatype,
+              root, comm);
+  }
 
   int segment = bcast_SMP_binary_segment_byte / extent;
   int pipe_length = count / segment;