Changeset 1930 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/gatherer_connector.hpp

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/gatherer_connector.hpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/gatherer_connector.hpp

@@ -29 +29 @@
       
       template<typename T>
-      void transfer(map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut)
+      void transfer(int sizeT, map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut)
       {
-        dataOut.resize(dstSize_) ;
+        // for future, make a specific transfer function for sizeT=1 to avoid multiplication (increasing performance)
+        dataOut.resize(dstSize_*sizeT) ;  
         T* output = dataOut.dataFirst() ;
         for(auto& data : dataIn)
@@ -39 +40 @@
           auto& connector=connector_[rank] ;
           auto& mask=mask_[rank] ;
-          int size=data.second.numElements() ;
+          int size=mask.size() ;
 
           for(int i=0, j=0 ;i<size;i++)
@@ -45 +46 @@
             if (mask[i]) 
             {
-              output[connector[j]] = input[i] ;
+              int cj = connector[j]*sizeT ;
+              int ci = i*sizeT ;
+              for (int k=0;k<sizeT;k++) output[cj+k] = input[ci+k] ;
               j++ ;
             }
@@ -52 +55 @@
       }
     
+      template<typename T>
+      void transfer(map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut)
+      {
+        transfer(1,dataIn,dataOut) ;
+      }
 
       template<typename T>
@@ -93 +101 @@
       void transfer(map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut, T missingValue)
       {
-        dataOut.resize(dstSize_) ;
-        dataOut=missingValue ;
-        transfer(map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut) ;
+        transfer(1, dataIn, dataout, missingValue)
       }
       
       template<typename T>
-      void transfer(CEventServer& event, CArray<T,1>& dataOut)
+      void transfer(int sizeT, map<int, CArray<T,1>>& dataIn, CArray<T,1>& dataOut, T missingValue)
+      {
+        dataOut.resize(dstSize_*sizeT) ;
+        dataOut=missingValue ;
+        transfer(sizeT, dataIn, dataOut) ;
+      }
+
+      template<typename T>
+      void transfer(CEventServer& event, int sizeT, CArray<T,1>& dataOut)
       {
         map<int, CArray<T,1>> dataIn ;
@@ -107 +121 @@
           (*subEvent.buffer) >> data ;
         }
-        transfer(dataIn, dataOut) ;
+        transfer(sizeT, dataIn, dataOut) ;
+      }
+      
+      template<typename T>
+      void transfer(CEventServer& event, CArray<T,1>& dataOut)
+      {
+        transfer(event, 1, dataOut) ;
+      }
+
+      template<typename T>
+      void transfer(CEventServer& event, int sizeT, CArray<T,1>& dataOut, T missingValue)
+      {
+        map<int, CArray<T,1>> dataIn ;
+        for (auto& subEvent : event.subEvents) 
+        {
+          auto& data = dataIn[subEvent.rank]; 
+          (*subEvent.buffer) >> data ;
+        }
+        transfer(sizeT, dataIn, dataOut, missingValue) ;
       }
 
@@ -119 +151 @@
           (*subEvent.buffer) >> data ;
         }
-        transfer(dataIn, dataOut, missingValue) ;
+        transfer(1, dataIn, dataOut, missingValue) ;
       }