Changeset 843 for XIOS/trunk/src/transformation

Timestamp:

04/26/16 16:04:04 (8 years ago)

Author:

mhnguyen

Message:

Several improvements

+) Replace some time-consuming operations by simpler ones

Test
+) On Curie
+) All tests pass

Location:

XIOS/trunk/src/transformation

Files:

• generic_algorithm_transformation.cpp (modified) (1 diff)
• generic_algorithm_transformation.hpp (modified) (1 diff)
• transformation_mapping.cpp (modified) (2 diffs)

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -83 +83 @@
       {
         size_t srcGridSize = globalIndexSrcGrid[idx].size();
-//        globaIndexWeightFromDestToSource[(it->first)].reserve(srcGridSize);
-        globaIndexWeightFromDestToSource[(it->first)].resize(srcGridSize);
+//        globaIndexWeightFromDestToSource[(it->first)].resize(srcGridSize);
+        DestinationGlobalIndex& tmp = globaIndexWeightFromDestToSource[(it->first)];
+        tmp.resize(srcGridSize);
         for (int i = 0; i < srcGridSize; ++i)
         {
-          globaIndexWeightFromDestToSource[(it->first)][i] = (make_pair(it->second, make_pair(globalIndexSrcGrid[idx][i], currentVecWeight[i])));
+          tmp[i].first = it->second;
+          tmp[i].second = make_pair(globalIndexSrcGrid[idx][i], currentVecWeight[i]);
+//          globaIndexWeightFromDestToSource[(it->first)][i] = (make_pair(it->second, make_pair(globalIndexSrcGrid[idx][i], currentVecWeight[i])));
         }
       }

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -21 +21 @@
 class CGenericAlgorithmTransformation
 {
+protected:
+  typedef std::vector<std::pair<int, std::pair<size_t,double> > > DestinationGlobalIndex;
 public:
   // Stupid global index map, it must be replaced by tuple
   // Mapping between global index map of DESTINATION and its local index with pair of global index of SOURCE and weights
-  typedef boost::unordered_map<size_t, std::vector<std::pair<int, std::pair<size_t,double> > > > DestinationIndexMap;
+  typedef boost::unordered_map<size_t, DestinationGlobalIndex> DestinationIndexMap;
+
 protected:
   typedef boost::unordered_map<size_t,int> GlobalLocalMap;

XIOS/trunk/src/transformation/transformation_mapping.cpp

@@ -31 +31 @@
 
   // Mapping of global index and pair containing rank and local index
-  CClientClientDHTPairIntInt::Index2InfoTypeMap globalIndexOfServer;
+  CClientClientDHTPairIntInt::Index2InfoTypeMap globalIndexOfClientSrc;
+  globalIndexOfClientSrc.rehash(std::ceil(globalLocalIndexGridSrc.size()/globalIndexOfClientSrc.max_load_factor()));
+
   PairIntInt pairIntInt;
   for (; itIndex != iteIndex; ++itIndex)
@@ -37 +39 @@
     pairIntInt.first  = clientRank;
     pairIntInt.second = itIndex->second;
-    globalIndexOfServer[itIndex->first] = pairIntInt;
-  }
-
-  gridIndexClientClientMapping_ = new CClientClientDHTPairIntInt(globalIndexOfServer,
+    globalIndexOfClientSrc[itIndex->first] = pairIntInt;
+  }
+
+  gridIndexClientClientMapping_ = new CClientClientDHTPairIntInt(globalIndexOfClientSrc,
                                                                  client->intraComm);
 }