Changeset 1639 for XIOS/trunk/src/event_scheduler.cpp

Timestamp:

01/22/19 16:43:32 (5 years ago)

Author:

yushan

Message:

revert erroneous commit on trunk

File:

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

XIOS/trunk/src/event_scheduler.cpp

@@ -8 +8 @@
  
  
-  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);
+  CEventScheduler::CEventScheduler(const MPI_Comm& comm) 
+  {
+    MPI_Comm_dup(comm, &communicator) ;
+    MPI_Comm_size(communicator,&mpiSize) ;
+    MPI_Comm_rank(communicator,&mpiRank);
 
 
@@ -88 +88 @@
 
     pendingSentParentRequest.push(sentRequest) ;
-    ep_lib::MPI_Isend(sentRequest->buffer,3, EP_UNSIGNED_LONG, parent[lev], 0, communicator, &sentRequest->request) ;
+    MPI_Isend(sentRequest->buffer,3, MPI_UNSIGNED_LONG, parent[lev], 0, communicator, &sentRequest->request) ;
     traceOn() ;
   } 
@@ -115 +115 @@
   {
     int completed ;
-    ep_lib::MPI_Status status ;
+    MPI_Status status ;
     int received ;
     SPendingRequest* recvRequest ;
@@ -135 +135 @@
     while(received)
     {
-      #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 ;
-        #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) ;
       }
@@ -157 +149 @@
     {
       recvRequest=pendingRecvParentRequest.front() ;
-      ep_lib::MPI_Test( &(recvRequest->request), &completed, &status) ;
+      MPI_Test( &(recvRequest->request), &completed, &status) ;
       if (completed) 
       {
@@ -177 +169 @@
 // function call only by parent mpi process
 
-    ep_lib::MPI_Status status ; 
+    MPI_Status status ; 
     int received ;
     received=true ;
@@ -185 +177 @@
     while(received)
     {
-      #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 ;
-        #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) ;
       }
@@ -206 +190 @@
     for(list<SPendingRequest*>::iterator it=pendingRecvChildRequest.begin(); it!=pendingRecvChildRequest.end() ; )
     {
-      ep_lib::MPI_Test(&((*it)->request),&received,&status) ;
+      MPI_Test(&((*it)->request),&received,&status) ;
       if (received)
       {
@@ -244 +228 @@
     for(list<SPendingRequest*>::iterator it=pendingSentChildRequest.begin(); it!=pendingSentChildRequest.end() ; )
     {
-      ep_lib::MPI_Test(&(*it)->request,&received,&status) ;
+      MPI_Test(&(*it)->request,&received,&status) ;
       if (received)
       {
@@ -267 +251 @@
       sentRequest->buffer[1]=contextHashId ;
       sentRequest->buffer[2]=lev+1 ;
-      ep_lib::MPI_Isend(sentRequest->buffer,3, EP_UNSIGNED_LONG, child[lev][i], 1, communicator, & sentRequest->request) ;
+      MPI_Isend(sentRequest->buffer,3, MPI_UNSIGNED_LONG, child[lev][i], 1, communicator, & sentRequest->request) ;
       pendingSentChildRequest.push_back(sentRequest) ;
     }