Changeset 2385

Timestamp:

07/26/22 09:50:48 (23 months ago)

Author:

jderouillat

Message:

Move in a new method of CLocalView the management of a without redundancy full view connector (used in hash computation of elements)

Location:

XIOS3/trunk/src

Files:

• distribution/local_view.cpp (modified) (2 diffs)
• distribution/local_view.hpp (modified) (2 diffs)
• io/nc4_data_output.cpp (modified) (4 diffs)

XIOS3/trunk/src/distribution/local_view.cpp

@@ -3 +3 @@
 #include "array_new.hpp"
 #include "remote_connector.hpp"
+#include "grid_transform_connector.hpp"
 
 namespace xios
@@ -38 +39 @@
     connector->transferToServer(ind, client, event, message) ;
   }
+  
+  void CLocalView::createWithoutRedundancyFullViewConnector( int globalSize, MPI_Comm comm_file, shared_ptr<CGridTransformConnector>& gridTransformConnector, CArray<size_t,1>& globalIndex )
+  {
+    int comm_file_rank(0);
+    MPI_Comm_rank( comm_file, &comm_file_rank );
+    int comm_file_size(1);
+    MPI_Comm_size( comm_file, &comm_file_size );
 
+    vector<shared_ptr<CLocalView>> srcViews;
+    shared_ptr<CLocalView> srcView = shared_from_this();
+    srcViews.push_back( srcView );
+          
+    // Compute a without redundancy element FULL view to enable a consistent hash computation
+    vector<shared_ptr<CLocalView>> remoteViews;
+    shared_ptr<CLocalView> remoteView;
+    // define the remote view without redundancy (naive distribution of the remote view)
+    int localSize = globalSize/comm_file_size;
+    if ( (comm_file_rank==comm_file_size-1) && (localSize*comm_file_size != globalSize ) )
+      localSize += globalSize-localSize*comm_file_size;
+    globalIndex.resize( localSize );
+    CArray<int,1> index( localSize );
+    for (int iloc=0; iloc<localSize ; iloc++ )
+      {
+        globalIndex(iloc) = comm_file_rank*(globalSize/comm_file_size) + iloc;
+        index(iloc) = iloc;
+      }
+    shared_ptr<CLocalElement> localElement = make_shared<CLocalElement>(comm_file_rank, globalSize, globalIndex) ;
+    localElement->addView(CElementView::FULL, index) ;
+    remoteView = localElement->getView(CElementView::FULL) ;
+    remoteViews.push_back( remoteView );
+        
+    // Compute the connector between current and without redundancy FULL views
+    gridTransformConnector = make_shared<CGridTransformConnector>(srcViews, remoteViews, comm_file ) ;
+    gridTransformConnector->computeConnector(true) ; // eliminateRedondant = true
+
+  }
 
 }

XIOS3/trunk/src/distribution/local_view.hpp

@@ -12 +12 @@
   class CLocalElement ;
   class CRemoteConnector ;
+  class CGridTransformConnector;
 
-  class CLocalView : public CDistributedView
+  class CLocalView : public CDistributedView, public std::enable_shared_from_this<CLocalView>
   {
     public:
@@ -53 +54 @@
     }
 
