Changeset 906

Timestamp:

07/28/16 10:56:52 (8 years ago)

Author:

mhnguyen

Message:

Fixing bug: Ticket 98

+) Correct the way to distribute index of domain (axis) in case there are more
clients than number of index

Test
+) On Curie
+) Small grid (2x2x1) and 6 clients - 1 server: Pass

Location:

XIOS/trunk/src

Files:

• client_server_mapping_distributed.cpp (modified) (2 diffs)
• node/axis.cpp (modified) (2 diffs)
• node/domain.cpp (modified) (6 diffs)

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -13 +13 @@
 #include "utils.hpp"
 #include "mpi_tag.hpp"
+#include "context.hpp"
+#include "context_client.hpp"
 
 namespace xios
@@ -36 +38 @@
 void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
 {
+  CContext* context=CContext::getCurrent() ;
+  CContextClient* client=context->client ;
+  int nbServer=client->serverSize;
+
   ccDHT_->computeIndexInfoMapping(globalIndexOnClient);
   const CClientClientDHTInt::Index2VectorInfoTypeMap& infoIndexMap = (ccDHT_->getInfoIndexMap());
   CClientClientDHTInt::Index2VectorInfoTypeMap::const_iterator itb = infoIndexMap.begin(), ite = infoIndexMap.end(), it;
-  std::vector<size_t> nbInfoIndex(ccDHT_->getNbClient(),0);
+  std::vector<size_t> nbInfoIndex(nbServer,0);
 
   for (it = itb; it != ite; ++it)

XIOS/trunk/src/node/axis.cpp

@@ -400 +400 @@
     int nbServer = client->serverSize;
     int range, clientSize = client->clientSize;
+    int rank = client->clientRank;
 
     size_t ni = this->n.getValue();
@@ -453 +454 @@
       for (int i = 0; i < nGlobAxis.size(); ++i) globalSizeIndex *= nGlobAxis[i];
       indexBegin = 0;
-      for (int i = 0; i < clientSize; ++i)
-      {
-        range = globalSizeIndex / clientSize;
-        if (i < (globalSizeIndex%clientSize)) ++range;
-        if (i == client->clientRank) break;
-        indexBegin += range;
-      }
-      indexEnd = indexBegin + range - 1;
+      if (globalSizeIndex <= clientSize)
+      {
+        indexBegin = rank%globalSizeIndex;
+        indexEnd = indexBegin;
+      }
+      else
+      {
+        for (int i = 0; i < clientSize; ++i)
+        {
+          range = globalSizeIndex / clientSize;
+          if (i < (globalSizeIndex%clientSize)) ++range;
+          if (i == client->clientRank) break;
+          indexBegin += range;
+        }
+        indexEnd = indexBegin + range - 1;
+      }
 
       CServerDistributionDescription serverDescription(nGlobAxis, nbServer);

XIOS/trunk/src/node/domain.cpp

@@ -532 +532 @@
        if (bounds_lon_end.isEmpty()) bounds_lon_end=180.-1e-8 ;
      }
-     
+
      for(j=0;j<nj;++j)
        for(i=0;i<ni;++i)
@@ -921 +921 @@
      size_t zoom_jend=global_zoom_jbegin+global_zoom_nj-1 ;
 
-     
+
      size_t dn=data_i_index.numElements() ;
      int i,j ;
      size_t k,ind ;
-     
+
      for(k=0;k<dn;k++)
      {
@@ -936 +936 @@
        {
           i=(data_i_index(k)+data_ibegin)%ni ;
-          j=(data_i_index(k)+data_ibegin)/ni ;          
+          j=(data_i_index(k)+data_ibegin)/ni ;
        }
 
@@ -947 +947 @@
      }
    }
-       
-         
-     
-
-     
-
-   
+
+
+
+
+
+
+
    void CDomain::checkEligibilityForCompressedOutput(void)
    {
@@ -1358 +1358 @@
     CContextClient* client=context->client ;
     int nbServer=client->serverSize;
+    int rank = client->clientRank;
     bool doComputeGlobalIndexServer = true;
 
@@ -1445 +1446 @@
     for (int i = 0; i < nGlobDomain_.size(); ++i) globalSizeIndex *= nGlobDomain_[i];
     indexBegin = 0;
-    for (int i = 0; i < clientSize; ++i)
-    {
-      range = globalSizeIndex / clientSize;
-      if (i < (globalSizeIndex%clientSize)) ++range;
-      if (i == client->clientRank) break;
-      indexBegin += range;
-    }
-    indexEnd = indexBegin + range - 1;
+    if (globalSizeIndex <= clientSize)
+    {
+      indexBegin = rank%globalSizeIndex;
+      indexEnd = indexBegin;
+    }
+    else
+    {
+      for (int i = 0; i < clientSize; ++i)
+      {
+        range = globalSizeIndex / clientSize;
+        if (i < (globalSizeIndex%clientSize)) ++range;
+        if (i == client->clientRank) break;
+        indexBegin += range;
+      }
+      indexEnd = indexBegin + range - 1;
+    }
 
     CServerDistributionDescription serverDescription(nGlobDomain_, nbServer);