Changeset 829 for XIOS/trunk/src/client_server_mapping.cpp

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%)

File:

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

XIOS/trunk/src/client_server_mapping.cpp

@@ -12 +12 @@
 
 CClientServerMapping::CClientServerMapping()
-  : indexGlobalOnServer_(), localIndexSend2Server_(), connectedClients_()
+  : indexGlobalOnServer_(), connectedClients_() //, localIndexSend2Server_()
 {
 }
@@ -20 +20 @@
 }
 
-/*!
-  Compute mapping global index of server which client sends to.
-  \param [in] globalIndexOnClient global index on client
-  \param [in] globalIndexServer global index of servers
-*/
-void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                                     const std::vector<CArray<size_t,1>* >& globalIndexServer)
-{
-  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexServer);
-}
+///*!
+//  Compute mapping global index of server which client sends to.
+//  \param [in] globalIndexOnClient global index on client
+//  \param [in] globalIndexServer global index of servers
+//*/
+//void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+//                                                     const std::vector<CArray<size_t,1>* >& globalIndexServer)
+//{
+//  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexServer);
+//}
 
-/*!
-   Compute index of data which are sent to server and index global on server side
-   \param [in] globalIndexOnClient global index of data on client
-   \param [in] globalIndexServer global index of server(s)
-   \param [in] localIndexOnClient local index of data on client which are sent to server
-*/
-void CClientServerMapping::defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                                            const std::vector<CArray<size_t,1>* >& globalIndexServer,
-                                                            const CArray<int,1>* localIndexOnClient)
-{
-  int nServer = globalIndexServer.size();
-  std::vector<CArray<size_t,1>::const_iterator> itBegin(nServer), itEnd(nServer), it(nServer);
-  for (int i = 0; i < nServer; ++i)
-  {
-    itBegin[i] = it[i] = globalIndexServer[i]->begin();
-    itEnd[i]   = globalIndexServer[i]->end();
-  }
-
-  size_t ssize = globalIndexOnClient.numElements();
-  for (int i = 0; i < ssize; ++i)
-  {
-    for (int j = 0; j < nServer; ++j)
-    {
-      // Just temporarily, it's bad.
-      if (std::binary_search(itBegin[j], itEnd[j], globalIndexOnClient(i)))
-      {
-        // Just try to calculate local index server on client side
-        (indexGlobalOnServer_[j]).push_back((globalIndexOnClient)(i));
-        if (0 != localIndexOnClient) (localIndexSend2Server_[j]).push_back((*localIndexOnClient)(i));
-        else
-          (localIndexSend2Server_[j]).push_back(i);
-        continue;
-      }
-    }
-  }
-}
+///*!
+//   Compute index of data which are sent to server and index global on server side
+//   \param [in] globalIndexOnClient global index of data on client
+//   \param [in] globalIndexServer global index of server(s)
+//   \param [in] localIndexOnClient local index of data on client which are sent to server
+//*/
+//void CClientServerMapping::defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+//                                                            const std::vector<CArray<size_t,1>* >& globalIndexServer,
+//                                                            const CArray<int,1>* localIndexOnClient)
+//{
+//  int nServer = globalIndexServer.size();
+//  std::vector<CArray<size_t,1>::const_iterator> itBegin(nServer), itEnd(nServer), it(nServer);
+//  for (int i = 0; i < nServer; ++i)
+//  {
+//    itBegin[i] = it[i] = globalIndexServer[i]->begin();
+//    itEnd[i]   = globalIndexServer[i]->end();
+//  }
+//
+//  size_t ssize = globalIndexOnClient.numElements();
+//  for (int i = 0; i < ssize; ++i)
+//  {
+//    for (int j = 0; j < nServer; ++j)
+//    {
+//      // Just temporarily, it's bad.
+//      if (std::binary_search(itBegin[j], itEnd[j], globalIndexOnClient(i)))
+//      {
+//        // Just try to calculate local index server on client side
+//        (indexGlobalOnServer_[j]).push_back((globalIndexOnClient)(i));
+//        if (0 != localIndexOnClient) (localIndexSend2Server_[j]).push_back((*localIndexOnClient)(i));
+//        else
+//          (localIndexSend2Server_[j]).push_back(i);
+//        continue;
+//      }
+//    }
+//  }
+//}
 
 /*!
@@ -134 +134 @@
 }
 
-/*!
-  Return local index of data that is send to server
-  \return mapping of server rank and local index of sending data on the client
-*/
-const std::map<int, std::vector<int> >& CClientServerMapping::getLocalIndexSendToServer() const
-{
-  return localIndexSend2Server_;
-}
+///*!
+//  Return local index of data that is send to server
+//  \return mapping of server rank and local index of sending data on the client
+//*/
+//const CClientServerMapping::LocalIndexMap& CClientServerMapping::getLocalIndexSendToServer() const
+//{
+//  return localIndexSend2Server_;
+//}
 
 /*!
@@ -149 +149 @@
   \return mapping of server rank and its global index.
 */
-const std::map<int, std::vector<size_t> >& CClientServerMapping::getGlobalIndexOnServer() const
+const CClientServerMapping::GlobalIndexMap& CClientServerMapping::getGlobalIndexOnServer() const
 {
   return indexGlobalOnServer_;