Changeset 1134 for XIOS/dev/branch_yushan_merged/src/client_client_dht_template.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/client_client_dht_template.hpp (modified) (6 diffs)

XIOS/dev/branch_yushan_merged/src/client_client_dht_template.hpp

@@ -13 +13 @@
 #include "xios_spl.hpp"
 #include "array_new.hpp"
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #include "policy.hpp"
 #include <boost/unordered_map.hpp>
@@ -40 +40 @@
   public:
     CClientClientDHTTemplate(const Index2InfoTypeMap& indexInfoInitMap,
-                             const MPI_Comm& clientIntraComm);
+                             const ep_lib::MPI_Comm& clientIntraComm);
 
     CClientClientDHTTemplate(const Index2VectorInfoTypeMap& indexInfoInitMap,
-                             const MPI_Comm& clientIntraComm);
+                             const ep_lib::MPI_Comm& clientIntraComm);
 
     void computeIndexInfoMapping(const CArray<size_t,1>& indices);
@@ -55 +55 @@
 
   protected:
-    CClientClientDHTTemplate(const MPI_Comm& clientIntraComm);
+    CClientClientDHTTemplate(const ep_lib::MPI_Comm& clientIntraComm);
 
   protected:
@@ -62 +62 @@
     // Redistribute index and info among clients
     void computeDistributedIndex(const Index2InfoTypeMap& indexInfoInitMap,
-                                 const MPI_Comm& intraCommLevel,
+                                 const ep_lib::MPI_Comm& intraCommLevel,
                                  int level);
 
     void computeDistributedIndex(const Index2VectorInfoTypeMap& indexInfoInitMap,
-                                 const MPI_Comm& intraCommLevel,
+                                 const ep_lib::MPI_Comm& intraCommLevel,
                                  int level);
 
@@ -73 +73 @@
 
     void computeIndexInfoMappingLevel(const CArray<size_t,1>& indices,
-                                      const MPI_Comm& intraCommLevel,
+                                      const ep_lib::MPI_Comm& intraCommLevel,
                                       int level);
 
@@ -85 +85 @@
     // Send information to clients
     void sendInfoToClients(int clientDestRank, unsigned char* info, int infoSize,
-                           const MPI_Comm& clientIntraComm,
-                           std::vector<MPI_Request>& requestSendInfo);
+                           const ep_lib::MPI_Comm& clientIntraComm,
+                           std::vector<ep_lib::MPI_Request>& requestSendInfo);
 
     void recvInfoFromClients(int clientSrcRank, unsigned char* info, int infoSize,
-                            const MPI_Comm& clientIntraComm,
-                            std::vector<MPI_Request>& requestRecvInfo);
+                            const ep_lib::MPI_Comm& clientIntraComm,
+                            std::vector<ep_lib::MPI_Request>& requestRecvInfo);
 
     // Send global index to clients
     void sendIndexToClients(int clientDestRank, size_t* indices, size_t indiceSize,
-                            const MPI_Comm& clientIntraComm,
-                            std::vector<MPI_Request>& requestSendIndexGlobal);
+                            const ep_lib::MPI_Comm& clientIntraComm,
+                            std::vector<ep_lib::MPI_Request>& requestSendIndexGlobal);
 
     void recvIndexFromClients(int clientSrcRank, size_t* indices, size_t indiceSize,
-                             const MPI_Comm& clientIntraComm,
-                             std::vector<MPI_Request>& requestRecvIndex);
+                             const ep_lib::MPI_Comm& clientIntraComm,
+                             std::vector<ep_lib::MPI_Request>& requestRecvIndex);
 
     void sendRecvOnReturn(const std::vector<int>& sendNbRank, std::vector<int>& sendNbElements,