+    void createWithoutRedundancyFullViewConnector( int globalSize, MPI_Comm comm_file, shared_ptr<CGridTransformConnector>& gridTransformConnector, CArray<size_t,1>& globalIndex );
 
     int getLocalSize(void) {return localSize_ ;}

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -78 +78 @@
          if (!domain->lonvalue.isEmpty() )
          {
-           int comm_file_rank(0);
-           MPI_Comm_rank( comm_file, &comm_file_rank );
-           int comm_file_size(1);
-           MPI_Comm_size( comm_file, &comm_file_size );
-         
-           // Get element current FULL view
-           shared_ptr<CLocalView> srcView = domain->getLocalView(CElementView::FULL) ;
-           vector<shared_ptr<CLocalView>> srcViews;
-           srcViews.push_back( srcView );
-         
+           int globalSize = domain->ni_glo.getValue()*domain->nj_glo.getValue();
+           CArray<size_t,1> globalIndex; // No redundancy globalIndex will be computed with the connector
+           shared_ptr<CGridTransformConnector> gridTransformConnector;
            // Compute a without redundancy element FULL view to enable a consistent hash computation
-           vector<shared_ptr<CLocalView>> remoteViews;
-           shared_ptr<CLocalView> remoteView;
-           // define the remote view without redundancy (naive distribution of the remote view)
-           int globalSize = domain->ni_glo.getValue()*domain->nj_glo.getValue();
-           int localSize = globalSize/comm_file_size;
-           if ( (comm_file_rank==comm_file_size-1) && (localSize*comm_file_size != globalSize ) )
-             localSize += globalSize-localSize*comm_file_size;
-           CArray<size_t,1> globalIndex( localSize );
-           CArray<int,1> index( localSize );
-           for (int iloc=0; iloc<localSize ; iloc++ )
-           {
-             globalIndex(iloc) = comm_file_rank*(globalSize/comm_file_size) + iloc;
-             index(iloc) = iloc;
-           }
-           shared_ptr<CLocalElement> localElement = make_shared<CLocalElement>(comm_file_rank, globalSize, globalIndex) ;
-           localElement->addView(CElementView::FULL, index) ;
-           remoteView = localElement->getView(CElementView::FULL) ;
-           remoteViews.push_back( remoteView );
-         
-           // Compute the connector between current and without redundancy FULL views
-           shared_ptr<CGridTransformConnector> gridTransformConnector = make_shared<CGridTransformConnector>(srcViews, remoteViews, comm_file ) ;
-           gridTransformConnector->computeConnector(true) ; // eliminateRedondant = true
+           domain->getLocalView(CElementView::FULL)->createWithoutRedundancyFullViewConnector( globalSize, comm_file, gridTransformConnector, globalIndex );
+           int localSize = globalIndex.numElements();
+           
            CArray<double,1> lon_distributedValue, lat_distributedValue ;
            gridTransformConnector->transfer(domain->lonvalue, lon_distributedValue );
@@ -120 +94 @@
            for (int iloc=0; iloc<localSize ; iloc++ ) localHash+=globalIndex(iloc)*lon_distributedValue(iloc)*lat_distributedValue(iloc);
            int globalHash(0);
-           globalHash = localHash;
            MPI_Allreduce( &localHash, &globalHash, 1, MPI_INT, MPI_SUM, comm_file  );
          
@@ -1083 +1056 @@
         if (!axis->value.isEmpty() )
         {
-          int comm_file_rank(0);
-          MPI_Comm_rank( comm_file, &comm_file_rank );
-          int comm_file_size(1);
-          MPI_Comm_size( comm_file, &comm_file_size );
-
-          // Get element current FULL view
-          shared_ptr<CLocalView> srcView = axis->getLocalView(CElementView::FULL) ;
-          vector<shared_ptr<CLocalView>> srcViews;
-          srcViews.push_back( srcView );
-          
-          // Compute a without redundancy element FULL view to enable a consistent hash computation
-          vector<shared_ptr<CLocalView>> remoteViews;
-          shared_ptr<CLocalView> remoteView;
-          // define the remote view without redundancy (naive distribution of the remote view)
-          int globalSize = axis->n_glo.getValue();
-          int localSize = globalSize/comm_file_size;
-          if ( (comm_file_rank==comm_file_size-1) && (localSize*comm_file_size != globalSize ) )
-            localSize += globalSize-localSize*comm_file_size;
-          CArray<size_t,1> globalIndex( localSize );
-          CArray<int,1> index( localSize );
-          for (int iloc=0; iloc<localSize ; iloc++ )
-          {
-            globalIndex(iloc) = comm_file_rank*(globalSize/comm_file_size) + iloc;
-            index(iloc) = iloc;
-          }
-          shared_ptr<CLocalElement> localElement = make_shared<CLocalElement>(comm_file_rank, globalSize, globalIndex) ;
-          localElement->addView(CElementView::FULL, index) ;
-          remoteView = localElement->getView(CElementView::FULL) ;
-          remoteViews.push_back( remoteView );
-        
-          // Compute the connector between current and without redundancy FULL views
-          shared_ptr<CGridTransformConnector> gridTransformConnector = make_shared<CGridTransformConnector>(srcViews, remoteViews, comm_file ) ;
-          gridTransformConnector->computeConnector(true) ; // eliminateRedondant = true
+           int globalSize = axis->n_glo.getValue();
+           CArray<size_t,1> globalIndex; // No redundancy globalIndex will be computed with the connector
+           shared_ptr<CGridTransformConnector> gridTransformConnector;
+           // Compute a without redundancy element FULL view to enable a consistent hash computation
+           axis->getLocalView(CElementView::FULL)->createWithoutRedundancyFullViewConnector( globalSize, comm_file, gridTransformConnector, globalIndex );
+           int localSize = globalIndex.numElements();
+
           CArray<double,1> distributedValue ;
           gridTransformConnector->transfer(axis->value, distributedValue );
@@ -1124 +1071 @@
           for (int iloc=0; iloc<localSize ; iloc++ ) localHash+=globalIndex(iloc)*distributedValue(iloc);
           int globalHash(0);
-          globalHash = localHash;
           MPI_Allreduce( &localHash, &globalHash, 1, MPI_INT, MPI_SUM, comm_file  );