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

XIOS/dev/branch_openmp/src/registry.cpp

@@ -4 +4 @@
 #include <fstream>
 #include <sstream>
-using namespace ep_lib;
 
 namespace xios
@@ -192 +191 @@
   {
     int rank ;
-    MPI_Comm_rank(communicator,&rank);
+    ep_lib::MPI_Comm_rank(communicator,&rank);
     if (rank==0)
     {
@@ -198 +197 @@
       this->toBuffer(buffer) ;
       int size=buffer.count() ;
-      MPI_Bcast(&size,1,MPI_INT,0,communicator) ;
-      MPI_Bcast(buffer.start(),size,MPI_CHAR,0,communicator) ;
+      ep_lib::MPI_Bcast(&size,1,EP_INT,0,communicator) ;
+      ep_lib::MPI_Bcast(buffer.start(),size,EP_CHAR,0,communicator) ;
     }
     else
     {
       int size ;
-      MPI_Bcast(&size,1,MPI_INT,0,communicator) ;
+      ep_lib::MPI_Bcast(&size,1,EP_INT,0,communicator) ;
       CBufferIn buffer(size) ;
-      MPI_Bcast(buffer.start(),size,MPI_CHAR,0,communicator) ;
+      ep_lib::MPI_Bcast(buffer.start(),size,EP_CHAR,0,communicator) ;
       this->fromBuffer(buffer) ;
     }
@@ -215 +214 @@
   }
 
-  void CRegistry::gatherRegistry(const MPI_Comm& comm)
+  void CRegistry::gatherRegistry(const ep_lib::MPI_Comm& comm)
   {
     int rank,mpiSize ;
-    MPI_Comm_rank(comm,&rank);
-    MPI_Comm_size(comm,&mpiSize);
+    ep_lib::MPI_Comm_rank(comm,&rank);
+    ep_lib::MPI_Comm_size(comm,&mpiSize);
 
     int* sizes=new int[mpiSize] ;
@@ -225 +224 @@
     this->toBuffer(localBuffer) ;
     int localSize=localBuffer.count() ;
-    MPI_Gather(&localSize,1,MPI_INT,sizes,1,MPI_INT,0,comm) ;
+    ep_lib::MPI_Gather(&localSize,1,EP_INT,sizes,1,EP_INT,0,comm) ;
 
     char* globalBuffer ;
@@ -241 +240 @@
 
       globalBuffer=new char[globalBufferSize] ;
-      MPI_Gatherv(localBuffer.start(),localSize,MPI_CHAR,globalBuffer,sizes,displs,MPI_CHAR,0,comm) ;
+      ep_lib::MPI_Gatherv(localBuffer.start(),localSize,EP_CHAR,globalBuffer,sizes,displs,EP_CHAR,0,comm) ;
       for(int i=1;i<mpiSize;++i)
       {
@@ -252 +251 @@
       delete[] globalBuffer ;
     }
-    else  MPI_Gatherv(localBuffer.start(),localSize,MPI_CHAR,globalBuffer,sizes,displs,MPI_CHAR,0,comm) ;   
+    else  ep_lib::MPI_Gatherv(localBuffer.start(),localSize,EP_CHAR,globalBuffer,sizes,displs,EP_CHAR,0,comm) ;   
     delete[] sizes ;
     
@@ -259 +258 @@
   void CRegistry::hierarchicalGatherRegistry(void)
   {
-    //hierarchicalGatherRegistry(communicator) ;
-    gatherRegistry(communicator) ;
-  }
-
-  void CRegistry::hierarchicalGatherRegistry(const MPI_Comm& comm)
+    hierarchicalGatherRegistry(communicator) ;
+  }
+
+  void CRegistry::hierarchicalGatherRegistry(const ep_lib::MPI_Comm& comm)
   {
     int mpiRank,mpiSize ;
-    MPI_Comm_rank(comm,&mpiRank);
-    MPI_Comm_size(comm,&mpiSize);    
+    ep_lib::MPI_Comm_rank(comm,&mpiRank);
+    ep_lib::MPI_Comm_size(comm,&mpiSize);    
 
     if (mpiSize>2)
@@ -274 +272 @@
       if (mpiRank<mpiSize/2+mpiSize%2) color=0 ;
       else color=1 ;
-      MPI_Comm commUp ;
-      MPI_Comm_split(comm,color,mpiRank,&commUp) ,
+      ep_lib::MPI_Comm commUp ;
+      ep_lib::MPI_Comm_split(comm,color,mpiRank,&commUp) ,
       hierarchicalGatherRegistry(commUp) ;
-      MPI_Comm_free(&commUp) ;
+      ep_lib::MPI_Comm_free(&commUp) ;
     }
 
     if (mpiSize>1)
     {
-      MPI_Comm commDown ;
+      ep_lib::MPI_Comm commDown ;
       int color ;
       
       if (mpiRank==0 || mpiRank==mpiSize/2+mpiSize%2) color=0 ;
       else color=1 ;
-      MPI_Comm_split(comm,color,mpiRank,&commDown) ;
+      ep_lib::MPI_Comm_split(comm,color,mpiRank,&commDown) ;
       if (color==0) gatherRegistry(commDown) ;
-      MPI_Comm_free(&commDown) ;    
+      ep_lib::MPI_Comm_free(&commDown) ;    
     }
   }