Changeset 1129 for XIOS/dev/dev_olga/src/distribution_server.cpp

Timestamp:

05/11/17 18:25:20 (7 years ago)

Author:

mhnguyen

Message:

Updating two-level server.
Each client now can play the role of server: It can forward data to other clients or write data like a server.
Each client must combine all data received from other client(s) before forward them or write them on files

+) Correct some bugs of exchange data_index in domain and axis
+) Reorder some functions in context.cpp to make sure that all necessary attributes are available before computing index
+) Add the mapping index for client to write data.

Test
+) On Curie
+) test_client and test_complete
+) Mode:

• Only one level: Correct
• Two levels: Work if using ddt (bug)

+) Only zoom is tested but other transformations should work
+) No reading test

File:

• XIOS/dev/dev_olga/src/distribution_server.cpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/distribution_server.cpp

@@ -37 +37 @@
 }
 
-CDistributionServer::CDistributionServer(int rank, 
-                                         const std::vector<CArray<int,1> >& globalIndexEachDimension,
-                                         const std::vector<int>& nGlobal)
-  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(),
-    nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_(), 
-    globalIndexEachDimension_(globalIndexEachDimension)
-{
-  createGlobalIndexFromIndex(globalIndexEachDimension, nGlobal);
-}
+// CDistributionServer::CDistributionServer(int rank, 
+//                                          const std::vector<CArray<int,1> >& globalIndexEachDimension,
+//                                          const std::vector<int>& nGlobal)
+//   : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(),
+//     nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_(), 
+//     globalIndexEachDimension_(globalIndexEachDimension)
+// {
+//   createGlobalIndexFromIndex(globalIndexEachDimension, nGlobal);
+// }
 
 CDistributionServer::~CDistributionServer()
@@ -101 +101 @@
 }
 
-void CDistributionServer::createGlobalIndexFromIndex(const std::vector<CArray<int,1> >& globalIndexOnEachDimension,
-                                                     const std::vector<int>& nbGlobal)
-{
-  size_t idx = 0, ssize = 1;
-  for (int i = 0; i < globalIndexOnEachDimension.size(); ++i) ssize *= globalIndexOnEachDimension[i].numElements();
-
-  this->globalIndex_.resize(ssize);
-  size_t nbDim = nbGlobal.size();
-  std::vector<int> idxLoop(nbDim,0);
-  std::vector<int> currentIndex(nbDim);
-  int innerLoopSize = globalIndexOnEachDimension[0].numElements();
-
-  globalLocalIndexMap_.rehash(std::ceil(ssize/globalLocalIndexMap_.max_load_factor()));
-  while (idx<ssize)
-  {
-    for (int i = 0; i < nbDim-1; ++i)
-    {
-      if (idxLoop[i] == globalIndexOnEachDimension[i].numElements())
-      {
-        idxLoop[i] = 0;
-        ++idxLoop[i+1];
-      }
-    }
-
-    for (int i = 1; i < nbDim; ++i)
-      currentIndex[i] = globalIndexOnEachDimension[i](idxLoop[i]);
-
-    size_t mulDim, globalIndex;
-    for (int i = 0; i < innerLoopSize; ++i)
-    {
-      mulDim = 1;
-      globalIndex = globalIndexOnEachDimension[0](i);
-
-      for (int k = 0; k < nbDim; ++k)
-      {
-        mulDim *= nbGlobal[k];
-        globalIndex += (currentIndex[k])*mulDim;
-      }
-      globalLocalIndexMap_[globalIndex] = idx;
-      this->globalIndex_(idx) = globalIndex;
-
-      ++idx;
-    }
-    idxLoop[0] += innerLoopSize;
-  }
-
-}
+// void CDistributionServer::createGlobalIndexFromIndex(const std::vector<CArray<int,1> >& globalIndexOnEachDimension,
+//                                                      const std::vector<int>& nbGlobal)
+// {
+//   size_t idx = 0, ssize = 1;
+//   for (int i = 0; i < globalIndexOnEachDimension.size(); ++i) ssize *= globalIndexOnEachDimension[i].numElements();
+
+//   this->globalIndex_.resize(ssize);
+//   size_t nbDim = nbGlobal.size();
+//   std::vector<int> idxLoop(nbDim,0);
+//   std::vector<int> currentIndex(nbDim);
+//   int innerLoopSize = globalIndexOnEachDimension[0].numElements();
+
+//   globalLocalIndexMap_.rehash(std::ceil(ssize/globalLocalIndexMap_.max_load_factor()));
+//   while (idx<ssize)
+//   {
+//     for (int i = 0; i < nbDim-1; ++i)
+//     {
+//       if (idxLoop[i] == globalIndexOnEachDimension[i].numElements())
+//       {
+//         idxLoop[i] = 0;
+//         ++idxLoop[i+1];
+//       }
+//     }
+
+//     for (int i = 1; i < nbDim; ++i)
+//       currentIndex[i] = globalIndexOnEachDimension[i](idxLoop[i]);
+
+//     size_t mulDim, globalIndex;
+//     for (int i = 0; i < innerLoopSize; ++i)
+//     {
+//       mulDim = 1;
+//       globalIndex = globalIndexOnEachDimension[0](i);
+
+//       for (int k = 0; k < nbDim; ++k)
+//       {
+//         mulDim *= nbGlobal[k];
+//         globalIndex += (currentIndex[k])*mulDim;
+//       }
+//       globalLocalIndexMap_[globalIndex] = idx;
+//       this->globalIndex_(idx) = globalIndex;
+
+//       ++idx;
+//     }
+//     idxLoop[0] += innerLoopSize;
+//   }
+
+// }
 
 /*!
@@ -156 +156 @@
 CArray<size_t,1> CDistributionServer::computeLocalIndex(const CArray<size_t,1>& globalIndex)
 {
-  int ssize = globalIndex.numElements();
-  CArray<size_t,1> localIndex(ssize);
+  size_t ssize = globalIndex.numElements();
+  size_t localIndexSize = std::min(globalIndex_.numElements(), ssize);
+  CArray<size_t,1> localIndex(localIndexSize);
   GlobalLocalMap::const_iterator ite = globalLocalIndexMap_.end(), it;
-  for (int idx = 0; idx < ssize; ++idx)
+  for (int idx = 0, i = 0; idx < ssize; ++idx)
   {
     it = globalLocalIndexMap_.find(globalIndex(idx));
     if (ite != it)
+    {
       localIndex(idx) = it->second;
+      ++i;
+    }
   }