Changeset 829 for XIOS/trunk/src/client_client_dht_template_impl.hpp

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_client_dht_template_impl.hpp (modified) (14 diffs)

XIOS/trunk/src/client_client_dht_template_impl.hpp

@@ -49 +49 @@
   for (size_t idx = 0; idx < size; ++idx)
   {
-    int serverIdx = indexToInfoMappingLevel_[indices(idx)];
-    indexGlobalOnServer_[serverIdx].push_back(indices(idx));
+    T& info = indexToInfoMappingLevel_[indices(idx)];
+//    infoIndexMapping_[info].push_back(indices(idx));
+    infoIndexMapping_[indices(idx)] = info;
   }
 }
@@ -125 +126 @@
 
   // Buffer to receive respond from other clients, it can be allocated or not depending whether it demands other clients
-  InfoType* recvBuffInfo = 0;
+//  InfoType* recvBuffInfo = 0;
+  unsigned char* recvBuffInfo = 0;
   int nbIndexReceivedFromOthers = nbIndexToSend;
   if (0 != nbIndexReceivedFromOthers)
-    recvBuffInfo = new InfoType[nbIndexReceivedFromOthers];
+    recvBuffInfo = new unsigned char[nbIndexReceivedFromOthers*infoTypeSize];
 
   std::map<int, MPI_Request>::iterator itRequest;
@@ -212 +214 @@
 
   // Mapping client rank and the begining position of receiving buffer for message of server index from this client
-  std::map<int, InfoType*> infoBuffBegin;
+  std::map<int, unsigned char*> infoBuffBegin;
 
   while ((!sendInfoRequest.empty()) || (nbSendBuffInfoReceived < nbIndexReceivedFromOthers))
@@ -233 +235 @@
       if (true == flagInfo)
       {
-        MPI_Get_count(&statusInfo, MPI_INT, &count);
+        MPI_Get_count(&statusInfo, MPI_CHAR, &count);
+        int actualCountInfo = count/infoTypeSize;
         int clientSourceRank = statusInfo.MPI_SOURCE;
-        InfoType* beginBuff = infoBuffBegin[clientSourceRank];
+        unsigned char* beginBuff = infoBuffBegin[clientSourceRank];
         std::vector<size_t>& indexTmp = client2ClientIndex[clientSourceRank];
-        for (int i = 0; i < count; ++i)
+        TypeToBytes<InfoType> u;
+        for (int i = 0; i < actualCountInfo; ++i)
         {
-          indexToInfoMapping[indexTmp[i]] = *(beginBuff+i);
+          unsigned char* tmpBeginBuff = beginBuff+i*infoTypeSize;
+          for (size_t idx = 0; idx < infoTypeSize; ++idx) u.bytes[idx] = *(tmpBeginBuff+idx);
+          indexToInfoMapping[indexTmp[i]] = u.value;
         }
-        nbSendBuffInfoReceived += count;
+        nbSendBuffInfoReceived += actualCountInfo;
         repondAlreadyReceived.push_back(clientSourceRank);
       }
@@ -251 +257 @@
   }
 
-  indexToInfoMappingLevel_ = indexToInfoMapping;
+  indexToInfoMappingLevel_.swap(indexToInfoMapping);
   if (0 != maxNbIndexDemandedFromOthers) delete [] recvBuffIndex;
   if (0 != nbIndexReceivedFromOthers) delete [] recvBuffInfo;
