Changeset 569 for XIOS/trunk/src/client_server_mapping_distributed.hpp

Timestamp:

03/10/15 10:49:13 (9 years ago)

Author:

mhnguyen

Message:

Correct some bugs on discovering server index and do some code cleanings

+) Add some checking functions to make sure mpi_isend and mpi_irecv work correctly
+) Add comments to code
+) Remove some redundant code and comments

Test
+) On Curie
+) The new functions are tested in test_new_features.f90. Test_client and test_complete work like before
+) Test cases:

• 3 dimension grid with: 1 domain, 1 axis
• 3 dimension grid with: 3 axis
• Attached and connected

+) All pass and results are correct

TODO:
+) Fix zoom bug with grid composed of only one axis

File:

• XIOS/trunk/src/client_server_mapping_distributed.hpp (modified) (4 diffs)

XIOS/trunk/src/client_server_mapping_distributed.hpp

@@ +1 @@
+/*!
+   \file client_server_mapping.hpp
+   \author Ha NGUYEN
+   \since 27 Feb 2015
+   \date 09 Mars 2015
+
+   \brief Mapping between index client and server.
+   Clients pre-calculate all information of server distribution.
+ */
+
 #ifndef __XIOS_CLIENT_SERVER_MAPPING_DISTRIBUTED_HPP__
 #define __XIOS_CLIENT_SERVER_MAPPING_DISTRIBUTED_HPP__
@@ -10 +20 @@
 namespace xios
 {
-
+/*!
+  \class CClientServerMappingDistributed
+  This class computes index of data which are sent to server as well as index of data
+on server side with a distributed alogrithm. Each client has a piece of information about the distribution
+of servers. To find out all these info, first of all, all client join a discovering process in which each client
+announces the others about the info they have as well as demand others info they are lacked of. After this process,
+each client has enough info to decide to which client it need to send a demand for corresponding server of a global index.
+The alogrithm depends on hashed index.
+*/
 class CClientServerMappingDistributed : public CClientServerMapping
 {
@@ -17 +35 @@
     CClientServerMappingDistributed(const boost::unordered_map<size_t,int>& globalIndexOfServer,
                                     const MPI_Comm& clientIntraComm);
+
+    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient);
 
     virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
@@ -25 +45 @@
 
   protected:
+    // Redistribute global index and server index among clients
     void computeDistributedServerIndex(const boost::unordered_map<size_t,int>& globalIndexOfServer,
                                        const MPI_Comm& clientIntraComm);
 
-    void processReceivedRequest(unsigned long* buffIndexGlobal, int* buffIndexServer, int count);
-
-    void testSendRequest(std::list<MPI_Request>& sendRequest);
-
-    int computeBuffCount(MPI_Request& requestRecvIndexGlobal, MPI_Request& requestRecvIndexServer);
-
-    void computeHashIndex();
-
-//    void sendIndexServerToClients(std::map<int, std::vector<int> >& indexServer,
-//                                  const MPI_Comm& clientIntraComm,
-//                                  std::list<MPI_Request>& requestSendIndexServer);
-
-//    void sendIndexGlobalToClients(std::map<int, std::vector<size_t> >& indexGlobal,
-//                                  const MPI_Comm& clientIntraComm,
-//                                  std::list<MPI_Request>& requestSendIndexGlobal);
-
+    // Send server index to clients
     void sendIndexServerToClients(int clientDestRank, std::vector<int>& indexServer,
                                   const MPI_Comm& clientIntraComm, std::list<MPI_Request>& requestSendIndexServer);
 
+    // Send global index to clients
     void sendIndexGlobalToClients(int clientDestRank, std::vector<size_t>& indexGlobal,
                                   const MPI_Comm& clientIntraComm, std::list<MPI_Request>& requestSendIndexGlobal);
 
-    void resetRequestAndCount();
+    // Verify sending request
+    void testSendRequest(std::list<MPI_Request>& sendRequest);
 
+    // Process request
+    void processReceivedRequest(unsigned long* buffIndexGlobal, int* buffIndexServer, int count);
+
+    // Probe and receive message of global index
     void probeIndexGlobalMessageFromClients(unsigned long* recvIndexGlobalBuff, int recvNbIndexCount);
 
+    // Probe and receive message of server index
     void probeIndexServerMessageFromClients(int* recvIndexServerBuff, int recvNbIndexCount);
 
+    // Compute range of hashing
+    void computeHashIndex();
+
+    // Compute size of receiving buffer for global index
     int computeBuffCountIndexGlobal(MPI_Request& requestRecv);
 
+    // Compute size of receiving buffer for server index
     int computeBuffCountIndexServer(MPI_Request& requestRecv);
+
+    // Reset request map
+    void resetReceivingRequestAndCount();
+
   private:
+    //! Mapping of global index to the corresponding server
     boost::unordered_map<size_t,int> globalIndexToServerMapping_;
 
+    //! Bounds of hash index
+    std::vector<size_t> indexClientHash_;
+
+    //! Number of client
+    int nbClient_;
+
+    //! Rank of client
+    int clientRank_;
+
+    //! Counting of buffer for receiving global index
+    int countIndexGlobal_;
+
+    //! Counting of buffer for receiving server index
+    int countIndexServer_;
+
+    //! intracommuntion of clients
+    MPI_Comm clientIntraComm_;
+
+    //! Request returned by MPI_IRecv function about global index
     std::map<int, MPI_Request> requestRecvIndexGlobal_;
 
+    //! Request returned by MPI_IRecv function about index of server
     std::map<int, MPI_Request> requestRecvIndexServer_;
 
-    std::vector<size_t> indexClientHash_;
-
-    int nbClient_;
-
-    int clientRank_;
-
-    int countIndexGlobal_;
-
-    int countIndexServer_;
-
-    MPI_Comm clientIntraComm_;
-
+    //! Mapping client rank and the beginning position of receiving buffer for message of global index from this client
     std::map<int, unsigned long*> indexGlobalBuffBegin_;
 
+    //! Mapping client rank and the begining position of receiving buffer for message of server index from this client
     std::map<int, int*> indexServerBuffBegin_;
-
 };