Fix dead assignments.

[simgrid.git] / src / smpi / colls / allreduce-rab1.c

diff --git a/src/smpi/colls/allreduce-rab1.c b/src/smpi/colls/allreduce-rab1.c
index ae72f74..2cfab0a 100644 (file)
--- a/src/smpi/colls/allreduce-rab1.c
+++ b/src/smpi/colls/allreduce-rab1.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>
 
 #include "colls_private.h"
 //#include <star-reduction.c>
 


@@ -8,7 +14,7 @@ int smpi_coll_tuned_allreduce_rab1(void *sbuff, void *rbuff,
 {
   MPI_Status status;
   MPI_Aint extent;
 {
   MPI_Status status;
   MPI_Aint extent;

-  int tag = 4321, rank, nprocs, send_size, newcnt, share;
+  int tag = COLL_TAG_ALLREDUCE, rank, nprocs, send_size, newcnt, share;

   int pof2 = 1, mask, send_idx, recv_idx, dst, send_cnt, recv_cnt;
 
   void *recv, *tmp_buf;
   int pof2 = 1, mask, send_idx, recv_idx, dst, send_cnt, recv_cnt;
 
   void *recv, *tmp_buf;


@@ -16,6 +22,9 @@ int smpi_coll_tuned_allreduce_rab1(void *sbuff, void *rbuff,
   rank = smpi_comm_rank(comm);
   nprocs = smpi_comm_size(comm);
 
   rank = smpi_comm_rank(comm);
   nprocs = smpi_comm_size(comm);
 

+  if((nprocs&(nprocs-1)))
+    THROWF(arg_error,0, "allreduce rab1 algorithm can't be used with non power of two number of processes ! ");
+

   extent = smpi_datatype_get_extent(dtype);
 
   pof2 = 1;
   extent = smpi_datatype_get_extent(dtype);
 
   pof2 = 1;


@@ -23,7 +32,6 @@ int smpi_coll_tuned_allreduce_rab1(void *sbuff, void *rbuff,
     pof2 <<= 1;
   pof2 >>= 1;
 
     pof2 <<= 1;
   pof2 >>= 1;
 

-  mask = 1;

   send_idx = recv_idx = 0;
 
   // uneven count
   send_idx = recv_idx = 0;
 
   // uneven count