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

Timestamp:

04/01/15 17:52:53 (9 years ago)

Author:

mhnguyen

Message:

Implementing new hash algorithm and fixing bug related to zoom

+) Replace boost hash with hash algorithm of Jenkins
+) Domain, if an attribute is non-empty for one client, it should also be non-empty for others inspite of zoom
+) Replace the way to find the number of client connecting to a server to make sure every server receive a message

Test
+) On Curie
+) test_client: passed and results are same like before
+) test_complete: passed, results are partially the same, the different part comes from added working operation

File:

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

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -11 +11 @@
 #include <limits>
 #include <boost/functional/hash.hpp>
+#include "utils.hpp"
 
 namespace xios
@@ -35 +36 @@
    \param [in] globalIndexOnClient global index client has
 */
-void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
-{
-  int ssize = globalIndexOnClient.numElements();
-  CArray<int,1>* localIndexOnClient = new CArray<int,1>(ssize);
-  for (int i = 0; i < ssize; ++i) (*localIndexOnClient)(i) = i;
-
-  this->computeServerIndexMapping(globalIndexOnClient, *localIndexOnClient);
-  delete localIndexOnClient;
-}
+//void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
+//{
+//  int ssize = globalIndexOnClient.numElements();
+//  CArray<int,1>* localIndexOnClient = new CArray<int,1>(ssize);
+//  for (int i = 0; i < ssize; ++i) (*localIndexOnClient)(i) = i;
+//
+//  this->computeServerIndexMapping(globalIndexOnClient, *localIndexOnClient);
+//  delete localIndexOnClient;
+//}
 
 /*!
@@ -50 +51 @@
    \param [in] localIndexOnClient local index on client
 */
-void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                                                const CArray<int,1>& localIndexOnClient)
+//void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+//                                                                const CArray<int,1>& localIndexOnClient)
+void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
 {
   size_t ssize = globalIndexOnClient.numElements(), hashedIndex;
@@ -59 +61 @@
   std::map<int, std::vector<size_t> > client2ClientIndexGlobal;
   std::map<int, std::vector<int> > client2ClientIndexServer;
-  std::map<int, std::vector<int> > clientLocalIndex;
+//  std::map<int, std::vector<int> > clientLocalIndex;
 
   // Number of global index whose mapping server can be found out thanks to index-server mapping
@@ -66 +68 @@
   // Number of global index whose mapping server are on other clients
   int nbIndexSendToOthers = 0;
-  boost::hash<size_t> hashGlobalIndex;
+  HashXIOS<size_t> hashGlobalIndex;
   for (int i = 0; i < ssize; ++i)
   {
@@ -79 +81 @@
       {
         (indexGlobalOnServer_[globalIndexToServerMapping_[globalIndexClient]]).push_back(globalIndexClient);
-        (localIndexSend2Server_[globalIndexToServerMapping_[globalIndexClient]]).push_back(localIndexOnClient(i));
+//        (localIndexSend2Server_[globalIndexToServerMapping_[globalIndexClient]]).push_back(localIndexOnClient(i));
         ++nbIndexAlreadyOnClient;
       }
@@ -85 +87 @@
       {
         client2ClientIndexGlobal[indexClient].push_back(globalIndexClient);
-        clientLocalIndex[indexClient].push_back(i);
+//        clientLocalIndex[indexClient].push_back(i);
         ++nbIndexSendToOthers;
       }
@@ -123 +125 @@
   std::vector<int> demandAlreadyReceived, repondAlreadyReceived;
   int nbDemandingClient = recvBuff[clientRank_], nbIndexServerReceived = 0;
+
+  resetReceivingRequestAndCount();
   while ((0 < nbDemandingClient) || (!sendRequest.empty()) ||
          (nbIndexServerReceived < nbIndexReceivedFromOthers))
@@ -176 +180 @@
         int* beginBuff = indexServerBuffBegin_[clientSourceRank];
         std::vector<size_t>& globalIndexTmp = client2ClientIndexGlobal[clientSourceRank];
-        std::vector<int>& localIndexTmp = clientLocalIndex[clientSourceRank];
+//        std::vector<int>& localIndexTmp = clientLocalIndex[clientSourceRank];
         for (int i = 0; i < count; ++i)
         {
           (indexGlobalOnServer_[*(beginBuff+i)]).push_back(globalIndexTmp[i]);
-          (localIndexSend2Server_[*(beginBuff+i)]).push_back(localIndexOnClient(localIndexTmp[i]));
+//          (localIndexSend2Server_[*(beginBuff+i)]).push_back(localIndexOnClient(localIndexTmp[i]));
         }
         nbIndexServerReceived += count;
@@ -243 +247 @@
   boost::unordered_map<size_t,int>::const_iterator it  = globalIndexOfServer.begin(),
                                                    ite = globalIndexOfServer.end();
-  boost::hash<size_t> hashGlobalIndex;
+  HashXIOS<size_t> hashGlobalIndex;
   for (; it != ite; ++it)
   {