Changeset 829 for XIOS/trunk/src/node

Timestamp:

03/23/16 16:11:01 (8 years ago)

Author:

mhnguyen

Message:

Refactoring transformation code

+) On exchanging information during transformation, not only global index are sent but also local index
+) Correct a bug in distributed hash table (dht)
+) Add new type for dht
+) Clean up some redundant codes

Test
+) On Curie
+) Every test passes
+) Code runs faster in some cases (up to 30%)

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (3 diffs)
• domain.cpp (modified) (1 diff)
• grid.cpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -433 +433 @@
     CServerDistributionDescription serverDescriptionGlobal(globalDim, nbServer);
     int distributedDimensionOnServer = serverDescriptionGlobal.getDimensionDistributed();
-    std::map<int, std::vector<size_t> > globalIndexAxisOnServer;
+    CClientServerMapping::GlobalIndexMap globalIndexAxisOnServer;
     if (distributedDimensionOnServer == orderPositionInGrid) // So we have distributed axis on client side and also on server side*
     {
@@ -472 +472 @@
     }
 
-    std::map<int, std::vector<size_t> >::const_iterator it = globalIndexAxisOnServer.begin(),
-                                                       ite = globalIndexAxisOnServer.end();
+    CClientServerMapping::GlobalIndexMap::const_iterator it = globalIndexAxisOnServer.begin(),
+                                                         ite = globalIndexAxisOnServer.end();
     std::vector<size_t>::const_iterator itbVec = (globalAxisZoom).begin(),
                                         iteVec = (globalAxisZoom).end();
@@ -505 +505 @@
     if (!indSrv_.empty())
     {
+      std::map<int, vector<size_t> >::const_iterator itIndSrv  = indSrv_.begin(),
+                                                     iteIndSrv = indSrv_.end();
       connectedServerRank_.clear();
-      for (it = indSrv_.begin(); it != indSrv_.end(); ++it)
-        connectedServerRank_.push_back(it->first);
+      for (; itIndSrv != iteIndSrv; ++itIndSrv)
+        connectedServerRank_.push_back(itIndSrv->first);
     }
     nbConnectedClients_ = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_);

XIOS/trunk/src/node/domain.cpp

@@ -1386 +1386 @@
                                                                                 client->intraComm);
     clientServerMap->computeServerIndexMapping(globalIndexDomain);
-    const std::map<int, std::vector<size_t> >& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
-
-    std::map<int, std::vector<size_t> >::const_iterator it = globalIndexDomainOnServer.begin(),
-                                                       ite = globalIndexDomainOnServer.end();
+    const CClientServerMapping::GlobalIndexMap& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
+
+    CClientServerMapping::GlobalIndexMap::const_iterator it  = globalIndexDomainOnServer.begin(),
+                                                         ite = globalIndexDomainOnServer.end();
     typedef XIOSBinarySearchWithIndex<size_t> BinarySearch;
     std::vector<int>::iterator itVec;

XIOS/trunk/src/node/grid.cpp

@@ -457 +457 @@
 
      clientServerMap_->computeServerIndexMapping(clientDistribution_->getGlobalIndex());
-     const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
+     const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
 
      const std::vector<size_t>& globalIndexSendToServer = clientDistribution_->getGlobalDataIndexSendToServer();
-     std::map<int, std::vector<size_t> >::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;
-     itbGlobalMap = itGlobalMap = globalIndexOnServer.begin();
+     CClientServerMapping::GlobalIndexMap::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;
+     itGlobalMap  = itbGlobalMap = globalIndexOnServer.begin();
      iteGlobalMap = globalIndexOnServer.end();
 
@@ -488 +488 @@
 
      connectedServerRank_.clear();
-     for (std::map<int, std::vector<size_t> >::const_iterator it = globalIndexOnServer.begin(); it != globalIndexOnServer.end(); ++it) {
-       connectedServerRank_.push_back(it->first);
+     for (itGlobalMap = itbGlobalMap; itGlobalMap != iteGlobalMap; ++itGlobalMap) {
+       connectedServerRank_.push_back(itGlobalMap->first);
      }
 
@@ -787 +787 @@
     list<CMessage> listMsg;
     list<CArray<size_t,1> > listOutIndex;
-    const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
+    const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
     const std::vector<int>& localIndexSendToServer = clientDistribution_->getLocalDataIndexSendToServer();
     const std::vector<size_t>& globalIndexSendToServer = clientDistribution_->getGlobalDataIndexSendToServer();
@@ -821 +821 @@
     else
     {
-      std::map<int, std::vector<size_t> >::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;
+      CClientServerMapping::GlobalIndexMap::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;
       itbGlobalMap = itGlobalMap = globalIndexOnServer.begin();
       iteGlobalMap = globalIndexOnServer.end();