Merge branch 'master' into fix/execute_benched

[simgrid.git] / src / smpi / colls / allreduce / allreduce-redbcast.cpp

diff --git a/src/smpi/colls/allreduce/allreduce-redbcast.cpp b/src/smpi/colls/allreduce/allreduce-redbcast.cpp
index 26b9585..6d72e76 100644 (file)
--- a/src/smpi/colls/allreduce/allreduce-redbcast.cpp
+++ b/src/smpi/colls/allreduce/allreduce-redbcast.cpp
@@ -1,16 +1,19 @@
-/* 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
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "../colls_private.h"
-
-int smpi_coll_tuned_allreduce_redbcast(void *buf, void *buf2, int count,
+#include "../colls_private.hpp"
+namespace simgrid{
+namespace smpi{
+int Coll_allreduce_redbcast::allreduce(void *buf, void *buf2, int count,
                                        MPI_Datatype datatype, MPI_Op op,
                                        MPI_Comm comm)
 {
-  mpi_coll_reduce_fun(buf, buf2, count, datatype, op, 0, comm);
-  mpi_coll_bcast_fun(buf2, count, datatype, 0, comm);
+  Colls::reduce(buf, buf2, count, datatype, op, 0, comm);
+  Colls::bcast(buf2, count, datatype, 0, comm);
   return MPI_SUCCESS;
 }
+}
+}