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

Timestamp:

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

Author:

mhnguyen

Message:

Implementing pack and unpack function for generic type of dht

+) Replace union with the more generic function for packing data into buffer and unpacking data from buffer
+) Change PairIntInt? from struct to std::pair<int,int>

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/client_client_dht_template_impl.hpp

@@ -23 +23 @@
 template<typename T, typename H>
 CClientClientDHTTemplate<T,H>::CClientClientDHTTemplate(const boost::unordered_map<size_t,T>& indexInfoMap,
-                                                      const MPI_Comm& clientIntraComm,
-                                                      int hierarLvl)
+                                                        const MPI_Comm& clientIntraComm,
+                                                        int hierarLvl)
   : index2InfoMapping_(), indexToInfoMappingLevel_()
 {
@@ -46 +46 @@
   int lvl = this->commLevel_.size() - 1;
   computeIndexInfoMappingLevel(indices, this->commLevel_[lvl], lvl);
-  size_t size = indices.numElements();
-  for (size_t idx = 0; idx < size; ++idx)
-  {
-    T& info = indexToInfoMappingLevel_[indices(idx)];
-//    infoIndexMapping_[info].push_back(indices(idx));
-    infoIndexMapping_[indices(idx)] = info;
-  }
 }
 
@@ -130 +123 @@
   int nbIndexReceivedFromOthers = nbIndexToSend;
   if (0 != nbIndexReceivedFromOthers)
-    recvBuffInfo = new unsigned char[nbIndexReceivedFromOthers*infoTypeSize];
+    recvBuffInfo = new unsigned char[nbIndexReceivedFromOthers*ProcessDHTElement<InfoType>::typeSize()];
 
   std::map<int, MPI_Request>::iterator itRequest;
   std::vector<int> demandAlreadyReceived, repondAlreadyReceived;
-
 
   int countIndex = 0;  // Counting of buffer for receiving index
@@ -195 +187 @@
 
   std::map<int, std::vector<InfoType> > client2ClientInfo;
+  std::vector<unsigned char*> infoToSend(src2Index.size());
   std::list<MPI_Request> sendInfoRequest;
-  std::map<int, std::vector<size_t> >::iterator itbSrc2Idx = src2Index.begin(), itSrc2Idx,
+  std::map<int, std::vector<size_t> >::iterator itSrc2Idx = src2Index.begin(),
                                                 iteSrc2Idx = src2Index.end();
-  for (itSrc2Idx = itbSrc2Idx; itSrc2Idx != iteSrc2Idx; ++itSrc2Idx)
+  for (int i=0; itSrc2Idx != iteSrc2Idx; ++itSrc2Idx, ++i)
   {
     int clientSourceRank = itSrc2Idx->first;
     std::vector<size_t>& srcIdx = itSrc2Idx->second;
+    infoToSend[i] = new unsigned char [srcIdx.size()*ProcessDHTElement<InfoType>::typeSize()];
+    int infoIndex = 0;
     for (int idx = 0; idx < srcIdx.size(); ++idx)
     {
-      client2ClientInfo[clientSourceRank].push_back(indexToInfoMappingLevel_[srcIdx[idx]]);
-    }
-    sendInfoToClients(clientSourceRank, client2ClientInfo[clientSourceRank], commLevel, sendInfoRequest);
+      ProcessDHTElement<InfoType>::packElement(indexToInfoMappingLevel_[srcIdx[idx]], infoToSend[i], infoIndex);
+    }
+    sendInfoToClients(clientSourceRank, infoToSend[i], infoIndex, commLevel, sendInfoRequest);
   }
 
@@ -240 +235 @@
         unsigned char* beginBuff = infoBuffBegin[clientSourceRank];
         std::vector<size_t>& indexTmp = client2ClientIndex[clientSourceRank];
-        TypeToBytes<InfoType> u;
+        int infoIndex = 0;
         for (int i = 0; i < actualCountInfo; ++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;
+          ProcessDHTElement<InfoType>::unpackElement(indexToInfoMapping[indexTmp[i]], beginBuff, infoIndex);
         }
         nbSendBuffInfoReceived += actualCountInfo;
