Changeset 863 for XIOS

Timestamp:

06/09/16 11:32:47 (8 years ago)

Author:

mhnguyen

Message:

Some minor improvements for DHT

+) Use to minimize the redundant loops

Test
+) ON Curie
+) It works well.

File:

• XIOS/trunk/src/client_client_dht_template_impl.hpp (modified) (6 diffs)

XIOS/trunk/src/client_client_dht_template_impl.hpp

@@ -105 +105 @@
   size_t index;
   HashXIOS<size_t> hashGlobalIndex;
+  boost::unordered_map<size_t,int> nbIndices;
+  nbIndices.rehash(std::ceil(ssize/nbIndices.max_load_factor()));
   for (int i = 0; i < ssize; ++i)
   {
     index = indices(i);
-    hashedVal  = hashGlobalIndex(index);
-    itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashedVal);
-    int indexClient = std::distance(itbClientHash, itClientHash)-1;
-    ++sendNbIndexBuff[indexClient];
+    if (0 == nbIndices.count(index))
+    {
+      hashedVal  = hashGlobalIndex(index);
+      itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashedVal);
+      int indexClient = std::distance(itbClientHash, itClientHash)-1;
+      ++sendNbIndexBuff[indexClient];
+      nbIndices[index] = 1;
+    }
   }
 
@@ -129 +135 @@
   {
     index = indices(i);
-    hashedVal  = hashGlobalIndex(index);
-    itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashedVal);
-    {
+    if (1 == nbIndices[index])
+    {
+      hashedVal  = hashGlobalIndex(index);
+      itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashedVal);
       int indexClient = std::distance(itbClientHash, itClientHash)-1;
-      {
-        client2ClientIndex[indexClient+groupRankBegin][sendNbIndexBuff[indexClient]] = index;
-        ++sendNbIndexBuff[indexClient];
-      }
+      client2ClientIndex[indexClient+groupRankBegin][sendNbIndexBuff[indexClient]] = index;
+      ++sendNbIndexBuff[indexClient];
+      ++nbIndices[index];
     }
   }
@@ -597 +603 @@
   for (it = itb; it != ite; ++it)
   {
-    int infoVecSize = it->second.size();
-    for (int idx = 0; idx < infoVecSize; ++idx)
-    {
-      size_t hashIndex = hashGlobalIndex(it->first);
-      itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashIndex);
-      {
-        int indexClient = std::distance(itbClientHash, itClientHash)-1;
-        {
-          ++sendNbIndexBuff[indexClient];
-        }
-      }
-    }
+    size_t hashIndex = hashGlobalIndex(it->first);
+    itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashIndex);
+    int indexClient = std::distance(itbClientHash, itClientHash)-1;
+    sendNbIndexBuff[indexClient] += it->second.size();
   }
 
@@ -628 +626 @@
   {
     const std::vector<InfoType>& infoTmp = it->second;
+    size_t hashIndex = hashGlobalIndex(it->first);
+    itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashIndex);
+    int indexClient = std::distance(itbClientHash, itClientHash)-1;
     for (int idx = 0; idx < infoTmp.size(); ++idx)
     {
-      size_t hashIndex = hashGlobalIndex(it->first);
-      itClientHash = std::upper_bound(itbClientHash, iteClientHash, hashIndex);
-      {
-        int indexClient = std::distance(itbClientHash, itClientHash)-1;
-        {
-          client2ClientIndex[indexClient + groupRankBegin][sendNbIndexBuff[indexClient]] = it->first;;
-//          ProcessDHTElement<InfoType>::packElement(it->second, client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
-          ProcessDHTElement<InfoType>::packElement(infoTmp[idx], client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
-          ++sendNbIndexBuff[indexClient];
-        }
-      }
+      client2ClientIndex[indexClient + groupRankBegin][sendNbIndexBuff[indexClient]] = it->first;;
+  //          ProcessDHTElement<InfoType>::packElement(it->second, client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
+      ProcessDHTElement<InfoType>::packElement(infoTmp[idx], client2ClientInfo[indexClient + groupRankBegin], sendNbInfo[indexClient]);
+      ++sendNbIndexBuff[indexClient];
     }
   }
@@ -695 +689 @@
   Index2VectorInfoTypeMap indexToInfoMapping;
   indexToInfoMapping.rehash(std::ceil(currentIndex/indexToInfoMapping.max_load_factor()));
+//  boost::unordered_map<size_t,int> tmpInfoSize;
+//  tmpInfoSize.rehash(std::ceil(currentIndex/tmpInfoSize.max_load_factor()));
+//  currentIndex = 0;
+//  for (int idx = 0; idx < nbRecvClient; ++idx)
+//  {
+//    int count = recvNbIndexClientCount[idx];
+//    for (int i = 0; i < count; ++i)
+//    {
+//      ++tmpInfoSize[*(recvIndexBuff+currentIndex+i)];
+//    }
+//    currentIndex += count;
+//  }
+//
+//  for (boost::unordered_map<size_t,int>::iterator it=tmpInfoSize.begin(); it != tmpInfoSize.end(); ++it)
+//  {
+//    indexToInfoMapping[it->first].resize(it->second);
+//    it->second = 0;
+//  }
+
   currentIndex = 0;
   InfoType infoValue;
@@ -701 +714 @@
   for (int idx = 0; idx < nbRecvClient; ++idx)
   {
+//    size_t index;
     int count = recvNbIndexClientCount[idx];
     for (int i = 0; i < count; ++i)
     {
+//      index = *(recvIndexBuff+currentIndex+i);
       ProcessDHTElement<InfoType>::unpackElement(infoValue, infoBuff, infoIndex);
-//      indexToInfoMapping[*(recvIndexBuff+currentIndex+i)] = infoValue;
+//      ProcessDHTElement<InfoType>::unpackElement(indexToInfoMapping[index][tmpInfoSize[index]], infoBuff, infoIndex);
+//      ++tmpInfoSize[index];
       indexToInfoMapping[*(recvIndexBuff+currentIndex+i)].push_back(infoValue);
     }