Add a smpi/shared-malloc-blocksize option. This is relevant only when global shared...

[simgrid.git] / src / smpi / colls / reduce / reduce-NTSL.cpp

diff --git a/src/smpi/colls/reduce/reduce-NTSL.cpp b/src/smpi/colls/reduce/reduce-NTSL.cpp
index 22823123ebc911b7eede9cc394a077188b2d50ff..c2ac62bb0d8c4ea5fe13d4c470c35f2146f11741 100644 (file)
--- a/src/smpi/colls/reduce/reduce-NTSL.cpp
+++ b/src/smpi/colls/reduce/reduce-NTSL.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. 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
@@ -12,7 +12,9 @@ int reduce_NTSL_segment_size_in_byte = 8192;
 /* Non-topology-specific pipelined linear-bcast function 
    0->1, 1->2 ,2->3, ....., ->last node : in a pipeline fashion
 */
-int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
+namespace simgrid{
+namespace smpi{
+int Coll_reduce_NTSL::reduce(void *buf, void *rbuf, int count,
                                 MPI_Datatype datatype, MPI_Op op, int root,
                                 MPI_Comm comm)
 {
@@ -142,7 +144,7 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
   /* when count is not divisible by block size, use default BCAST for the remainder */
   if ((remainder != 0) && (count > segment)) {
     XBT_WARN("MPI_reduce_NTSL use default MPI_reduce.");         
-    smpi_mpi_reduce((char *)buf + (pipe_length * increment),
+    Coll_reduce_default::reduce((char *)buf + (pipe_length * increment),
                (char *)rbuf + (pipe_length * increment), remainder, datatype, op, root,
                comm);
   }
@@ -150,3 +152,5 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
   free(tmp_buf);
   return MPI_SUCCESS;
 }
+}
+}