welcome simgrid::smpi::Request

[simgrid.git] / src / smpi / colls / reduce-mvapich-knomial.cpp

diff --git a/src/smpi/colls/reduce-mvapich-knomial.cpp b/src/smpi/colls/reduce-mvapich-knomial.cpp
index 45418ee..837da1e 100644 (file)
--- a/src/smpi/colls/reduce-mvapich-knomial.cpp
+++ b/src/smpi/colls/reduce-mvapich-knomial.cpp
@@ -56,8 +56,8 @@ static int MPIR_Reduce_knomial_trace(int root, int reduce_knomial_factor,
     int orig_mask=0x1; 
     int recv_iter=0, send_iter=0;
     int *knomial_reduce_src_array=NULL;
-    comm_size =  smpi_comm_size(comm);
-    rank = smpi_comm_rank(comm);
+    comm_size =  comm->size();
+    rank = comm->rank();
 
     lroot = root;
     relative_rank = (rank - lroot + comm_size) % comm_size;
@@ -138,7 +138,7 @@ int smpi_coll_tuned_reduce_mvapich2_knomial (
 
     if (count == 0) return MPI_SUCCESS;
 
-    rank = smpi_comm_rank(comm);
+    rank = comm->rank();
 
     /* Create a temporary buffer */
 
@@ -182,7 +182,7 @@ int smpi_coll_tuned_reduce_mvapich2_knomial (
         while(recv_iter  < expected_recv_count) {
             src = src_array[expected_recv_count - (recv_iter+1)];
 
-            requests[recv_iter]=smpi_mpi_irecv (tmp_buf[recv_iter], count, datatype ,src,
+            requests[recv_iter]=Request::irecv (tmp_buf[recv_iter], count, datatype ,src,
                     COLL_TAG_REDUCE, comm);
             recv_iter++;
 
@@ -190,7 +190,7 @@ int smpi_coll_tuned_reduce_mvapich2_knomial (
 
         recv_iter=0;
         while(recv_iter < expected_recv_count) {
-            index=smpi_mpi_waitany(expected_recv_count, requests,
+            index=Request::waitany(expected_recv_count, requests,
                     &status);
             recv_iter++;
 
@@ -211,10 +211,10 @@ int smpi_coll_tuned_reduce_mvapich2_knomial (
     } 
 
     if(rank != root) {
-        send_request=smpi_mpi_isend(recvbuf,count, datatype, dst,
+        send_request=Request::isend(recvbuf,count, datatype, dst,
                 COLL_TAG_REDUCE,comm);
 
-        smpi_mpi_waitall(1, &send_request, &status);
+        Request::waitall(1, &send_request, &status);
 
         smpi_free_tmp_buffer((void *)((char*)recvbuf + true_lb));
     }