Changeset 832

Timestamp:

03/23/16 16:11:13 (8 years ago)

Author:

mhnguyen

Message:

Weight computation of dynamic transformation is done only one for each time stamp

+) Each weight computation of dynamic transformation attached to timestamp
+) Remove some redundant codes

Test
+) On Curie
+) All tests pass

Location:

XIOS/trunk/src

Files:

• client_client_dht_decl.cpp (modified) (1 diff)
• client_client_dht_template_impl.hpp (modified) (1 diff)
• client_server_mapping.cpp (modified) (2 diffs)
• filter/spatial_transform_filter.cpp (modified) (1 diff)
• transformation/grid_transformation.cpp (modified) (2 diffs)
• transformation/grid_transformation.hpp (modified) (3 diffs)

XIOS/trunk/src/client_client_dht_decl.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 05 Oct 2015
-   \date 05 Oct 2015
+   \date 23 Mars 2016
 
    \brief Distributed hashed table implementation.

XIOS/trunk/src/client_client_dht_template_impl.hpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 05 Oct 2015
-   \date 05 Oct 2015
+   \date 23 Mars 2016
 
    \brief Distributed hashed table implementation.

XIOS/trunk/src/client_server_mapping.cpp

@@ -19 +19 @@
 {
 }
-
-///*!
-//  Compute mapping global index of server which client sends to.
-//  \param [in] globalIndexOnClient global index on client
-//  \param [in] globalIndexServer global index of servers
-//*/
-//void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-//                                                     const std::vector<CArray<size_t,1>* >& globalIndexServer)
-//{
-//  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexServer);
-//}
-
-///*!
-//   Compute index of data which are sent to server and index global on server side
-//   \param [in] globalIndexOnClient global index of data on client
-//   \param [in] globalIndexServer global index of server(s)
-//   \param [in] localIndexOnClient local index of data on client which are sent to server
-//*/
-//void CClientServerMapping::defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-//                                                            const std::vector<CArray<size_t,1>* >& globalIndexServer,
-//                                                            const CArray<int,1>* localIndexOnClient)
-//{
-//  int nServer = globalIndexServer.size();
-//  std::vector<CArray<size_t,1>::const_iterator> itBegin(nServer), itEnd(nServer), it(nServer);
-//  for (int i = 0; i < nServer; ++i)
-//  {
-//    itBegin[i] = it[i] = globalIndexServer[i]->begin();
-//    itEnd[i]   = globalIndexServer[i]->end();
-//  }
-//
-//  size_t ssize = globalIndexOnClient.numElements();
-//  for (int i = 0; i < ssize; ++i)
-//  {
-//    for (int j = 0; j < nServer; ++j)
-//    {
-//      // Just temporarily, it's bad.
-//      if (std::binary_search(itBegin[j], itEnd[j], globalIndexOnClient(i)))
-//      {
-//        // Just try to calculate local index server on client side
-//        (indexGlobalOnServer_[j]).push_back((globalIndexOnClient)(i));
-//        if (0 != localIndexOnClient) (localIndexSend2Server_[j]).push_back((*localIndexOnClient)(i));
-//        else
-//          (localIndexSend2Server_[j]).push_back(i);
-//        continue;
-//      }
-//    }
-//  }
-//}
 
 /*!
@@ -134 +86 @@
 }
 
-///*!
-//  Return local index of data that is send to server
-//  \return mapping of server rank and local index of sending data on the client
-//*/
-//const CClientServerMapping::LocalIndexMap& CClientServerMapping::getLocalIndexSendToServer() const
-//{
-//  return localIndexSend2Server_;
-//}
-
 /*!
   Return global index of data on each connected server.

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -87 +87 @@
         std::vector<CArray<double,1>* > dataAuxInputs(data.size()-1);
         for (size_t idx = 0; idx < dataAuxInputs.size(); ++idx) dataAuxInputs[idx] = &(data[idx+1]->data);
-        gridTransformation->computeAll(dataAuxInputs);
+        gridTransformation->computeAll(dataAuxInputs, packet->timestamp);
       }
       packet->data.resize(gridTransformation->getGridDestination()->storeIndex_client.numElements());

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -25 +25 @@
 : gridSource_(source), gridDestination_(destination), originalGridSource_(source),
   algoTypes_(), nbAlgos_(0), currentGridIndexToOriginalGridIndex_(), tempGrids_(),
-  auxInputs_(), dynamicalTransformation_(false)
+  auxInputs_(), dynamicalTransformation_(false), timeStamp_()
 
 {
@@ -356 +356 @@
   -) Make current grid destination become grid source in the next transformation
 */
-void CGridTransformation::computeAll(const std::vector<CArray<double,1>* >& dataAuxInputs)
+void CGridTransformation::computeAll(const std::vector<CArray<double,1>* >& dataAuxInputs, Time timeStamp)
 {
   if (nbAlgos_ < 1) return;
   if (!auxInputs_.empty() && !dynamicalTransformation_) { dynamicalTransformation_ = true; return; }
-  if (dynamicalTransformation_) DestinationIndexMap().swap(currentGridIndexToOriginalGridIndex_);  // Reset map
+  if (dynamicalTransformation_)
+  {
+    if (timeStamp_.insert(timeStamp).second)
+      DestinationIndexMap().swap(currentGridIndexToOriginalGridIndex_);  // Reset map
+    else
+      return;
+  }
 
   CContext* context = CContext::getCurrent();

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -15 +15 @@
 #include "generic_algorithm_transformation.hpp"
 #include "transformation_enum.hpp"
+#include "duration.hpp"
 
 namespace xios {
@@ -42 +43 @@
   ~CGridTransformation();
 
-  void computeAll(const std::vector<CArray<double,1>* >& dataAuxInput=std::vector<CArray<double,1>* >());
+  void computeAll(const std::vector<CArray<double,1>* >& dataAuxInput=std::vector<CArray<double,1>* >(), Time timeStamp = 0);
 
   const std::map<int, CArray<int,1> >& getLocalIndexToSendFromGridSource() const;
@@ -109 +110 @@
   std::vector<StdString> auxInputs_;
   bool dynamicalTransformation_;
+
+  std::set<Time> timeStamp_; //! Time stamps for auxillary inputs
 };