X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/befbbbe1fbb31663a8f91e24ce12df271cf4ae79..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp

diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
index ff4e5d0f37..c53fc38e24 100644
--- a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
@@ -1,17 +1,16 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2022. 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"
 /* IMPLEMENTED BY PITCH PATARASUK
-   Non-topoloty-specific (however, number of cores/node need to be changed)
+   Non-topology-specific (however, number of cores/node need to be changed)
    all-reduce operation designed for smp clusters
    It uses 2-layer communication: binomial for both intra-communication
    inter-communication*/
 
-
 /* ** NOTE **
    Use -DMPICH2 if this code does not compile.
    MPICH1 code also work on MPICH2 on our cluster and the performance are similar.
@@ -21,20 +20,18 @@
 //#include <star-reduction.c>
 
 /*
-This fucntion performs all-reduce operation as follow.
+This function performs all-reduce operation as follow.
 1) binomial_tree reduce inside each SMP node
 2) binomial_tree reduce intra-communication between root of each SMP node
 3) binomial_tree bcast intra-communication between root of each SMP node
 4) binomial_tree bcast inside each SMP node
 */
-namespace simgrid{
-namespace smpi{
-int Coll_allreduce_smp_binomial::allreduce(void *send_buf, void *recv_buf,
-                                           int count, MPI_Datatype dtype,
-                                           MPI_Op op, MPI_Comm comm)
+namespace simgrid::smpi {
+int allreduce__smp_binomial(const void *send_buf, void *recv_buf,
+                            int count, MPI_Datatype dtype,
+                            MPI_Op op, MPI_Comm comm)
 {
   int comm_size, rank;
-  void *tmp_buf;
   int tag = COLL_TAG_ALLREDUCE;
   int mask, src, dst;
 
@@ -51,7 +48,7 @@ int Coll_allreduce_smp_binomial::allreduce(void *send_buf, void *recv_buf,
   rank=comm->rank();
   MPI_Aint extent, lb;
   dtype->extent(&lb, &extent);
-  tmp_buf = (void *) smpi_get_tmp_sendbuffer(count * extent);
+  unsigned char* tmp_buf = smpi_get_tmp_sendbuffer(count * extent);
 
   /* compute intra and inter ranking */
   int intra_rank, inter_rank;
@@ -155,5 +152,4 @@ int Coll_allreduce_smp_binomial::allreduce(void *send_buf, void *recv_buf,
   smpi_free_tmp_buffer(tmp_buf);
   return MPI_SUCCESS;
 }
-}
-}
+} // namespace simgrid::smpi