Changeset 833 for XIOS/trunk/src/client_client_dht_template.hpp

Timestamp:

04/08/16 15:00:15 (8 years ago)

Author:

mhnguyen

Message:

Improvements for dht

+) Implement adaptive hierarchy for dht, level of hierarchy depends on number of processes
+) Remove some redundant codes

Test
+) On Curie
+) All tests are correct

File:

• XIOS/trunk/src/client_client_dht_template.hpp (modified) (4 diffs)

XIOS/trunk/src/client_client_dht_template.hpp

@@ -20 +20 @@
 namespace xios
 {
-template<typename T, class HierarchyPolicy = DivideCommByTwo> class CClientClientDHTTemplate;
+template<typename T, class HierarchyPolicy = DivideAdaptiveComm> class CClientClientDHTTemplate;
 
 /*!
@@ -61 +61 @@
                                       int level);
 
+    void computeSendRecvRank(int level, int rank);
+
+    void sendRecvRank(int level,
+                      const std::vector<int>& sendNbRank, const std::vector<int>& sendNbElements,
+                      int& recvNbRank, int& recvNbElements);
+
   protected:
     void probeIndexMessageFromClients(unsigned long* recvIndexGlobalBuff,
@@ -81 +87 @@
 
     // Send global index to clients
-    void sendIndexToClients(int clientDestRank, std::vector<size_t>& indexGlobal,
+    void sendIndexToClients(int clientDestRank, size_t* indices, size_t indiceSize,
                             const MPI_Comm& clientIntraComm, std::list<MPI_Request>& requestSendIndexGlobal);
 
@@ -100 +106 @@
     Index2InfoTypeMap indexToInfoMappingLevel_;
 
-    //! intracommuntion of clients
-    MPI_Comm intraCommRoot_;
+    std::vector<std::vector<int> > sendRank_;
+
+    std::vector<std::vector<int> > recvRank_;
 
     //! Flag to specify whether data is distributed or not