@@ -289 +295 @@
 template<typename T, typename H>
 void CClientClientDHTTemplate<T,H>::computeDistributedIndex(const boost::unordered_map<size_t,T>& indexInfoMap,
-                                                          const MPI_Comm& commLevel,
-                                                          int level)
+                                                            const MPI_Comm& commLevel,
+                                                            int level)
 {
   int nbClient, clientRank;
@@ -340 +346 @@
   int recvNbIndexCount = recvNbIndexBuff[clientRank];
   unsigned long* recvIndexBuff = new unsigned long[recvNbIndexCount];
-  InfoType* recvInfoBuff = new InfoType[recvNbIndexCount];
+  unsigned char* recvInfoBuff = new unsigned char[recvNbIndexCount*infoTypeSize];
 
   // If a client holds information about index and the corresponding which don't belong to it,
@@ -374 +380 @@
 
   // Mapping client rank and the begining position of receiving buffer for message of server index from this client
-  std::map<int, int*> infoBuffBegin;
+  std::map<int, unsigned char*> infoBuffBegin;
 
   boost::unordered_map<size_t,InfoType> indexToInfoMapping;
@@ -418 +424 @@
       {
         int count = it->second;
+        TypeToBytes<InfoType> u;
         for (int i = 0; i < count; ++i)
-           indexToInfoMapping.insert(std::make_pair<size_t,InfoType>(*(indexBuffBegin[rank]+i),*(infoBuffBegin[rank]+i)));
+        {
+          unsigned char* tmpBeginBuff = infoBuffBegin[rank]+i*infoTypeSize;
+          for (size_t idx = 0; idx < infoTypeSize; ++idx) u.bytes[idx] = *(tmpBeginBuff+idx);
+          indexToInfoMapping.insert(std::make_pair<size_t,InfoType>(*(indexBuffBegin[rank]+i),u.value));
+        }
+
         processedList.push_back(rank);
         --recvNbClient;
@@ -466 +478 @@
 template<typename T, typename H>
 void CClientClientDHTTemplate<T,H>::probeIndexMessageFromClients(unsigned long* recvIndexBuff,
-                                                    const int recvNbIndexCount,
-                                                    int& countIndex,
-                                                    std::map<int, unsigned long*>& indexBuffBegin,
-                                                    std::map<int, MPI_Request>& requestRecvIndex,
-                                                    const MPI_Comm& intraComm)
+                                                                 const int recvNbIndexCount,
+                                                                 int& countIndex,
+                                                                 std::map<int, unsigned long*>& indexBuffBegin,
+                                                                 std::map<int, MPI_Request>& requestRecvIndex,
+                                                                 const MPI_Comm& intraComm)
 {
   MPI_Status statusIndexGlobal;
@@ -500 +512 @@
 */
 template<typename T, typename H>
-void CClientClientDHTTemplate<T,H>::probeInfoMessageFromClients(T* recvInfoBuff,
-                                                   const int recvNbIndexCount,
-                                                   int& countInfo,
-                                                   std::map<int, T*>& infoBuffBegin,
-                                                   std::map<int, MPI_Request>& requestRecvInfo,
-                                                   const MPI_Comm& intraComm)
+void CClientClientDHTTemplate<T,H>::probeInfoMessageFromClients(unsigned char* recvInfoBuff,
+                                                                const int recvNbIndexCount,
+                                                                int& countInfo,
+                                                                std::map<int, unsigned char*>& infoBuffBegin,
+                                                                std::map<int, MPI_Request>& requestRecvInfo,
+                                                                const MPI_Comm& intraComm)
 {
   MPI_Status statusInfo;
@@ -515 +527 @@
   {
     MPI_Get_count(&statusInfo, MPI_CHAR, &count);
-    infoBuffBegin.insert(std::make_pair<int, T*>(statusInfo.MPI_SOURCE, recvInfoBuff+countInfo));
-    MPI_Irecv(recvInfoBuff+countInfo, count, MPI_CHAR,
+    unsigned char* beginInfoBuff = recvInfoBuff+countInfo*infoTypeSize;
+    infoBuffBegin.insert(std::make_pair<int, unsigned char*>(statusInfo.MPI_SOURCE, beginInfoBuff));
+    MPI_Irecv(beginInfoBuff, count, MPI_CHAR,
               statusInfo.MPI_SOURCE, MPI_DHT_INFO, intraComm,
               &requestRecvInfo[statusInfo.MPI_SOURCE]);
@@ -533 +546 @@
 template<typename T, typename H>
 void CClientClientDHTTemplate<T,H>::sendIndexToClients(int clientDestRank, std::vector<size_t>& indices,
-                                          const MPI_Comm& clientIntraComm,
-                                          std::list<MPI_Request>& requestSendIndex)
+                                                       const MPI_Comm& clientIntraComm,
+                                                       std::list<MPI_Request>& requestSendIndex)
 {
   MPI_Request request;
@@ -551 +564 @@
 template<typename T, typename H>
 void CClientClientDHTTemplate<T,H>::sendInfoToClients(int clientDestRank, std::vector<T>& info,
-                                         const MPI_Comm& clientIntraComm,
-                                         std::list<MPI_Request>& requestSendInfo)
+                                                      const MPI_Comm& clientIntraComm,
+                                                      std::list<MPI_Request>& requestSendInfo)
 {
   MPI_Request request;