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

Timestamp:

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

Author:

mhnguyen

Message:

Refactoring transformation code

+) On exchanging information during transformation, not only global index are sent but also local index
+) Correct a bug in distributed hash table (dht)
+) Add new type for dht
+) Clean up some redundant codes

Test
+) On Curie
+) Every test passes
+) Code runs faster in some cases (up to 30%)

File:

• XIOS/trunk/src/client_server_mapping_distributed.hpp (modified) (1 diff)

XIOS/trunk/src/client_server_mapping_distributed.hpp

@@ -42 +42 @@
     virtual ~CClientServerMappingDistributed();
 
-
-
   protected:
-    // Redistribute global index and server index among clients
-    void computeDistributedServerIndex(const boost::unordered_map<size_t,int>& globalIndexOfServer,
-                                       const MPI_Comm& clientIntraComm);
-
-    // 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);
-
-    // 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();
-
-  protected:
-    //! 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_;
-
-    //! 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_;
-
-    //! Flag to specify whether data is distributed or not
-    bool isDataDistributed_;
-
-//    CClientClientDHTTemplate<int>* ccDHT_;
     CClientClientDHTInt* ccDHT_;
 };