Merge branch 'toufic' of github.com:Takishipp/simgrid

[simgrid.git] / src / smpi / colls / smpi_automatic_selector.cpp

diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp
index c79cea5..aece1eb 100644 (file)
--- a/src/smpi/colls/smpi_automatic_selector.cpp
+++ b/src/smpi/colls/smpi_automatic_selector.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -18,53 +18,54 @@
              type=PJ_type_event_new(#cat, PJ_type_get_root());\
          }\
          char cont_name[25];\
-         snprintf(cont_name,25, "rank-%d", smpi_process_index());\
-         val_t value = PJ_value_get_or_new(mpi_coll_##cat##_description[i].name,"1.0 1.0 1.0", type);\
-         new_pajeNewEvent (SIMIX_get_clock(), PJ_container_get(cont_name), type, value);\
+         snprintf(cont_name,25, "rank-%d", smpi_process()->index());\
+         val_t value = PJ_value_get_or_new(Colls::mpi_coll_##cat##_description[i].name,"1.0 1.0 1.0", type);\
+         new NewEvent (SIMIX_get_clock(), PJ_container_get(cont_name), type, value);\
       }
 
-
 #define AUTOMATIC_COLL_BENCH(cat, ret, args, args2)\
-    ret smpi_coll_tuned_ ## cat ## _ ## automatic(COLL_UNPAREN args)\
+    ret Coll_ ## cat ## _automatic:: cat (COLL_UNPAREN args)\
 {\
   double time1, time2, time_min=DBL_MAX;\
   int min_coll=-1, global_coll=-1;\
   int i;\
   double buf_in, buf_out, max_min=DBL_MAX;\
-  for (i = 0; mpi_coll_##cat##_description[i].name; i++){\
-      if(!strcmp(mpi_coll_##cat##_description[i].name, "automatic"))continue;\
-      if(!strcmp(mpi_coll_##cat##_description[i].name, "default"))continue;\
-      smpi_mpi_barrier(comm);\
+  for (i = 0; Colls::mpi_coll_##cat##_description[i].name; i++){\
+      if(!strcmp(Colls::mpi_coll_##cat##_description[i].name, "automatic"))continue;\
+      if(!strcmp(Colls::mpi_coll_##cat##_description[i].name, "default"))continue;\
+      Coll_barrier_default::barrier(comm);\
       TRACE_AUTO_COLL(cat)\
       time1 = SIMIX_get_clock();\
       try {\
       ((int (*) args)\
-          mpi_coll_##cat##_description[i].coll) args2 ;\
+          Colls::mpi_coll_##cat##_description[i].coll) args2 ;\
       }\
       catch (std::exception& ex) {\
         continue;\
       }\
       time2 = SIMIX_get_clock();\
       buf_out=time2-time1;\
-      smpi_mpi_reduce((void*)&buf_out,(void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0,comm );\
+      Coll_reduce_default::reduce((void*)&buf_out,(void*)&buf_in, 1, MPI_DOUBLE, MPI_MAX, 0,comm );\
       if(time2-time1<time_min){\
           min_coll=i;\
           time_min=time2-time1;\
       }\
-      if(smpi_comm_rank(comm)==0){\
+      if(comm->rank()==0){\
           if(buf_in<max_min){\
               max_min=buf_in;\
               global_coll=i;\
           }\
       }\
   }\
-  if(smpi_comm_rank(comm)==0){\
-      XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max",mpi_coll_##cat##_description[min_coll].name, time_min,mpi_coll_##cat##_description[global_coll].name, max_min);\
+  if(comm->rank()==0){\
+      XBT_WARN("For rank 0, the quickest was %s : %f , but global was %s : %f at max",Colls::mpi_coll_##cat##_description[min_coll].name, time_min,Colls::mpi_coll_##cat##_description[global_coll].name, max_min);\
   }else\
-  XBT_WARN("The quickest %s was %s on rank %d and took %f",#cat,mpi_coll_##cat##_description[min_coll].name, smpi_comm_rank(comm), time_min);\
+  XBT_WARN("The quickest %s was %s on rank %d and took %f",#cat,Colls::mpi_coll_##cat##_description[min_coll].name, comm->rank(), time_min);\
   return (min_coll!=-1)?MPI_SUCCESS:MPI_ERR_INTERN;\
-}\
+}
 
+namespace simgrid{
+namespace smpi{
 
 COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHERV_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_disps, recv_type, comm));
 COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLREDUCE_SIG, (sbuf, rbuf, rcount, dtype, op, comm));
@@ -77,3 +78,6 @@ COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SIG,(buf,rbuf, count, datatype, op,
 COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SCATTER_SIG ,(sbuf,rbuf, rcounts,dtype,op,comm));
 COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_SCATTER_SIG ,(sendbuf, sendcount, sendtype,recvbuf, recvcount, recvtype,root, comm));
 COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BARRIER_SIG,(comm));
+
+}
+}