Changeset 1642 for XIOS/dev/branch_openmp/src/context_client.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/context_client.cpp (modified) (10 diffs)

XIOS/dev/branch_openmp/src/context_client.cpp

@@ -12 +12 @@
 #include "cxios.hpp"
 #include "server.hpp"
-using namespace ep_lib;
 
 namespace xios
@@ -22 +21 @@
     \cxtSer [in] cxtSer Pointer to context of server side. (It is only used in case of attached mode).
     */
-    CContextClient::CContextClient(CContext* parent, MPI_Comm intraComm_, MPI_Comm interComm_, CContext* cxtSer)
+    CContextClient::CContextClient(CContext* parent, ep_lib::MPI_Comm intraComm_, ep_lib::MPI_Comm interComm_, CContext* cxtSer)
      : mapBufferSize_(), parentServer(cxtSer), maxBufferedEvents(4)
     {
@@ -28 +27 @@
       intraComm = intraComm_;
       interComm = interComm_;
-      MPI_Comm_rank(intraComm, &clientRank);
-      MPI_Comm_size(intraComm, &clientSize);
+      ep_lib::MPI_Comm_rank(intraComm, &clientRank);
+      ep_lib::MPI_Comm_size(intraComm, &clientSize);
 
       int flag;
-      MPI_Comm_test_inter(interComm, &flag);
-      if (flag) MPI_Comm_remote_size(interComm, &serverSize);
-      else  MPI_Comm_size(interComm, &serverSize);
+      ep_lib::MPI_Comm_test_inter(interComm, &flag);
+      if (flag) ep_lib::MPI_Comm_remote_size(interComm, &serverSize);
+      else  ep_lib::MPI_Comm_size(interComm, &serverSize);
 
       computeLeader(clientRank, clientSize, serverSize, ranksServerLeader, ranksServerNotLeader);
@@ -96 +95 @@
     {
       list<int> ranks = event.getRanks();
-
+      info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<endl ;
       if (CXios::checkEventSync)
       {
@@ -102 +101 @@
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
-        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm) ;
-        MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm) ;
-        MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm) ;
+//        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm) ; // MPI_UINT64_T standardized by MPI 3
+        ep_lib::MPI_Allreduce(&timeLine,&timeLine_out, 1, EP_LONG_LONG_INT, EP_SUM, intraComm) ; 
+        ep_lib::MPI_Allreduce(&typeId_in,&typeId, 1, EP_INT, EP_SUM, intraComm) ;
+        ep_lib::MPI_Allreduce(&classId_in,&classId, 1, EP_INT, EP_SUM, intraComm) ;
         if (typeId/clientSize!=event.getTypeId() || classId/clientSize!=event.getClassId() || timeLine_out/clientSize!=timeLine)
         {
@@ -124 +124 @@
         {
           event.send(timeLine, sizes, buffList);
+          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
 
           checkBuffers(ranks);
@@ -142 +143 @@
           info(100)<<"DEBUG : temporaly event created : timeline "<<timeLine<<endl ;
           event.send(timeLine, tmpBufferedEvent.sizes, tmpBufferedEvent.buffers);
+          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
         }
       }
@@ -341 +343 @@
        if (ratio < minBufferSizeEventSizeRatio) minBufferSizeEventSizeRatio = ratio;
      }
-     MPI_Allreduce(&minBufferSizeEventSizeRatio, &minBufferSizeEventSizeRatio, 1, MPI_DOUBLE, MPI_MIN, intraComm);
+     #ifdef _usingMPI
+     ep_lib::MPI_Allreduce(MPI_IN_PLACE, &minBufferSizeEventSizeRatio, 1, EP_DOUBLE, EP_MIN, intraComm);
+     #elif _usingEP
+     ep_lib::MPI_Allreduce(&minBufferSizeEventSizeRatio, &minBufferSizeEventSizeRatio, 1, EP_DOUBLE, EP_MIN, intraComm);
+     #endif
 
      if (minBufferSizeEventSizeRatio < 1.0)
@@ -425 +431 @@
       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
       {
-        #pragma omp critical (_output)
         info(100)<<"DEBUG : Sent context Finalize event to rank "<<*itRank<<endl ;
         event.push(*itRank, 1, msg);
@@ -451 +456 @@
     for (itMap = itbMap; itMap != iteMap; ++itMap)
     {
-      #pragma omp critical (_output)
       report(10) << " Memory report : Context <" << context->getId() << "> : client side : memory used for buffer of each connection to server" << endl
                  << "  +) To server with rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
       totalBuf += itMap->second;
     }
-    #pragma omp critical (_output)
     report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;