Changeset 1236 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

Timestamp:

08/04/17 16:03:34 (7 years ago)

Author:

mhnguyen

Message:

Making some changes to allow pools with different number of server

+) Associate context client to each grid distribution (This should be changed in the future)
+) Correct some buffer size estimation
+) Clean some redundant code and add comments

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp (modified) (6 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -137 +137 @@
     * \return A map associating the server rank with its minimum buffer size.
     */
-   std::map<int, StdSize> CAxis::getAttributesBufferSize()
+   std::map<int, StdSize> CAxis::getAttributesBufferSize(CContextClient* client)
    {
      // For now the assumption is that secondary server pools consist of the same number of procs.
      // CHANGE the line below if the assumption changes.
-     CContext* context = CContext::getCurrent();
-     CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[0] : context->client;
+     // CContext* context = CContext::getCurrent();
+     // CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[0] : context->client;
 
      std::map<int, StdSize> attributesSizes = getMinimumBufferSizeForAttributes();
 
-     bool isNonDistributed = (n == n_glo);
+     bool isNonDistributed = (n = n_glo);     
 
      if (client->isServerLeader())
@@ -168 +168 @@
      {
        // size estimation for sendDistributedValue
-       boost::unordered_map<int, vector<size_t> >::const_iterator it, ite = indSrv_.end();
-       for (it = indSrv_.begin(); it != ite; ++it)
+       boost::unordered_map<int, vector<size_t> >::const_iterator it, ite = indSrv_[client].end();
+       for (it = indSrv_[client].begin(); it != ite; ++it)
        {
          size_t sizeIndexEvent = CArray<int,1>::size(it->second.size());
-         if (isCompressible_)
-           sizeIndexEvent += CArray<int,1>::size(indWrittenSrv_[it->first].size());
+         // if (isCompressible_)
+         //   sizeIndexEvent += CArray<int,1>::size(indWrittenSrv_[it->first].size());
 
          size_t sizeValEvent = CArray<double,1>::size(it->second.size());
@@ -505 +505 @@
 
     int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
+
+    connectedServerRank_.clear();
+    nbSenders.clear();
+
     for (int p = 0; p < nbSrvPools; ++p)
     {
@@ -589 +593 @@
 
 
-      indSrv_.swap(globalIndexAxisOnServer);
-      CClientServerMapping::GlobalIndexMap::const_iterator it  = indSrv_.begin(),
-                                                           ite = indSrv_.end();
-      connectedServerRank_.clear();
-      for (it = indSrv_.begin(); it != ite; ++it) {
-        connectedServerRank_.push_back(it->first);
+      indSrv_[client].swap(globalIndexAxisOnServer);
+      CClientServerMapping::GlobalIndexMap::const_iterator it  = indSrv_[client].begin(),
+                                                           ite = indSrv_[client].end();
+      
+      for (it = indSrv_[client].begin(); it != ite; ++it) {
+        connectedServerRank_[client].push_back(it->first);
       }
 
       for (std::list<int>::const_iterator it = serverZeroIndexLeader.begin(); it != serverZeroIndexLeader.end(); ++it)
-        connectedServerRank_.push_back(*it);
+        connectedServerRank_[client].push_back(*it);
 
        // Even if a client has no index, it must connect to at least one server and 
        // send an "empty" data to this server
-       if (connectedServerRank_.empty())
-        connectedServerRank_.push_back(client->clientRank % client->serverSize);
-
-      nbConnectedClients_ = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_);
+       if (connectedServerRank_[client].empty())
+        connectedServerRank_[client].push_back(client->clientRank % client->serverSize);
+
+      nbSenders[client] = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[client]);
 
       delete clientServerMap;
@@ -1019 +1023 @@
 
       boost::unordered_map<int, std::vector<size_t> >::const_iterator it, iteMap;
-      iteMap = indSrv_.end();
-      for (int k = 0; k < connectedServerRank_.size(); ++k)
+      iteMap = indSrv_[client].end();
+      for (int k = 0; k < connectedServerRank_[client].size(); ++k)
       {
         int nbData = 0;
-        int rank = connectedServerRank_[k];        
-        it = indSrv_.find(rank);
+        int rank = connectedServerRank_[client][k];        
+        it = indSrv_[client].find(rank);
         if (iteMap != it)
           nbData = it->second.size();
@@ -1090 +1094 @@
           listData.back() << list_label.back();
 
-        eventData.push(rank, nbConnectedClients_[rank], listData.back());
+        eventData.push(rank, nbSenders[client][rank], listData.back());
       }