Changeset 1295 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_recv.cpp

Timestamp:

10/06/17 13:56:33 (7 years ago)

Author:

yushan

Message:

EP update all

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_recv.cpp (modified) (5 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_recv.cpp

@@ -10 +10 @@
 #include <mpi.h>
 #include "ep_declaration.hpp"
+#include "ep_mpi.hpp"
 
 using namespace std;
@@ -22 +23 @@
   int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
   {
-    int dest_rank;
-    MPI_Comm_rank(comm, &dest_rank);
 
     if(!comm.is_ep)
     {
-      ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm >(comm.mpi_comm);
       ::MPI_Status mpi_status;
-      ::MPI_Recv(buf, count, static_cast< ::MPI_Datatype >(datatype), src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, mpi_comm, &mpi_status);
+      ::MPI_Recv(buf, count, to_mpi_type(datatype), src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), &mpi_status);
 
       status->ep_src = src;
@@ -61 +59 @@
     {
       ::MPI_Request mpi_request;
-      ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm > (comm.mpi_comm);
-      ::MPI_Irecv(buf, count, static_cast< ::MPI_Datatype> (datatype), src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, mpi_comm, &mpi_request);
+      ::MPI_Irecv(buf, count, to_mpi_type(datatype), src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), &mpi_request);
 
       request->mpi_request = mpi_request;
@@ -106 +103 @@
     ::MPI_Message mpi_message = static_cast< ::MPI_Message >(message->mpi_message);
                 
-    ::MPI_Imrecv(buf, count, static_cast< ::MPI_Datatype>(datatype), &mpi_message, &mpi_request);
+    ::MPI_Imrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_request);
 
     request->mpi_request = mpi_request;
@@ -124 +121 @@
     ::MPI_Message mpi_message = static_cast< ::MPI_Message >(message->mpi_message);
     
-    ::MPI_Mrecv(buf, count, static_cast< ::MPI_Datatype>(datatype), &mpi_message, &mpi_status);
+    ::MPI_Mrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_status);
 
     status->mpi_status = new ::MPI_Status(mpi_status);