Changeset 829 for XIOS/trunk/src/client_server_mapping.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.hpp (modified) (4 diffs)

XIOS/trunk/src/client_server_mapping.hpp

@@ -13 +13 @@
 #include "array_new.hpp"
 #include "mpi.hpp"
+#include <boost/unordered_map.hpp>
 
 namespace xios {
@@ -23 +24 @@
 class CClientServerMapping
 {
+public:
+  typedef boost::unordered_map<int, std::vector<size_t> > GlobalIndexMap;
+  typedef std::map<int, std::vector<int> > LocalIndexMap;
   public:
     /** Default constructor */
@@ -33 +37 @@
     virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient) = 0;
 
-//    // In case of computing local index on client sent to server
+//    // Simple case, global index on client and index on servers
 //    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-//                                           const CArray<int,1>& localIndexOnClient) = 0;
-
-    // Simple case, global index on client and index on servers
-    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                           const std::vector<CArray<size_t,1>* >& globalIndexOnServer);
+//                                           const std::vector<CArray<size_t,1>* >& globalIndexOnServer);
 
     static std::map<int,int> computeConnectedClients(int nbServer, int nbClient,
@@ -45 +45 @@
                                                      const std::vector<int>& connectedServerRank);
 
-    const std::map<int, std::vector<size_t> >& getGlobalIndexOnServer() const;
-    const std::map<int, std::vector<int> >& getLocalIndexSendToServer() const;
+    const GlobalIndexMap& getGlobalIndexOnServer() const;
+//    const LocalIndexMap& getLocalIndexSendToServer() const;
 
   protected:
-    void defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                          const std::vector<CArray<size_t,1>* >& globalIndexOnServer,
-                                          const CArray<int,1>* localIndexOnClient = 0);
+//    void defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+//                                          const std::vector<CArray<size_t,1>* >& globalIndexOnServer,
+//                                          const CArray<int,1>* localIndexOnClient = 0);
 
   protected:
     //! Global index of data on SERVER, which are calculated by client(s)
-    std::map<int, std::vector<size_t> > indexGlobalOnServer_;
+    GlobalIndexMap indexGlobalOnServer_;
 
     //! Index of the local data which will be sent to the corresponding server(s)
-    std::map<int, std::vector<int> >  localIndexSend2Server_;
+//    LocalIndexMap  localIndexSend2Server_;
 
     //!< Number of clients connected to a server