Changeset 721 for XIOS/trunk/src/client_server_mapping_distributed.cpp

Timestamp:

10/06/15 17:17:11 (9 years ago)

Author:

mhnguyen

Message:

Templated version of distributed hashed table

+) Implement DHT in more generic way to work with different type of information
+) Some old codes of DHT are kept to be a reference (they will be deleted soon)

Test
+) On local, mode attached, 8 processes
+) test_remap passes and result is correct

File:

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

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 27 Feb 2015
-   \date 09 Mars 2015
+   \date 06 Oct 2015
 
    \brief Mapping between index client and server.
@@ -12 +12 @@
 #include <boost/functional/hash.hpp>
 #include "utils.hpp"
-#include "client_client_dht.hpp"
 #include "mpi_tag.hpp"
 
@@ -29 +28 @@
   computeHashIndex();
 
-  ccDHT_ = new CClientClientDHT(globalIndexOfServer,
-                                clientIntraComm,
-                                isDataDistributed);
-//  const boost::unordered_map<size_t,int>& globalIndexToServerMappingTmp = clientDht.getGlobalIndexServerMapping();
-//  globalIndexToServerMapping_ = clientDht.getGlobalIndexServerMapping();
-
-
+  ccDHT_ = new CClientClientDHTInt(globalIndexOfServer,
+                                   clientIntraComm,
+                                   isDataDistributed);
 
 //  computeDistributedServerIndex(globalIndexOfServer, clientIntraComm);
@@ -51 +46 @@
 void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
 {
-  ccDHT_->computeServerIndexMapping(globalIndexOnClient);
-  indexGlobalOnServer_ = ccDHT_->getGlobalIndexOnServer();
+  ccDHT_->computeIndexInfoMapping(globalIndexOnClient);
+  indexGlobalOnServer_ = (ccDHT_->getInfoIndexMap());
 
 /*