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

diff --git a/src/smpi/colls/allreduce-rdb.c b/src/smpi/colls/allreduce-rdb.c
index fec95bc5f9..85a31efd54 100644
--- a/src/smpi/colls/allreduce-rdb.c
+++ b/src/smpi/colls/allreduce-rdb.c
@@ -1,10 +1,16 @@
-#include "colls.h"
+/* Copyright (c) 2013-2014. 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 <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 = COLL_TAG_ALLREDUCE;
   int mask, dst, pof2, newrank, rem, newdst;
   MPI_Aint extent, lb;
   MPI_Status status;
@@ -22,18 +28,12 @@ int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
   nprocs=smpi_comm_size(comm);
   rank=smpi_comm_rank(comm);
 
-  smpi_datatype_extent(dtype,&lb, &extent);
-  tmp_buf = (void *) malloc(count * extent);
-  if (!tmp_buf) {
-    printf("Could not allocate memory for tmp_buf\n");
-    return 1;
-  }
+  smpi_datatype_extent(dtype, &lb, &extent);
+  tmp_buf = (void *) smpi_get_tmp_sendbuffer(count * extent);
 
   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)
@@ -64,7 +64,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;
@@ -102,10 +102,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,
@@ -125,6 +125,6 @@ int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
       smpi_mpi_recv(rbuff, count, dtype, rank + 1, tag, comm, &status);
   }
 
-  free(tmp_buf);
-  return 0;
+  smpi_free_tmp_buffer(tmp_buf);
+  return MPI_SUCCESS;
 }