Changeset 1176 for XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp

Timestamp:

06/21/17 09:09:59 (7 years ago)

Author:

yushan

Message:

save modif

File:

• XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp (modified) (8 diffs)

XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp

@@ -104 +104 @@
   int clientRank;
   MPI_Comm_rank(commLevel,&clientRank);
+  ep_lib::MPI_Barrier(commLevel);
   int groupRankBegin = this->getGroupBegin()[level];
   int nbClient = this->getNbInGroup()[level];
@@ -180 +181 @@
   int currentIndex = 0;
   int nbRecvClient = recvRankClient.size();
-  for (int idx = 0; idx < nbRecvClient; ++idx)
-  {
-    if (0 != recvNbIndexClientCount[idx])
-    {
-      recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, request);
-    }
-    currentIndex += recvNbIndexClientCount[idx];
-  }
-
+  
   boost::unordered_map<int, size_t* >::iterator itbIndex = client2ClientIndex.begin(), itIndex,
                                                 iteIndex = client2ClientIndex.end();
@@ -194 +187 @@
     sendIndexToClients(itIndex->first, (itIndex->second), sendNbIndexBuff[itIndex->first-groupRankBegin], commLevel, request);
 
+
+
+  for (int idx = 0; idx < nbRecvClient; ++idx)
+  {
+    if (0 != recvNbIndexClientCount[idx])
+    {
+      recvIndexFromClients(recvRankClient[idx], recvIndexBuff+currentIndex, recvNbIndexClientCount[idx], commLevel, request);
+    }
+    currentIndex += recvNbIndexClientCount[idx];
+  }
+
+  
   std::vector<ep_lib::MPI_Status> status(request.size());
   MPI_Waitall(request.size(), &request[0], &status[0]);
+  
 
   CArray<size_t,1>* tmpGlobalIndex;
@@ -208 +214 @@
     --level;
     computeIndexInfoMappingLevel(*tmpGlobalIndex, this->internalComm_, level);
+      
   }
   else // Now, we are in the last level where necessary mappings are.
@@ -372 +379 @@
   MPI_Comm_rank(commLevel,&clientRank);
   computeSendRecvRank(level, clientRank);
+  ep_lib::MPI_Barrier(commLevel);
 
   int groupRankBegin = this->getGroupBegin()[level];
@@ -666 +674 @@
 
   int nRequest = 0;
+  
+
+  for (int idx = 0; idx < sendNbRank.size(); ++idx)
+  {
+    MPI_Isend(&sendNbElements[0]+idx, 1, MPI_INT,
+              sendNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
+    ++nRequest;
+  }
+  
   for (int idx = 0; idx < recvNbRank.size(); ++idx)
   {
     MPI_Irecv(&recvNbElements[0]+idx, 1, MPI_INT,
               recvNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
-    ++nRequest;
-  }
-
-  for (int idx = 0; idx < sendNbRank.size(); ++idx)
-  {
-    MPI_Isend(&sendNbElements[0]+idx, 1, MPI_INT,
-              sendNbRank[idx], MPI_DHT_INDEX_1, this->internalComm_, &request[nRequest]);
     ++nRequest;
   }
@@ -714 +724 @@
   
   int nRequest = 0;
-  for (int idx = 0; idx < recvBuffSize; ++idx)
-  {
-    MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
-              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
-    ++nRequest;
-  }
+  
 
   for (int idx = 0; idx < sendBuffSize; ++idx)
@@ -734 +739 @@
     MPI_Isend(&sendBuff[idx*2], 2, MPI_INT,
               sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    ++nRequest;
+  }
+  
+  for (int idx = 0; idx < recvBuffSize; ++idx)
+  {
+    MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
+              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
     ++nRequest;
   }