Commit 34f8d975 authored by Ján Bobot's avatar Ján Bobot Committed by Jakub Klinkovský
Browse files

Refactored getPlanarMesh function to use ParallelFor

parent 1770eec4

src/Benchmarks/Mesh/MeshBenchmarks.h

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ struct MeshBenchmarks 
   static void benchmark_planar( Benchmark & benchmark, const Config::ParameterContainer & parameters, const M & mesh_src )

   {

      auto benchmark_func = [&] () {

         const auto planarMesh = getPlanarMesh< DecomposerVersion >( mesh_src );

         auto meshBuilder = planarCorrection< DecomposerVersion >( mesh_src );

      };



      benchmark.time< Devices::Host >( "CPU",

src/TNL/Meshes/Geometry/getDecomposedMesh.h

+22 −21
Original line number Diff line number Diff line
@@ -38,29 +38,30 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh ) 
   using LocalIndexType = typename TriangleMesh::LocalIndexType;

   using PointType = typename TriangleMesh::PointType;

   using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polygon, DecomposerVersion >;

   constexpr int CellDimension = TriangleMesh::getMeshDimension();

   

   MeshBuilder meshBuilder;



   const GlobalIndexType inPointsCount = inMesh.template getEntitiesCount< 0 >();

   const GlobalIndexType inCellsCount = inMesh.template getEntitiesCount< TriangleMesh::getMeshDimension() >();

   const GlobalIndexType inCellsCount = inMesh.template getEntitiesCount< CellDimension >();



   // Find the number of output points and cells as well as

   // starting indeces at which every cell will start writing new decomposed points and cells

   using IndexPair = std::pair< GlobalIndexType, GlobalIndexType >;

   Array< IndexPair, Devices::Host > indeces( inCellsCount );

   Array< IndexPair, Devices::Host > indeces( inCellsCount + 1 );

   auto setCounts = [&] ( GlobalIndexType i ) {

      const auto cell = inMesh.template getEntity< TriangleMesh::getMeshDimension() >( i );

      const auto cell = inMesh.template getEntity< CellDimension >( i );

      indeces[ i ] = EntityDecomposer::getExtraPointsAndEntitiesCount( cell );

   };

   ParallelFor< Devices::Host >::exec( 0, inCellsCount, setCounts );

   const auto lastCounts = indeces[ indeces.getSize() - 1 ];

   indeces[ inCellsCount ] = { 0, 0 }; // extend exclusive prefix sum by one element to also get result of reduce at the same time

   auto reduction = [] ( const IndexPair& a, const IndexPair& b ) -> IndexPair {

      return { a.first + b.first, a.second + b.second };

   };

   inplaceExclusiveScan( indeces, 0, indeces.getSize(), reduction, std::make_pair( 0, 0 ) );

   const auto lastIndexPair = indeces[ indeces.getSize() - 1 ];

   const GlobalIndexType outPointsCount = inPointsCount + lastIndexPair.first + lastCounts.first;

   const GlobalIndexType outCellsCount = lastIndexPair.second + lastCounts.second;

   const auto& reduceResult = indeces[ inCellsCount ];

   const GlobalIndexType outPointsCount = inPointsCount + reduceResult.first;

   const GlobalIndexType outCellsCount = reduceResult.second;

   meshBuilder.setPointsCount( outPointsCount );

   meshBuilder.setCellsCount( outCellsCount );
@@ -72,8 +73,8 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host >& inMesh ) 


   // Decompose each cell

   auto decomposeCell = [&] ( GlobalIndexType i ) mutable {

      const auto cell = inMesh.template getEntity< TriangleMesh::getMeshDimension() >( i );

      const auto indexPair = indeces[ i ];

      const auto cell = inMesh.template getEntity< CellDimension >( i );

      const auto& indexPair = indeces[ i ];



      // Lambda for adding new points

      GlobalIndexType setPointIndex = inPointsCount + indexPair.first;
@@ -139,30 +140,30 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host > & inMesh ) 
   using LocalIndexType = typename TetrahedronMesh::LocalIndexType;

   using PointType = typename TetrahedronMesh::PointType;

   using EntityDecomposer = EntityDecomposer< MeshConfig, Topologies::Polyhedron, DecomposerVersion, SubdecomposerVersion >;

   constexpr int CellDimension = TetrahedronMesh::getMeshDimension();

   

   MeshBuilder meshBuilder;



   const GlobalIndexType inPointsCount = inMesh.template getEntitiesCount< 0 >();

   const GlobalIndexType inCellsCount = inMesh.template getEntitiesCount< TetrahedronMesh::getMeshDimension() >();



   using IndexPair = std::pair< GlobalIndexType, GlobalIndexType >;

   Array< IndexPair, Devices::Host > indeces( inCellsCount );

   const GlobalIndexType inCellsCount = inMesh.template getEntitiesCount< CellDimension >();



   // Find the number of output points and cells as well as

   // starting indeces at which every cell will start writing new decomposed points and cells

   using IndexPair = std::pair< GlobalIndexType, GlobalIndexType >;

   Array< IndexPair, Devices::Host > indeces( inCellsCount + 1 );

   auto setCounts = [&] ( GlobalIndexType i ) {

      const auto cell = inMesh.template getEntity< TetrahedronMesh::getMeshDimension() >( i );

      const auto cell = inMesh.template getEntity< CellDimension >( i );

      indeces[ i ] = EntityDecomposer::getExtraPointsAndEntitiesCount( cell );

   };

   ParallelFor< Devices::Host >::exec( 0, inCellsCount, setCounts );

   const auto lastCounts = indeces[ indeces.getSize() - 1 ];

   indeces[ inCellsCount ] = { 0, 0 }; // extend exclusive prefix sum by one element to also get result of reduce at the same time

   auto reduction = [] ( const IndexPair& a, const IndexPair& b ) -> IndexPair {

      return { a.first + b.first, a.second + b.second };

   };

   inplaceExclusiveScan( indeces, 0, indeces.getSize(), reduction, std::make_pair( 0, 0 ) );

   const auto lastIndexPair = indeces[ indeces.getSize() - 1 ];

   const GlobalIndexType outPointsCount = inPointsCount + lastIndexPair.first + lastCounts.first;

   const GlobalIndexType outCellsCount = lastIndexPair.second + lastCounts.second;

   const auto& reduceResult = indeces[ inCellsCount ];

   const GlobalIndexType outPointsCount = inPointsCount + reduceResult.first;

   const GlobalIndexType outCellsCount = reduceResult.second;

   meshBuilder.setPointsCount( outPointsCount );

   meshBuilder.setCellsCount( outCellsCount );
