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

Timestamp:

06/12/18 11:54:13 (6 years ago)

Author:

yushan

Message:

update intercomm_merge and remove redundant files

File:

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

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

@@ -40 +40 @@
   {
     if(!comm->is_ep) return MPI_Irecv_mpi(buf, count, datatype, src, tag, comm, request);
+
+    if(comm->is_intercomm)
+    {
+      if(src>=0) src = comm->inter_rank_map->at(src);
+    }
     
     Debug("MPI_Irecv with EP");
@@ -54 +59 @@
     (*request)->comm = comm;
     (*request)->type = 2;
+    (*request)->probed = false;
     (*request)->state = 0;
-    
 
     (*request)->ep_src = src;
@@ -63 +68 @@
     if(EP_PendingRequests == 0 ) EP_PendingRequests = new std::list< MPI_Request* >;
 
-    EP_PendingRequests->push_back(request);  
+    EP_PendingRequests->push_back(request); 
     
     memcheck("EP_PendingRequests["<<ep_rank<<"]->size() = " << EP_PendingRequests->size());    
@@ -100 +105 @@
     memcheck("delete " << (*message)->mpi_message << " : in ep_lib::MPI_Mrecv, delete (*message)->mpi_message");
     delete (*message)->mpi_message;
+    memcheck("delete " << *message << " : in ep_lib::MPI_Imrecv, delete *message");
+    delete *message;
 
 #ifdef _check_sum
@@ -118 +125 @@
     (*request)->ep_src = (*message)->ep_src;
     
+    (*request)->probed = true;
     (*request)->state = 1;
         
@@ -125 +133 @@
     delete (*message)->mpi_message;
 
+
 #ifdef _check_sum
     check_sum_recv(buf, count, datatype, message->ep_src, message->ep_tag);
@@ -130 +139 @@
 
     
-    return Request_Check();
+    //return Request_Check();
   }