From: degomme <augustin.degomme@unibas.ch>
Date: Thu, 21 Jan 2016 09:07:56 +0000 (+0100)
Subject: Using openMPI selector in this case possibly led to issues, so use single implems... 
X-Git-Tag: v3_13~1156
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cc5c34bd9c94874b4f6e767cfdee7a7c70dc62c3

Using openMPI selector in this case possibly led to issues, so use single implems instead
---

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 497f383505..21a8356484 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -1086,14 +1086,12 @@ int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices,
 void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root,
                     MPI_Comm comm)
 {
-  // use openMPI selector as default one, as naive one was removed
-    smpi_coll_tuned_bcast_ompi(buf, count, datatype, root, comm);
+    smpi_coll_tuned_bcast_binomial_tree(buf, count, datatype, root, comm);
 }
 
 void smpi_mpi_barrier(MPI_Comm comm)
 {
-  // use openMPI selector as default one, as naive one was removed
-    smpi_coll_tuned_barrier_ompi(comm);
+    smpi_coll_tuned_barrier_ompi_basic_linear(comm);
 }
 
 void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index 96563752f6..e685e31c10 100644
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -68,8 +68,8 @@ COLL_SCATTERS(COLL_DESCRIPTION, COLL_COMMA),
 
 s_mpi_coll_description_t mpi_coll_barrier_description[] = {
   {"default",
-   "barrier default collective - ompi selector",
-   smpi_coll_tuned_barrier_ompi},
+   "barrier default collective",
+   smpi_mpi_barrier},
 COLL_BARRIERS(COLL_DESCRIPTION, COLL_COMMA),
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
@@ -97,8 +97,8 @@ COLL_ALLTOALLVS(COLL_DESCRIPTION, COLL_COMMA),
 
 s_mpi_coll_description_t mpi_coll_bcast_description[] = {
   {"default",
-   "bcast default collective - ompi selector",
-   smpi_coll_tuned_bcast_ompi},
+   "bcast default collective ",
+   smpi_mpi_bcast},
 COLL_BCASTS(COLL_DESCRIPTION, COLL_COMMA),
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };