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

XIOS/dev/branch_openmp/src/dht_auto_indexing.cpp

@@ -8 +8 @@
  */
 #include "dht_auto_indexing.hpp"
-using namespace ep_lib;
 
 namespace xios
@@ -23 +22 @@
 
   CDHTAutoIndexing::CDHTAutoIndexing(const CArray<size_t,1>& hashValue,
-                                     const MPI_Comm& clientIntraComm)
+                                     const ep_lib::MPI_Comm& clientIntraComm)
     : CClientClientDHTTemplate<size_t>(clientIntraComm)
   {
@@ -29 +28 @@
     nbIndexOnProc_ = hashValue.size();
     size_t nbIndexAccum;
-    MPI_Scan(&nbIndexOnProc_, &nbIndexAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, clientIntraComm);
+    ep_lib::MPI_Scan(&nbIndexOnProc_, &nbIndexAccum, 1, EP_UNSIGNED_LONG, EP_SUM, clientIntraComm);
 
     // Broadcasting the total number of indexes
     int rank, size;
-    MPI_Comm_rank(clientIntraComm, &rank);
-    MPI_Comm_size(clientIntraComm, &size);
+    ep_lib::MPI_Comm_rank(clientIntraComm, &rank);
+    ep_lib::MPI_Comm_size(clientIntraComm, &size);
     if (rank == (size-1)) nbIndexesGlobal_ = nbIndexAccum;
-    MPI_Bcast(&nbIndexesGlobal_, 1, MPI_UNSIGNED_LONG, size-1, clientIntraComm);
+    ep_lib::MPI_Bcast(&nbIndexesGlobal_, 1, EP_UNSIGNED_LONG, size-1, clientIntraComm);
 
     CArray<size_t,1>::const_iterator itbIdx = hashValue.begin(), itIdx,
@@ -59 +58 @@
   */
   CDHTAutoIndexing::CDHTAutoIndexing(Index2VectorInfoTypeMap& hashInitMap,
-                                     const MPI_Comm& clientIntraComm)
+                                     const ep_lib::MPI_Comm& clientIntraComm)
     : CClientClientDHTTemplate<size_t>(clientIntraComm)
   {
@@ -65 +64 @@
     nbIndexOnProc_ = hashInitMap.size();
     size_t nbIndexAccum;
-    MPI_Scan(&nbIndexOnProc_, &nbIndexAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, clientIntraComm);
+    ep_lib::MPI_Scan(&nbIndexOnProc_, &nbIndexAccum, 1, EP_UNSIGNED_LONG, EP_SUM, clientIntraComm);
 
     int rank, size;
-    MPI_Comm_rank(clientIntraComm, &rank);
-    MPI_Comm_size(clientIntraComm, &size);
+    ep_lib::MPI_Comm_rank(clientIntraComm, &rank);
+    ep_lib::MPI_Comm_size(clientIntraComm, &size);
     if (rank == (size-1)) nbIndexesGlobal_ = nbIndexAccum;
-    MPI_Bcast(&nbIndexesGlobal_, 1, MPI_UNSIGNED_LONG, size-1, clientIntraComm);
+    ep_lib::MPI_Bcast(&nbIndexesGlobal_, 1, EP_UNSIGNED_LONG, size-1, clientIntraComm);
 
     Index2VectorInfoTypeMap::iterator itbIdx = hashInitMap.begin(), itIdx,