Changeset 1930 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp

Timestamp:

09/10/20 13:51:02 (4 years ago)

Author:

ymipsl

Message:

Big update on on going work related to data distribution and transfer between clients and servers.
Revisite of the source and store filter using "connectors".

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp

@@ -19 +19 @@
   {
     // generic method, every element can be distributed
+    int nDst = dstView_.size() ;
+    vector<size_t> dstSliceSize(nDst) ;
+    dstSliceSize[0] = 1 ;  
+    for(int i=1; i<nDst; i++)  dstSliceSize[i] = dstView_[i-1]->getGlobalSize()*dstSliceSize[i-1] ;
+  
+    CClientClientDHTTemplate<int>::Index2VectorInfoTypeMap dataInfo ;
+
+    CClientClientDHTTemplate<size_t>::Index2VectorInfoTypeMap info ; // info map
+    for(int pos=0; pos<nDst; pos++)
+    {
+      size_t sliceSize=dstSliceSize[pos] ;
+      map<int,CArray<size_t,1>> globalIndexView ;
+      dstView_[pos]->getGlobalIndexView(globalIndexView) ;
+      
+      CClientClientDHTTemplate<size_t>::Index2VectorInfoTypeMap lastInfo(info) ;
+
+      if (pos>0)
+      {
+        CArray<size_t,1> ranks(globalIndexView.size()) ;
+        auto it=globalIndexView.begin() ;
+        for(int i=0 ; i<ranks.numElements();i++,it++) ranks(i)=it->first ;
+        CClientClientDHTTemplate<size_t> dataRanks(info, localComm_) ;
+        dataRanks.computeIndexInfoMapping(ranks) ;
+        lastInfo = dataRanks.getInfoIndexMap() ;
+      }
+      
+      info.clear() ;
+      for(auto& it : globalIndexView)
+      {
+        int rank = it.first ;
+        auto& globalIndex = it.second ;
+        auto& inf = info[rank] ;
+        if (pos==0) for(int i=0;i<globalIndex.numElements();i++) inf.push_back(globalIndex(i)) ;
+        else
+        {
+          auto& lastGlobalIndex = lastInfo[rank] ;
+          for(size_t lastGlobalInd : lastGlobalIndex)
+          {
+            for(int i=0;i<globalIndex.numElements();i++) inf.push_back(globalIndex(i)*sliceSize+lastGlobalInd) ;
+          }
+        } 
+      }
+
+      if (pos==nDst-1)
+      {
+         for(auto& it : info)
+         {
+           int rank=it.first ;
+           auto& globalIndex = it.second ;
+           for(auto globalInd : globalIndex) dataInfo[globalInd].push_back(rank) ;
+         }
+      } 
+    }
+
+    CClientClientDHTTemplate<int> dataRanks(dataInfo, localComm_) ;
+/*
     CClientClientDHTTemplate<int>::Index2VectorInfoTypeMap info ; // info map
         
@@ -37 +93 @@
     
     CClientClientDHTTemplate<int> dataRanks(info, localComm_) ;
-    
+*/    
     // generate list of global index for src view
     int nSrc = srcView_.size() ;
     vector<size_t> srcSliceSize(nSrc) ;
-    srcSliceSize[nSrc-1] = 1 ;
-    for(int i=nSrc-2; i>=0; i--)  srcSliceSize[i] = srcView_[i+1]->getGlobalSize()*srcSliceSize[i+1] ;
-    
+//    srcSliceSize[nSrc-1] = 1 ;
+//    for(int i=nSrc-2; i>=0; i--)  srcSliceSize[i] = srcView_[i+1]->getGlobalSize()*srcSliceSize[i+1] ;
+   
+    srcSliceSize[0] = 1 ;  
+    for(int i=1; i<nSrc; i++)  srcSliceSize[i] = srcView_[i-1]->getGlobalSize()*srcSliceSize[i-1] ;
+
     vector<size_t> srcGlobalIndex ;
     size_t sliceIndex=0 ;
@@ -54 +113 @@
     vector<map<int, set<size_t>>> elements(nSrc) ; // internal representation of elements composing the grid
 
-    srcSliceSize[nSrc-1] = srcView_[nSrc-1]->getGlobalSize() ;
-    for(int i=nSrc-2 ; i>=0 ; i--) srcSliceSize[i] = srcView_[i]->getGlobalSize()*srcSliceSize[i+1] ;
+//    srcSliceSize[nSrc-1] = srcView_[nSrc-1]->getGlobalSize() ;
+//    for(int i=nSrc-2 ; i>=0 ; i--) srcSliceSize[i] = srcView_[i]->getGlobalSize()*srcSliceSize[i+1] ;
 
     for(auto& indRanks : returnInfo)
@@ -61 +120 @@
       size_t gridIndexGlo=indRanks.first ;
       auto& ranks = indRanks.second ;
-      for(int i=0;i<nSrc;i++)
+      for(int i=nSrc-1; i>=0; i--)
       {
         auto& element = elements[i] ;
-        size_t localIndGlo = gridIndexGlo % srcSliceSize[i] ;
+        size_t localIndGlo = gridIndexGlo / srcSliceSize[i] ;
+        gridIndexGlo = gridIndexGlo % srcSliceSize[i] ;
         for(int rank : ranks) element[rank].insert(localIndGlo) ;
       }