@@ -174,8 +175,8 @@ decomposeMesh( const Mesh< MeshConfig, Devices::Host > & inMesh ) 


   // Decompose each cell

   auto decomposeCell = [&] ( GlobalIndexType i ) mutable {

      const auto cell = inMesh.template getEntity< TetrahedronMesh::getMeshDimension() >( i );

      const auto indexPair = indeces[ i ];

      const auto cell = inMesh.template getEntity< CellDimension >( i );

      const auto& indexPair = indeces[ i ];



      // Lambda for adding new points

      GlobalIndexType setPointIndex = inPointsCount + indexPair.first;

src/TNL/Meshes/Geometry/getPlanarMesh.h

+195 −159

File changed.

Preview size limit exceeded, changes collapsed.

src/TNL/Meshes/MeshDetails/initializer/EntitySeedMatrix.h

+38 −0
Original line number Diff line number Diff line
@@ -28,6 +28,18 @@ class EntitySeedMatrix< MeshConfig, EntityTopology, false > 
      using SubentityMatrixType = typename MeshTraitsType::template SubentityMatrixType< EntityTopology::dimension >;

      using NeighborCountsArray = typename MeshTraitsType::NeighborCountsArray;



      EntitySeedMatrix() = default;



      EntitySeedMatrix( const EntitySeedMatrix& other )

      {

         this->matrix = other.matrix;

      }



      EntitySeedMatrix( EntitySeedMatrix&& other )

      {

         this->matrix = std::move( other.matrix );

      }



      class EntitySeedMatrixSeed

      {

         using RowView = typename SubentityMatrixType::RowView;
@@ -156,6 +168,18 @@ class EntitySeedMatrix< MeshConfig, Topologies::Vertex, false > 
      using SubentityMatrixType = typename MeshTraitsType::template SubentityMatrixType< 0 >;

      using NeighborCountsArray = typename MeshTraitsType::NeighborCountsArray;



      EntitySeedMatrix() = default;



      EntitySeedMatrix( const EntitySeedMatrix& other )

      {

         this->matrix = other.matrix;

      }



      EntitySeedMatrix( EntitySeedMatrix&& other )

      {

         this->matrix = std::move( other.matrix );

      }



      class EntitySeedMatrixSeed

      {

         using RowView = typename SubentityMatrixType::RowView;
@@ -285,6 +309,20 @@ class EntitySeedMatrix< MeshConfig, EntityTopology, true > 
      using SubentityMatrixType = typename MeshTraitsType::template SubentityMatrixType< EntityTopology::dimension >;

      using NeighborCountsArray = typename MeshTraitsType::NeighborCountsArray;



      EntitySeedMatrix() = default;



      EntitySeedMatrix( const EntitySeedMatrix& other )

      {

         this->matrix = other.matrix;

         this->counts = other.counts;

      }



      EntitySeedMatrix( EntitySeedMatrix&& other )

      {

         this->matrix = std::move( other.matrix );

         this->counts = std::move( other.counts );

      }



      class EntitySeedMatrixSeed

      {

         using RowView = typename SubentityMatrixType::RowView;