Changeset 720

Timestamp:

10/06/15 17:17:10 (9 years ago)

Author:

mhnguyen

Message:

First implementation of hierarchical distributed hashed table

+) Implement dht for int with index of type size_t

Test
+) Local
+) Work correctly

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (1 diff)
• inputs/Version2/iodef.xml (modified) (2 diffs)
• inputs/iodef.xml (modified) (2 diffs)
• src/client_client_dht.cpp (added)
• src/client_client_dht.hpp (added)
• src/client_server_mapping_distributed.cpp (modified) (11 diffs)
• src/client_server_mapping_distributed.hpp (modified) (2 diffs)
• src/mpi_tag.hpp (added)
• src/node/domain.cpp (modified) (1 diff)
• src/node/grid.cpp (modified) (3 diffs)
• src/test/test_client.f90 (modified) (1 diff)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -18 +18 @@
      </file>
      <file id="output_dst" name="output_dst">
-<!--        <field id="test" field_ref="dst_field" name="field" />-->
+<!--        <field field_ref="dst_field" name="field" />-->
      </file>
      <file id="output_dst_regular" name="output_dst_regular" type="one_file">

XIOS/trunk/inputs/Version2/iodef.xml

@@ -19 +19 @@
    <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
      <file id="output" name="output" type="one_file">
-<!--        <field field_ref="field_A" />-->
+        <field field_ref="field_A" />
      </file>
      <file id="output_Axis" name="output_Axis" type="one_file">
@@ -34 +34 @@
      </file>
      <file id="output_Domain_transformed_interpolated" name="output_Domain_transformed_interpolated">
-        <field field_ref="field_Domain_transformed_Interpolated" />
+<!--        <field field_ref="field_Domain_transformed_Interpolated" />-->
      </file>
      <file id="output_Scalar" name="output_Scalar" type="one_file">

XIOS/trunk/inputs/iodef.xml

@@ -12 +12 @@
 
 
-   <file_definition type="multiple_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
+   <file_definition type="one_file" par_access="collective" output_freq="6h" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-        <field field_ref="field_A_zoom" name="field_A" />
+        <field field_ref="field_A_zoom" name="field_A_zoom" />
      </file>
    </file_definition>
@@ -22 +22 @@
      <axis id="axis_A"/>
      <axis id="axis_A_zoom" axis_ref="axis_A">
-       <zoom_axis zoom_begin="1" zoom_size="2" />
+       <zoom_axis zoom_begin="1" zoom_size="1" />
      </axis>
    </axis_definition>

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -12 +12 @@
 #include <boost/functional/hash.hpp>
 #include "utils.hpp"
+#include "client_client_dht.hpp"
+#include "mpi_tag.hpp"
 
 namespace xios
@@ -19 +21 @@
                                                                  const MPI_Comm& clientIntraComm, bool isDataDistributed)
   : CClientServerMapping(), indexClientHash_(), countIndexGlobal_(0), countIndexServer_(0),
-    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_(), isDataDistributed_(isDataDistributed)
+    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_(), isDataDistributed_(isDataDistributed),
+    ccDHT_(0)
 {
   clientIntraComm_ = clientIntraComm;
@@ -25 +28 @@
   MPI_Comm_rank(clientIntraComm,&clientRank_);
   computeHashIndex();
-  computeDistributedServerIndex(globalIndexOfServer, clientIntraComm);
+
+  ccDHT_ = new CClientClientDHT(globalIndexOfServer,
+                                clientIntraComm,
+                                isDataDistributed);
+//  const boost::unordered_map<size_t,int>& globalIndexToServerMappingTmp = clientDht.getGlobalIndexServerMapping();
+//  globalIndexToServerMapping_ = clientDht.getGlobalIndexServerMapping();
+
+
+
+//  computeDistributedServerIndex(globalIndexOfServer, clientIntraComm);
 }
 
 CClientServerMappingDistributed::~CClientServerMappingDistributed()
 {
+  if (0 != ccDHT_) delete ccDHT_;
 }
 
@@ -38 +51 @@
 void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
 {
+  ccDHT_->computeServerIndexMapping(globalIndexOnClient);
+  indexGlobalOnServer_ = ccDHT_->getGlobalIndexOnServer();
+
+/*
   size_t ssize = globalIndexOnClient.numElements(), hashedIndex;
 
@@ -177 +194 @@
   delete [] sendBuff;
   delete [] recvBuff;
+*/
 }
 
@@ -348 +366 @@
 
   // Probing for global index
