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

XIOS/dev/branch_openmp/src/cxios.cpp

@@ -11 +11 @@
 #include "memtrack.hpp"
 #include "registry.hpp"
-using namespace ep_lib;
 
 namespace xios
 {
-  const string CXios::rootFile="./iodef.xml" ;
-  const string CXios::xiosCodeId="xios.x" ;
-  const string CXios::clientFile="./xios_client";
-  const string CXios::serverFile="./xios_server";
-  const string CXios::serverPrmFile="./xios_server1";
-  const string CXios::serverSndFile="./xios_server2";
+  string CXios::rootFile="./iodef.xml" ;
+  string CXios::xiosCodeId="xios.x" ;
+  string CXios::clientFile="./xios_client";
+  string CXios::serverFile="./xios_server";
+  string CXios::serverPrmFile="./xios_server1";
+  string CXios::serverSndFile="./xios_server2";
+
+  bool CXios::xiosStack = true;
+  bool CXios::systemStack = false;
 
   bool CXios::isClient ;
   bool CXios::isServer ;
-  MPI_Comm CXios::globalComm ;
+  ep_lib::MPI_Comm CXios::globalComm ;
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
@@ -44 +46 @@
   {
     set_new_handler(noMemory);
-    int tmp_rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &tmp_rank);
-    #pragma omp critical
-    {
-      std::cout<<"thread "<<tmp_rank<<"("<<omp_get_thread_num()<<")"<<" parsing rootfile"<<std::endl;
-      parseFile(rootFile);
-      std::cout<<"thread "<<tmp_rank<<"("<<omp_get_thread_num()<<")"<<" parsed rootfile"<<std::endl;
-    }
-    #pragma omp barrier
+    parseFile(rootFile);
     parseXiosConfig();
   }
@@ -71 +65 @@
     printLogs2Files=getin<bool>("print_file",false);
 
+    xiosStack=getin<bool>("xios_stack",true) ;
+    systemStack=getin<bool>("system_stack",false) ;
+    if (xiosStack && systemStack)
+    {
+      xiosStack = false;
+    }
+
     StdString bufMemory("memory");
     StdString bufPerformance("performance");
@@ -89 +90 @@
 
     checkEventSync = getin<bool>("check_event_sync", checkEventSync);
-
-    //globalComm=MPI_COMM_WORLD ;
-    int num_ep;
-    if(isClient)  
-    { 
-      num_ep = omp_get_num_threads();
-    }
-        
-    if(isServer) 
-    { 
-      num_ep = 1;
-    }
-        
-    MPI_Info info;
-    #pragma omp master
-    {
-      MPI_Comm *ep_comm;
-      MPI_Comm_create_endpoints(MPI_COMM_WORLD->mpi_comm, num_ep, info, ep_comm);  // servers should reach here too.
-      passage = ep_comm; 
-    }
-        
-    #pragma omp barrier
-    
-          
-    CXios::globalComm = passage[omp_get_thread_num()];
+    #ifdef _usingMPI
+    globalComm=MPI_COMM_WORLD ;
+    #elif _usingEP
+    ep_lib::MPI_Comm *ep_comm;
+    ep_lib::MPI_Info info;
+    ep_lib::MPI_Comm_create_endpoints(EP_COMM_WORLD->mpi_comm, 1, info, ep_comm);
+    ep_lib::passage = ep_comm;
+    globalComm=ep_lib::passage[0] ;
+    #endif
   }
 
@@ -122 +107 @@
   \param [in/out] returnComm communicator corresponding to group of client with same codeId
   */
-  void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
+  void CXios::initClientSide(const string& codeId, ep_lib::MPI_Comm& localComm, ep_lib::MPI_Comm& returnComm)
+  TRY
   {
     isClient = true;
@@ -129 +115 @@
     initialize() ;
 
+
     CClient::initialize(codeId,localComm,returnComm) ;
     if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
+
 
     // If there are no server processes then we are in attached mode
@@ -138 +126 @@
     if (printLogs2Files)
     {
-      #pragma omp critical
       CClient::openInfoStream(clientFile);
       CClient::openErrorStream(clientFile);
@@ -148 +135 @@
     }
   }
+  CATCH
 
   void CXios::clientFinalize(void)
@@ -154 +142 @@
      if (CClient::getRank()==0)
      {
-       #pragma omp critical (_output)
        info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
        globalRegistry->toFile("xios_registry.bin") ;
@@ -190 +177 @@
   void CXios::initServerSide(void)
   {
-    
     isClient = false;
     isServer = true;
 
     initServer();
-
+    isClient = false;
+    isServer = true;
     // Initialize all aspects MPI
     CServer::initialize();
@@ -248 +235 @@
         int firstPoolGlobalRank = secondaryServerGlobalRanks[0];
         int rankGlobal;
-        MPI_Comm_rank(globalComm, &rankGlobal);
+        ep_lib::MPI_Comm_rank(globalComm, &rankGlobal);
 
         // Merge registries defined on each pools
@@ -260 +247 @@
             globalRegistrySndServers.mergeRegistry(*globalRegistry) ;
             int registrySize = globalRegistrySndServers.size();
-            MPI_Send(&registrySize,1,MPI_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
+            ep_lib::MPI_Send(&registrySize,1,EP_LONG,firstPoolGlobalRank,15,CXios::globalComm) ;
             CBufferOut buffer(registrySize) ;
             globalRegistrySndServers.toBuffer(buffer) ;
-            MPI_Send(buffer.start(),registrySize,MPI_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
+            ep_lib::MPI_Send(buffer.start(),registrySize,EP_CHAR,firstPoolGlobalRank,15,CXios::globalComm) ;
           }
         }
@@ -270 +257 @@
         if (rankGlobal == firstPoolGlobalRank)
         {
-          MPI_Status status;
+          ep_lib::MPI_Status status;
           char* recvBuff;
 
@@ -279 +266 @@
             int rank = secondaryServerGlobalRanks[i];
             int registrySize = 0;
-            MPI_Recv(&registrySize, 1, MPI_LONG, rank, 15, CXios::globalComm, &status);
+            ep_lib::MPI_Recv(&registrySize, 1, EP_LONG, rank, 15, CXios::globalComm, &status);
             recvBuff = new char[registrySize];
-            MPI_Recv(recvBuff, registrySize, MPI_CHAR, rank, 15, CXios::globalComm, &status);
+            ep_lib::MPI_Recv(recvBuff, registrySize, EP_CHAR, rank, 15, CXios::globalComm, &status);
             CBufferIn buffer(recvBuff, registrySize) ;
             CRegistry recvRegistry;