Add/update copyright notices.

[simgrid.git] / src / smpi / colls / reduce-NTSL.c

diff --git a/src/smpi/colls/reduce-NTSL.c b/src/smpi/colls/reduce-NTSL.c
index a462533..4f1dc0d 100644 (file)
--- a/src/smpi/colls/reduce-NTSL.c
+++ b/src/smpi/colls/reduce-NTSL.c
@@ -1,3 +1,9 @@
+/* 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>
 
@@ -10,7 +16,7 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
                                 MPI_Datatype datatype, MPI_Op op, int root,
                                 MPI_Comm comm)
 {
-  int tag = 50;
+  int tag = COLL_TAG_REDUCE;
   MPI_Status status;
   MPI_Request *send_request_array;
   MPI_Request *recv_request_array;
@@ -21,8 +27,8 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
   MPI_Aint extent;
   extent = smpi_datatype_get_extent(datatype);
 
-  rank = smpi_comm_rank(MPI_COMM_WORLD);
-  size = smpi_comm_size(MPI_COMM_WORLD);
+  rank = smpi_comm_rank(comm);
+  size = smpi_comm_size(comm);
 
   /* source node and destination nodes (same through out the functions) */
   int to = (rank - 1 + size) % size;
@@ -66,12 +72,12 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
   if (count <= segment) {
     if (rank == root) {
       smpi_mpi_recv(tmp_buf, count, datatype, from, tag, comm, &status);
-      star_reduction(op, tmp_buf, rbuf, &count, &datatype);
+      smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
     } else if (rank == ((root - 1 + size) % size)) {
       smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
     } else {
       smpi_mpi_recv(tmp_buf, count, datatype, from, tag, comm, &status);
-      star_reduction(op, tmp_buf, rbuf, &count, &datatype);
+      smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
       smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
     }
     free(tmp_buf);
@@ -97,7 +103,7 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
       }
       for (i = 0; i < pipe_length; i++) {
         smpi_mpi_wait(&recv_request_array[i], &status);
-        star_reduction(op, tmp_buf + (i * increment), (char *)rbuf + (i * increment),
+        smpi_op_apply(op, tmp_buf + (i * increment), (char *)rbuf + (i * increment),
                        &segment, &datatype);
       }
     }
@@ -119,7 +125,7 @@ int smpi_coll_tuned_reduce_NTSL(void *buf, void *rbuf, int count,
       }
       for (i = 0; i < pipe_length; i++) {
         smpi_mpi_wait(&recv_request_array[i], &status);
-        star_reduction(op, tmp_buf + (i * increment), (char *)rbuf + (i * increment),
+        smpi_op_apply(op, tmp_buf + (i * increment), (char *)rbuf + (i * increment),
                        &segment, &datatype);
         send_request_array[i] = smpi_mpi_isend((char *) rbuf + (i * increment), segment, datatype, to,
                   (tag + i), comm);