X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d70128f70514554704db4f73ce52cde5b8380b5e..c9985132b008956a7a36fc3b1890aeebd9caa080:/src/smpi/colls/scatter-mvapich-two-level.cpp

diff --git a/src/smpi/colls/scatter-mvapich-two-level.cpp b/src/smpi/colls/scatter-mvapich-two-level.cpp
index 1edba3662c..8badc56583 100644
--- a/src/smpi/colls/scatter-mvapich-two-level.cpp
+++ b/src/smpi/colls/scatter-mvapich-two-level.cpp
@@ -97,8 +97,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_direct(void *sendbuf,
                                             root, comm);
 
     } else {
-        recvtype_size=smpi_datatype_size(recvtype);
-        sendtype_size=smpi_datatype_size(sendtype);
+        recvtype_size=recvtype->size();
+        sendtype_size=sendtype->size();
 
         if (rank == root) {
             nbytes = sendcnt * sendtype_size;
@@ -124,7 +124,7 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_direct(void *sendbuf,
             /* The root of the scatter operation is not the node leader. Recv
              * data from the node leader */
             leader_scatter_buf = smpi_get_tmp_sendbuffer(nbytes * comm_size);
-            smpi_mpi_recv(leader_scatter_buf, nbytes * comm_size, MPI_BYTE,
+            Request::recv(leader_scatter_buf, nbytes * comm_size, MPI_BYTE,
                              root, COLL_TAG_SCATTER, comm, &status);
 
         }
@@ -132,7 +132,7 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_direct(void *sendbuf,
         if (rank == root && local_rank != 0) {
             /* The root of the scatter operation is not the node leader. Send
              * data to the node leader */
-            smpi_mpi_send(sendbuf, sendcnt * comm_size, sendtype,
+            Request::send(sendbuf, sendcnt * comm_size, sendtype,
                                      leader_of_root, COLL_TAG_SCATTER, comm
                                      );
         }
@@ -281,8 +281,8 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_binomial(void *sendbuf,
                                             root, comm);
 
     } else {
-        recvtype_size=smpi_datatype_size(recvtype);
-        sendtype_size=smpi_datatype_size(sendtype);
+        recvtype_size=recvtype->size();
+        sendtype_size=sendtype->size();
 
         if (rank == root) {
             nbytes = sendcnt * sendtype_size;
@@ -307,14 +307,14 @@ int smpi_coll_tuned_scatter_mvapich2_two_level_binomial(void *sendbuf,
             /* The root of the scatter operation is not the node leader. Recv
              * data from the node leader */
             leader_scatter_buf = smpi_get_tmp_sendbuffer(nbytes * comm_size);
-            smpi_mpi_recv(leader_scatter_buf, nbytes * comm_size, MPI_BYTE,
+            Request::recv(leader_scatter_buf, nbytes * comm_size, MPI_BYTE,
                              root, COLL_TAG_SCATTER, comm, &status);
         }
 
         if (rank == root && local_rank != 0) {
             /* The root of the scatter operation is not the node leader. Send
              * data to the node leader */
-            smpi_mpi_send(sendbuf, sendcnt * comm_size, sendtype,
+            Request::send(sendbuf, sendcnt * comm_size, sendtype,
                                      leader_of_root, COLL_TAG_SCATTER, comm);
         }