-  MPI_Iprobe(MPI_ANY_SOURCE, 15, clientIntraComm_, &flagIndexGlobal, &statusIndexGlobal);
+  MPI_Iprobe(MPI_ANY_SOURCE, MPI_DHT_INDEX_0, clientIntraComm_, &flagIndexGlobal, &statusIndexGlobal);
   if ((true == flagIndexGlobal) && (countIndexGlobal_ < recvNbIndexCount))
   {
@@ -354 +372 @@
     indexGlobalBuffBegin_.insert(std::make_pair<int, unsigned long*>(statusIndexGlobal.MPI_SOURCE, recvIndexGlobalBuff+countIndexGlobal_));
     MPI_Irecv(recvIndexGlobalBuff+countIndexGlobal_, count, MPI_UNSIGNED_LONG,
-              statusIndexGlobal.MPI_SOURCE, 15, clientIntraComm_,
+              statusIndexGlobal.MPI_SOURCE, MPI_DHT_INDEX_0, clientIntraComm_,
               &requestRecvIndexGlobal_[statusIndexGlobal.MPI_SOURCE]);
     countIndexGlobal_ += count;
@@ -373 +391 @@
 
   // Probing for server index
-  MPI_Iprobe(MPI_ANY_SOURCE, 12, clientIntraComm_, &flagIndexServer, &statusIndexServer);
+  MPI_Iprobe(MPI_ANY_SOURCE, MPI_DHT_INFO_0, clientIntraComm_, &flagIndexServer, &statusIndexServer);
   if ((true == flagIndexServer) && (countIndexServer_ < recvNbIndexCount))
   {
@@ -379 +397 @@
     indexServerBuffBegin_.insert(std::make_pair<int, int*>(statusIndexServer.MPI_SOURCE, recvIndexServerBuff+countIndexServer_));
     MPI_Irecv(recvIndexServerBuff+countIndexServer_, count, MPI_INT,
-              statusIndexServer.MPI_SOURCE, 12, clientIntraComm_,
+              statusIndexServer.MPI_SOURCE, MPI_DHT_INFO_0, clientIntraComm_,
               &requestRecvIndexServer_[statusIndexServer.MPI_SOURCE]);
 
@@ -400 +418 @@
   requestSendIndexGlobal.push_back(request);
   MPI_Isend(&(indexGlobal)[0], (indexGlobal).size(), MPI_UNSIGNED_LONG,
-            clientDestRank, 15, clientIntraComm, &(requestSendIndexGlobal.back()));
+            clientDestRank, MPI_DHT_INDEX_0, clientIntraComm, &(requestSendIndexGlobal.back()));
 }
 
@@ -417 +435 @@
   requestSendIndexServer.push_back(request);
   MPI_Isend(&(indexServer)[0], (indexServer).size(), MPI_INT,
-            clientDestRank, 12, clientIntraComm, &(requestSendIndexServer.back()));
+            clientDestRank, MPI_DHT_INFO_0, clientIntraComm, &(requestSendIndexServer.back()));
 }
 

XIOS/trunk/src/client_server_mapping_distributed.hpp

@@ -17 +17 @@
 #include "mpi.hpp"
 #include <boost/unordered_map.hpp>
+#include "client_client_dht.hpp"
 
 namespace xios
@@ -118 +119 @@
     //! Flag to specify whether data is distributed or not
     bool isDataDistributed_;
+
+
+    CClientClientDHT* ccDHT_;
 };
 

XIOS/trunk/src/node/domain.cpp

@@ -272 +272 @@
         fillInRectilinearLonLat();
         this->isRedistributed_ = true;
-        info <<"now, we are here " << std::endl;
-        info << "domain " << this->getId() << " ni " << ni.getValue() << " nj " << nj.getValue() << std::endl;
      }
    }

XIOS/trunk/src/node/grid.cpp

@@ -18 +18 @@
 #include "grid_transformation.hpp"
 #include "grid_generate.hpp"
+#include "client_client_dht.hpp"
 
 namespace xios {
@@ -158 +159 @@
    /*!
     * Test whether the data defined on the grid can be outputted in a compressed way.
-    * 
+    *
     * \return true if and only if a mask was defined for this grid
     */
@@ -395 +396 @@
                                                             clientDistribution_->isDataDistributed());
 
+     CClientClientDHT clientDht(serverDistributionDescription.getGlobalIndexRange(),
+                                client->intraComm,
+                                clientDistribution_->isDataDistributed());
+     clientDht.computeServerIndexMapping(clientDistribution_->getGlobalIndex());
+     const std::map<int, std::vector<size_t> >& globalIndexOnServer0 = clientDht.getGlobalIndexOnServer();
+
+     std::map<int, std::vector<size_t> >::const_iterator itbTmp, itTmp, iteTmp;
+     itbTmp = globalIndexOnServer0.begin(); iteTmp = globalIndexOnServer0.end();
+     for (itTmp = itbTmp; itTmp != iteTmp; ++itTmp)
+     {
+       const std::vector<size_t>& tmpVec = itTmp->second; info << "tmpVec0. Rank " << itTmp->first << ". Size = " << tmpVec.size() << ". "  ;
+       for (int i = 0; i < tmpVec.size(); ++i) info << tmpVec[i] << " ";
+       info << std::endl;
+     }
+//
      clientServerMap_->computeServerIndexMapping(clientDistribution_->getGlobalIndex());
      const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
+
+     itbTmp = globalIndexOnServer.begin(); iteTmp = globalIndexOnServer.end();
+     for (itTmp = itbTmp; itTmp != iteTmp; ++itTmp)
+     {
+       const std::vector<size_t>& tmpVec = itTmp->second; info << "tmpVec1. Rank " << itTmp->first << ". Size = " << tmpVec.size() << ". "  ;
+       for (int i = 0; i < tmpVec.size(); ++i) info << tmpVec[i] << " ";
+       info << std::endl;
+     }
+
      const std::vector<size_t>& globalIndexSendToServer = clientDistribution_->getGlobalDataIndexSendToServer();
      std::map<int, std::vector<size_t> >::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;

XIOS/trunk/src/test/test_client.f90

@@ -15 +15 @@
   CHARACTER(len=15) :: calendar_type
   TYPE(xios_context) :: ctx_hdl
-  INTEGER,PARAMETER :: ni_glo=100
-  INTEGER,PARAMETER :: nj_glo=100
+  INTEGER,PARAMETER :: ni_glo=10
+  INTEGER,PARAMETER :: nj_glo=10
   INTEGER,PARAMETER :: llm=5
   DOUBLE PRECISION  :: lval(llm)=1