Changeset 1642 for XIOS/dev/branch_openmp/src/event_scheduler.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/event_scheduler.cpp (modified) (10 diffs)

XIOS/dev/branch_openmp/src/event_scheduler.cpp

@@ -4 +4 @@
 #include "tracer.hpp"
 
-using namespace ep_lib;
-
 namespace xios
 {
  
  
-  CEventScheduler::CEventScheduler(const MPI_Comm& comm) 
-  {
-    MPI_Comm_dup(comm, &communicator) ;
-    MPI_Comm_size(communicator,&mpiSize) ;
-    MPI_Comm_rank(communicator,&mpiRank);
+  CEventScheduler::CEventScheduler(const ep_lib::MPI_Comm& comm) 
+  {
+    ep_lib::MPI_Comm_dup(comm, &communicator) ;
+    ep_lib::MPI_Comm_size(communicator,&mpiSize) ;
+    ep_lib::MPI_Comm_rank(communicator,&mpiRank);
 
 
@@ -90 +88 @@
 
     pendingSentParentRequest.push(sentRequest) ;
-    MPI_Isend(sentRequest->buffer,3, MPI_UNSIGNED_LONG, parent[lev], 0, communicator, &sentRequest->request) ;
+    ep_lib::MPI_Isend(sentRequest->buffer,3, EP_UNSIGNED_LONG, parent[lev], 0, communicator, &sentRequest->request) ;
     traceOn() ;
   } 
@@ -117 +115 @@
   {
     int completed ;
-    MPI_Status status ;
+    ep_lib::MPI_Status status ;
     int received ;
     SPendingRequest* recvRequest ;
@@ -137 +135 @@
     while(received)
     {
-      MPI_Iprobe(-2,1,communicator,&received, &status) ;
+      #ifdef _usingMPI
+      MPI_Iprobe(MPI_ANY_SOURCE,1,communicator,&received, &status) ;
+      #elif _usingEP
+      ep_lib::MPI_Iprobe(-2,1,communicator,&received, &status) ;
+      #endif
       if (received)
       {
         recvRequest=new SPendingRequest ;
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 1, communicator, &(recvRequest->request)) ;
+        #ifdef _usingMPI
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 1, communicator, &(recvRequest->request)) ;
+        #elif _usingEP
+        ep_lib::MPI_Irecv(recvRequest->buffer, 3, EP_UNSIGNED_LONG, -2, 1, communicator, &(recvRequest->request)) ;
+        #endif
         pendingRecvParentRequest.push(recvRequest) ;
       }
@@ -151 +157 @@
     {
       recvRequest=pendingRecvParentRequest.front() ;
-      MPI_Test( &(recvRequest->request), &completed, &status) ;
+      ep_lib::MPI_Test( &(recvRequest->request), &completed, &status) ;
       if (completed) 
       {
@@ -171 +177 @@
 // function call only by parent mpi process
 
-    MPI_Status status ; 
+    ep_lib::MPI_Status status ; 
     int received ;
     received=true ;
@@ -179 +185 @@
     while(received)
     {
-      MPI_Iprobe(-2,0,communicator,&received, &status) ;
+      #ifdef _usingMPI
+      MPI_Iprobe(MPI_ANY_SOURCE,0,communicator,&received, &status) ;
+      #elif _usingEP
+      ep_lib::MPI_Iprobe(-2,0,communicator,&received, &status) ;
+      #endif
       if (received)
       {
         recvRequest=new SPendingRequest ;
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 0, communicator, &recvRequest->request) ;
+        #ifdef _usingMPI
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 0, communicator, &recvRequest->request) ;
+        #elif _usingEP
+        ep_lib::MPI_Irecv(recvRequest->buffer, 3, EP_UNSIGNED_LONG, -2, 0, communicator, &recvRequest->request) ;
+        #endif
         pendingRecvChildRequest.push_back(recvRequest) ;
       }
@@ -192 +206 @@
     for(list<SPendingRequest*>::iterator it=pendingRecvChildRequest.begin(); it!=pendingRecvChildRequest.end() ; )
     {
-      MPI_Test(&((*it)->request),&received,&status) ;
+      ep_lib::MPI_Test(&((*it)->request),&received,&status) ;
       if (received)
       {
@@ -230 +244 @@
     for(list<SPendingRequest*>::iterator it=pendingSentChildRequest.begin(); it!=pendingSentChildRequest.end() ; )
     {
-      MPI_Test(&(*it)->request,&received,&status) ;
+      ep_lib::MPI_Test(&(*it)->request,&received,&status) ;
       if (received)
       {
@@ -253 +267 @@
       sentRequest->buffer[1]=contextHashId ;
       sentRequest->buffer[2]=lev+1 ;
-      MPI_Isend(sentRequest->buffer,3, MPI_UNSIGNED_LONG, child[lev][i], 1, communicator, & sentRequest->request) ;
+      ep_lib::MPI_Isend(sentRequest->buffer,3, EP_UNSIGNED_LONG, child[lev][i], 1, communicator, & sentRequest->request) ;
       pendingSentChildRequest.push_back(sentRequest) ;
     }