First works on the datatypes. Still missing a lot.

[simgrid.git] / src / smpi / colls / reduce-arrival-pattern-aware.cpp

diff --git a/src/smpi/colls/reduce-arrival-pattern-aware.cpp b/src/smpi/colls/reduce-arrival-pattern-aware.cpp
index 51ac468..3486dfb 100644 (file)
--- a/src/smpi/colls/reduce-arrival-pattern-aware.cpp
+++ b/src/smpi/colls/reduce-arrival-pattern-aware.cpp
@@ -129,7 +129,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
 
           Request::send(header_buf, HEADER_SIZE, MPI_INT, to, tag, comm);
           Request::recv(tmp_buf, count, datatype, from, tag, comm, &status);
-          if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuf, &count, &datatype);
+          if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuf, &count, datatype);
         }
       }                         /* while loop */
     }
@@ -180,7 +180,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
         }
         from = header_buf[myordering - 1];
         Request::recv(tmp_buf, count, datatype, from, tag, comm, &status);
-        if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuf, &count, &datatype);
+        if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuf, &count, datatype);
         Request::send(rbuf, count, datatype, to, tag, comm);
       }
     }                           /* non-root */
@@ -257,7 +257,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
             Request::recv(tmp_buf + (i * increment), segment, datatype, from, tag,
                      comm, &status);
             if(op!=MPI_OP_NULL) op->apply( tmp_buf + (i * increment),
-                           (char *)rbuf + (i * increment), &segment, &datatype);
+                           (char *)rbuf + (i * increment), &segment, datatype);
           }
         }
       }                         /* while loop (sent_count < size-1 ) */
@@ -311,7 +311,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
         for (i = 0; i < pipe_length; i++) {
           Request::wait(&recv_request_array[i], MPI_STATUS_IGNORE);
           if(op!=MPI_OP_NULL) op->apply( tmp_buf + (i * increment), (char *)rbuf + (i * increment),
-                         &segment, &datatype);
+                         &segment, datatype);
           send_request_array[i]=Request::isend((char *)rbuf + (i * increment), segment, datatype, to, tag, comm);
         }
         Request::waitall((pipe_length), send_request_array, send_status_array);