X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f04fa5306f52960db709bb520c49e9f4ecec000..da62b5cbd53ece70108a4f0eba4757e75f3dc00a:/src/smpi/colls/allreduce-rdb.c

diff --git a/src/smpi/colls/allreduce-rdb.c b/src/smpi/colls/allreduce-rdb.c
index 204de0291f..44717adf41 100644
--- a/src/smpi/colls/allreduce-rdb.c
+++ b/src/smpi/colls/allreduce-rdb.c
@@ -1,10 +1,10 @@
-#include "colls.h"
+#include "colls_private.h"
 //#include <star-reduction.c>
 
 int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
                                   MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)
 {
-  int nprocs, rank, type_size, tag = 543;
+  int nprocs, rank, tag = 543;
   int mask, dst, pof2, newrank, rem, newdst;
   MPI_Aint extent, lb;
   MPI_Status status;
@@ -28,8 +28,6 @@ int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
   smpi_mpi_sendrecv(sbuff, count, dtype, rank, 500,
                rbuff, count, dtype, rank, 500, comm, &status);
 
-  type_size=smpi_datatype_size(dtype);
-
   // find nearest power-of-two less than or equal to comm_size
   pof2 = 1;
   while (pof2 <= nprocs)
@@ -60,7 +58,7 @@ int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
       // do the reduction on received data. since the
       // ordering is right, it doesn't matter whether
       // the operation is commutative or not.
-      star_reduction(op, tmp_buf, rbuff, &count, &dtype);
+      smpi_op_apply(op, tmp_buf, rbuff, &count, &dtype);
 
       // change the rank 
       newrank = rank / 2;
@@ -98,10 +96,10 @@ int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
       // we assume it is commuttive op
       //      if (op -> op_commute  || (dst < rank))
       if ((dst < rank)) {
-        star_reduction(op, tmp_buf, rbuff, &count, &dtype);
+        smpi_op_apply(op, tmp_buf, rbuff, &count, &dtype);
       } else                    // op is noncommutative and the order is not right
       {
-        star_reduction(op, rbuff, tmp_buf, &count, &dtype);
+        smpi_op_apply(op, rbuff, tmp_buf, &count, &dtype);
 
         // copy result back into recvbuf
         smpi_mpi_sendrecv(tmp_buf, count, dtype, rank, tag, rbuff, count,