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

Timestamp:

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

Author:

yushan

Message:

revert erroneous commit on trunk

File:

• XIOS/trunk/src/dht_auto_indexing.cpp (modified) (4 diffs)

XIOS/trunk/src/dht_auto_indexing.cpp

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