Merge branch 'tracemgrsplit' into 'master'

[simgrid.git] / src / smpi / colls / allreduce / allreduce-smp-binomial-pipeline.cpp

diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
index e372373..d9156b3 100644 (file)
--- a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2017. 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"
 /* IMPLEMENTED BY PITCH PATARASUK
    Non-topoloty-specific (however, number of cores/node need to be changed)
    all-reduce operation designed for smp clusters
@@ -40,13 +40,12 @@ This fucntion performs all-reduce operation as follow. ** in a pipeline fashion
 */
 namespace simgrid{
 namespace smpi{
-int Coll_allreduce_smp_binomial_pipeline::allreduce(void *send_buf,
+int Coll_allreduce_smp_binomial_pipeline::allreduce(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;
   MPI_Status status;
@@ -62,7 +61,7 @@ int Coll_allreduce_smp_binomial_pipeline::allreduce(void *send_buf,
   rank = comm->rank();
   MPI_Aint extent;
   extent = dtype->get_extent();
-  tmp_buf = (void *) smpi_get_tmp_sendbuffer(count * extent);
+  unsigned char* tmp_buf = smpi_get_tmp_sendbuffer(count * extent);
 
   int intra_rank, inter_rank;
   intra_rank = rank % num_core;