Changeset 1745 for XIOS/dev/dev_trunk_omp/src/event_scheduler.cpp

Timestamp:

10/17/19 10:22:09 (5 years ago)

Author:

yushan

Message:

Generic_testcase: build flag --omp to enable EP with intelmpi. --omp2 to enable EP with openmpi. tested on Irene with compiler=intel17, mpi=intelmpi&openmpi, with and without EP

File:

• XIOS/dev/dev_trunk_omp/src/event_scheduler.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/src/event_scheduler.cpp

@@ -139 +139 @@
     while(received)
     {
+      #ifdef _usingEP 
       MPI_Iprobe(-2,1,communicator,&received, &status) ;
+      #else      
+      MPI_Iprobe(MPI_ANY_SOURCE,1,communicator,&received, &status) ;
+      #endif
       if (received)
       {
         recvRequest=new SPendingRequest ;
+        #ifdef _usingEP
         MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 1, communicator, &(recvRequest->request)) ;
+        #else
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 1, communicator, &(recvRequest->request)) ;
+        #endif
         pendingRecvParentRequest.push(recvRequest) ;
       }
@@ -181 +189 @@
     while(received)
     {
+      #ifdef _usingEP
       MPI_Iprobe(-2,0,communicator,&received, &status) ;
+      #else
+      MPI_Iprobe(MPI_ANY_SOURCE,0,communicator,&received, &status) ;
+      #endif
       if (received)
       {
         recvRequest=new SPendingRequest ;
+        #ifdef _usingEP
         MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 0, communicator, &recvRequest->request) ;
+        #else
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 0, communicator, &recvRequest->request) ;
+        #endif
         pendingRecvChildRequest.push_back(recvRequest) ;
       }