Changeset 630 for XIOS/trunk/src/client_server_mapping_distributed.cpp

Timestamp:

07/07/15 10:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:

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

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -59 +59 @@
     {
       int indexClient = std::distance(itbClientHash, itClientHash)-1;
-
       {
         client2ClientIndexGlobal[indexClient].push_back(globalIndexClient);
@@ -69 +68 @@
   int* sendBuff = new int[nbClient_];
   for (int i = 0; i < nbClient_; ++i) sendBuff[i] = 0;
-  std::map<int, std::vector<size_t> >::iterator it  = client2ClientIndexGlobal.begin(),
-                                                ite = client2ClientIndexGlobal.end();
-  for (; it != ite; ++it) sendBuff[it->first] = 1;
+  std::map<int, std::vector<size_t> >::iterator itb  = client2ClientIndexGlobal.begin(), it,
+                                                ite  = client2ClientIndexGlobal.end();
+  for (it = itb; it != ite; ++it) sendBuff[it->first] = 1;
   int* recvBuff = new int[nbClient_];
   MPI_Allreduce(sendBuff, recvBuff, nbClient_, MPI_INT, MPI_SUM, clientIntraComm_);
@@ -77 +76 @@
   std::list<MPI_Request> sendRequest;
   if (0 != nbIndexSendToOthers)
-      for (it = client2ClientIndexGlobal.begin(); it != ite; ++it)
+      for (it = itb; it != ite; ++it)
          sendIndexGlobalToClients(it->first, it->second, clientIntraComm_, sendRequest);
 
@@ -85 +84 @@
   // The demand message contains global index; meanwhile the responds have server index information
   // Buffer to receive demand from other clients, it can be allocated or not depending whether it has demand(s)
+    // There are some cases we demand duplicate index so need to determine maxium size of demanding buffer
+  for (it = itb; it != ite; ++it) sendBuff[it->first] = (it->second).size();
+  MPI_Allreduce(sendBuff, recvBuff, nbClient_, MPI_INT, MPI_SUM, clientIntraComm_);
+
   unsigned long* recvBuffIndexGlobal = 0;
-//  int maxNbIndexDemandedFromOthers = (nbIndexAlreadyOnClient >= globalIndexToServerMapping_.size())
-//                                   ? 0 : (globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient);
-  int maxNbIndexDemandedFromOthers = (globalIndexToServerMapping_.size() > nbIndexSendToOthers)
-                                      ? globalIndexToServerMapping_.size() : nbIndexSendToOthers;
-
+  int maxNbIndexDemandedFromOthers = recvBuff[clientRank_];
   if (!isDataDistributed_) maxNbIndexDemandedFromOthers = nbDemandingClient * nbIndexSendToOthers; //globalIndexToServerMapping_.size(); // Not very optimal but it's general