Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / smpi / colls / alltoallv / alltoallv-bruck.cpp

diff --git a/src/smpi/colls/alltoallv/alltoallv-bruck.cpp b/src/smpi/colls/alltoallv/alltoallv-bruck.cpp
index 3a6f9e5..c80bffe 100644 (file)
--- a/src/smpi/colls/alltoallv/alltoallv-bruck.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-bruck.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2019. 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"
+#include "../colls_private.hpp"
 
 /**
  * Alltoall Bruck
@@ -13,7 +13,9 @@
  * FIXME: uh, check smpi_pmpi again, but this routine is called for > 12, not
  * less...
  **/
-int smpi_coll_tuned_alltoallv_bruck(void *sendbuf, int *sendcounts, int *senddisps,
+namespace simgrid{
+namespace smpi{
+int Coll_alltoallv_bruck::alltoallv(void *sendbuf, int *sendcounts, int *senddisps,
                                    MPI_Datatype sendtype, void *recvbuf,
                                    int *recvcounts, int *recvdisps, MPI_Datatype recvtype,
                                    MPI_Comm comm)
@@ -80,7 +82,7 @@ int smpi_coll_tuned_alltoallv_bruck(void *sendbuf, int *sendcounts, int *senddis
               count++;
             }
             /* Wait for them all. */
-            //smpi_mpi_startall(count, requests);
+            //Colls::startall(count, requests);
             XBT_DEBUG("<%d> wait for %d requests", rank, count);
             Request::waitall(count, requests, MPI_STATUSES_IGNORE);
             xbt_free(requests);
@@ -90,3 +92,5 @@ int smpi_coll_tuned_alltoallv_bruck(void *sendbuf, int *sendcounts, int *senddis
   }
   return MPI_SUCCESS;
 }
+}
+}