Changeset 1143 for XIOS/dev/dev_olga/src/node/axis.cpp

Timestamp:

05/22/17 18:11:12 (7 years ago)

Author:

mhnguyen

Message:

Updating compressed index output on using 2-level server

+) Update compressed index output with new grid distribution

Test
+) On Curie
+) test_complete:

• Mode: classical and 2 level server
• config: 4 clients + 4 servers
• passed

File:

• XIOS/dev/dev_olga/src/node/axis.cpp (modified) (8 diffs)

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

@@ -25 +25 @@
       , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
       , isClientAfterTransformationChecked(false)
-      , isDistributed_(false), hasBounds_(false), isCompressible_(false)
+      , hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
       , transformationMap_(), hasValue(false), doZoomByIndex_(false)
@@ -36 +36 @@
       , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
       , isClientAfterTransformationChecked(false)
-      , isDistributed_(false), hasBounds_(false), isCompressible_(false)
+      , hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
       , transformationMap_(), hasValue(false), doZoomByIndex_(false)
@@ -76 +76 @@
    bool CAxis::isDistributed(void) const
    {
-      return isDistributed_;
+      return (!this->begin.isEmpty() && !this->n.isEmpty() && (this->begin + this->n < this->n_glo)) ||
+             (!this->n.isEmpty() && (this->n != this->n_glo));;
    }
 
@@ -266 +267 @@
       this->checkZoom();
       this->checkMask();
-      this->checkBounds();
-
-      isDistributed_ = (!this->begin.isEmpty() && !this->n.isEmpty() && (this->begin + this->n < this->n_glo)) ||
-                       (!this->n.isEmpty() && (this->n != this->n_glo));
+      this->checkBounds();      
    }
 
@@ -613 +611 @@
       computedWrittenIndex_ = true;
 
-      CContext* context=CContext::getCurrent() ;
-      CContextClient* client = context->client; 
+      CContext* context=CContext::getCurrent();      
+      CContextServer* server = context->server; 
 
       std::vector<int> nBegin(1), nSize(1), nBeginGlobal(1), nGlob(1);
@@ -621 +619 @@
       nBeginGlobal[0] = 0; 
       nGlob[0]        = n_glo;
-      CDistributionServer srvDist(client->clientSize, nBegin, nSize, nBeginGlobal, nGlob); 
+      CDistributionServer srvDist(server->intraCommSize, nBegin, nSize, nBeginGlobal, nGlob); 
       const CArray<size_t,1>& writtenGlobalIndex  = srvDist.getGlobalIndex();
 
@@ -628 +626 @@
                                                           ite = globalLocalIndexMap_.end(), it;          
       CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(),
-                                       itSrve = writtenGlobalIndex.end(), itSrv;
-      localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
+                                       itSrve = writtenGlobalIndex.end(), itSrv;      
+
+      for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
+      {
+        indGlo = *itSrv;
+        if (ite != globalLocalIndexMap_.find(indGlo))
+        {          
+          ++nbWritten;
+        }                 
+      }
+
+      localIndexToWriteOnServer.resize(nbWritten);
+
+      nbWritten = 0;
       for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
       {
@@ -638 +648 @@
           ++nbWritten;
         }                 
+      }
+
+      if (isCompressible())
+      {
+        nbWritten = 0;
+        boost::unordered_map<size_t,size_t> localGlobalIndexMap;
+        for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
+        {
+          indGlo = *itSrv;
+          if (ite != globalLocalIndexMap_.find(indGlo))
+          {
+            localGlobalIndexMap[localIndexToWriteOnServer(nbWritten)] = indGlo;
+            ++nbWritten;
+          }                 
+        }
+
+        nbWritten = 0;
+        for (int idx = 0; idx < data_index.numElements(); ++idx)
+        {
+          if (localGlobalIndexMap.end() != localGlobalIndexMap.find(data_index(idx)))
+          {
+            ++nbWritten;
+          }
+        }
+
+        compressedIndexToWriteOnServer.resize(nbWritten);
+        nbWritten = 0;
+        for (int idx = 0; idx < data_index.numElements(); ++idx)
+        {
+          if (localGlobalIndexMap.end() != localGlobalIndexMap.find(data_index(idx)))
+          {
+            compressedIndexToWriteOnServer(nbWritten) = localGlobalIndexMap[data_index(idx)];
+            ++nbWritten;
+          }
+        }
+
+        numberWrittenIndexes_ = nbWritten;
+        if (isDistributed())
+        {
+               
+          MPI_Allreduce(&numberWrittenIndexes_, &totalNumberWrittenIndexes_, 1, MPI_INT, MPI_SUM, server->intraComm);
+          MPI_Scan(&numberWrittenIndexes_, &offsetWrittenIndexes_, 1, MPI_INT, MPI_SUM, server->intraComm);
+          offsetWrittenIndexes_ -= numberWrittenIndexes_;
+        }
+        else
+          totalNumberWrittenIndexes_ = numberWrittenIndexes_;
       }