@@ -260 +253 @@
   if (0 != maxNbIndexDemandedFromOthers) delete [] recvBuffIndex;
   if (0 != nbIndexReceivedFromOthers) delete [] recvBuffInfo;
+  for (int idx = 0; idx < infoToSend.size(); ++idx) delete [] infoToSend[idx];
   delete [] sendBuff;
   delete [] recvBuff;
@@ -346 +340 @@
   int recvNbIndexCount = recvNbIndexBuff[clientRank];
   unsigned long* recvIndexBuff = new unsigned long[recvNbIndexCount];
-  unsigned char* recvInfoBuff = new unsigned char[recvNbIndexCount*infoTypeSize];
+  unsigned char* recvInfoBuff = new unsigned char[recvNbIndexCount*ProcessDHTElement<InfoType>::typeSize()];
 
   // If a client holds information about index and the corresponding which don't belong to it,
@@ -356 +350 @@
   for (; itIndex != iteIndex; ++itIndex)
     sendIndexToClients(itIndex->first, itIndex->second, commLevel, sendRequest);
-  typename std::map<int, std::vector<InfoType> >::iterator itInfo  = client2ClientInfo.begin(),
+  typename std::map<int, std::vector<InfoType> >::iterator itbInfo = client2ClientInfo.begin(), itInfo,
                                                            iteInfo = client2ClientInfo.end();
-  for (; itInfo != iteInfo; ++itInfo)
-    sendInfoToClients(itInfo->first, itInfo->second, commLevel, sendRequest);
+
+  std::vector<int> infoSizeToSend(client2ClientInfo.size(),0);
+  std::vector<unsigned char*> infoToSend(client2ClientInfo.size());
+  itInfo = itbInfo;
+  for (int idx = 0; itInfo != iteInfo; ++itInfo, ++idx)
+  {
+    const std::vector<InfoType>& infoVec = itInfo->second;
+    int infoVecSize = infoVec.size();
+    std::vector<int> infoIndex(infoVecSize);
+    for (int i = 0; i < infoVecSize; ++i)
+    {
+      infoIndex[i] = infoSizeToSend[idx];
+      ProcessDHTElement<InfoType>::packElement(infoVec[i], NULL, infoSizeToSend[idx]);
+    }
+
+    infoToSend[idx] = new unsigned char[infoSizeToSend[idx]];
+    infoSizeToSend[idx] = 0;
+    for (int i = 0; i < infoVecSize; ++i)
+    {
+      ProcessDHTElement<InfoType>::packElement(infoVec[i], infoToSend[idx], infoSizeToSend[idx]);
+    }
+
+    sendInfoToClients(itInfo->first, infoToSend[idx], infoSizeToSend[idx], commLevel, sendRequest);
+  }
+
 
   std::map<int, MPI_Request>::iterator itRequestIndex, itRequestInfo;
@@ -424 +441 @@
       {
         int count = it->second;
-        TypeToBytes<InfoType> u;
+        InfoType infoValue;
+        int infoIndex = 0;
         for (int i = 0; i < count; ++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));
+          ProcessDHTElement<InfoType>::unpackElement(infoValue, infoBuffBegin[rank], infoIndex);
+          indexToInfoMapping.insert(std::make_pair<size_t,InfoType>(*(indexBuffBegin[rank]+i),infoValue));
         }
 
@@ -448 +465 @@
   }
 
+  for (int idx = 0; idx < infoToSend.size(); ++idx) delete [] infoToSend[idx];
   delete [] sendBuff;
   delete [] sendNbIndexBuff;
@@ -563 +581 @@
 */
 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)
+void CClientClientDHTTemplate<T,H>::sendInfoToClients(int clientDestRank, unsigned char* info, int infoSize,
+                       const MPI_Comm& clientIntraComm, std::list<MPI_Request>& requestSendInfo)
 {
   MPI_Request request;
   requestSendInfo.push_back(request);
 
-  MPI_Isend(&(info)[0], info.size() * infoTypeSize, MPI_CHAR,
+  MPI_Isend(info, infoSize, MPI_CHAR,
             clientDestRank, MPI_DHT_INFO, clientIntraComm, &(requestSendInfo.back()));
 }