synchronizeMaterialInCells implementation using Accelerator API #1584

reynierf · 2024-08-21T14:07:44Z

This is an implementation of synchronizeMaterialInCells using Accelerator API.
Can be enabled by setting ARCANE_ACC_MAT_SYNCHRONIZER=1, using original version otherwise.

grospelliergilles

Please do the following actions:

re-indent all the source files using clang-format to make the indentation coherent.
add tests for your implementation

grospelliergilles · 2024-08-21T16:36:27Z

arcane/src/arcane/accelerator/IndexSelecter.h

@@ -0,0 +1,136 @@
+#ifndef ACCELERATOR_INDEX_SELECTER_H


Add correct header.

This file should not be here because it uses Arcane Internal API and so it can not be used outside of Arcane. A better place should be in materials/internal.

Do not use IParallelMng in this class. Instead pass a RunQueue.

Use only needed header to compile this file (for example no need to include arcane/SubDomain.h)

Use full name for class member name (for example replace m_is_acc_avl by m_is_accelerator_policy)

grospelliergilles · 2024-08-21T16:38:02Z

arcane/src/arcane/core/ParallelMngDispatcher.cc

@@ -240,7 +240,7 @@ class ParallelMngDispatcher::Impl
  {
    if (m_is_accelerator_aware_disabled)
      return false;
-    if (!m_queue.get())
+    if (!m_queue.get() || m_runner->executionPolicy() == Arcane::Accelerator::eExecutionPolicy::Sequential)


Do not modify it. Add the test to the user of this class

grospelliergilles · 2024-08-21T16:38:49Z

arcane/src/arcane/core/materials/MatItemEnumerator.h

-#ifdef ARCANE_COMPONENT_arcane_materials
+/*#ifdef ARCANE_COMPONENT_arcane_materials
 #ifndef ARCANE_TRACE_ENUMERATOR
 #define ARCANE_TRACE_ENUMERATOR
 #endif
-#endif
+#endif*/


Why this modification ? Please restore the original version.

grospelliergilles · 2024-08-21T16:39:27Z

arcane/src/arcane/materials/MeshMaterialMng.cc

@@ -140,6 +140,7 @@ MeshMaterialMng(const MeshHandle& mesh_handle,const String& name)
  String s = platform::getEnvironmentVariable("ARCANE_ALLENVCELL_FOR_RUNCOMMAND");
  if (!s.null())
    m_is_allcell_2_allenvcell = true;
+  m_mms = new MeshMaterialSynchronizer(this);


Use full name for member variable (m_material_synchronzizer)

grospelliergilles · 2024-08-21T16:41:49Z

arcane/src/arcane/materials/internal/IMeshMaterialSynchronizerImpl.h

+#include "arcane/utils/TraceAccessor.h"
+#include "arcane/utils/ArrayView.h"
+
+#include "arcane/VariableTypedef.h"
+
+#include "arcane/materials/MaterialsGlobal.h"
+#include "arcane/materials/MatItem.h"
+
+#include "arcane/materials/CellToAllEnvCellConverter.h"
+#include "arcane/accelerator/core/RunQueue.h"
+
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/IndexSelecter.h"
+#include "arcane/accelerator/SpanViews.h"
+#include "arcane/IApplication.h"
+#include "arcane/core/ISubDomain.h"
+#include "arcane/accelerator/Reduce.h"
+#include "arcane/accelerator/Runner.h"
+#include "arcane/accelerator/VariableViews.h"
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/RunCommandLoop.h"
+#include "arcane/accelerator/RunCommandEnumerate.h"
+#include "arcane/accelerator/core/RunQueueBuildInfo.h"
+#include "arcane/accelerator/core/Memory.h"
+#include "arcane/accelerator/MaterialVariableViews.h"
+#include "arcane/accelerator/RunCommandMaterialEnumerate.h"
+#include "arcane/accelerator/core/IAcceleratorMng.h"
+#include "arcane/accelerator/core/RunQueueEvent.h"


Remove unneeded headers

grospelliergilles · 2024-08-21T16:43:08Z

arcane/src/arcane/materials/internal/MeshMaterialSynchronizerImpl.h

+#include "arcane/utils/TraceAccessor.h"
+#include "arcane/utils/ArrayView.h"
+
+#include "arcane/VariableTypedef.h"
+
+#include "arcane/materials/MaterialsGlobal.h"
+#include "arcane/materials/MatItem.h"
+
+#include "arcane/materials/CellToAllEnvCellConverter.h"
+#include "arcane/accelerator/core/RunQueue.h"
+
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/IndexSelecter.h"
+#include "arcane/accelerator/SpanViews.h"
+#include "arcane/IApplication.h"
+#include "arcane/core/ISubDomain.h"
+#include "arcane/accelerator/Reduce.h"
+#include "arcane/accelerator/Runner.h"
+#include "arcane/accelerator/VariableViews.h"
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/RunCommandLoop.h"
+#include "arcane/accelerator/RunCommandEnumerate.h"
+#include "arcane/accelerator/core/RunQueueBuildInfo.h"
+#include "arcane/accelerator/core/Memory.h"
+#include "arcane/accelerator/MaterialVariableViews.h"
+#include "arcane/accelerator/RunCommandMaterialEnumerate.h"
+#include "arcane/accelerator/core/IAcceleratorMng.h"
+#include "arcane/accelerator/core/RunQueueEvent.h"
+


Remove unneeded header

grospelliergilles · 2024-08-21T16:43:46Z

arcane/src/arcane/materials/internal/MeshMaterialSynchronizerImplAcc.h

+#include "arcane/utils/TraceAccessor.h"
+#include "arcane/utils/ArrayView.h"
+
+#include "arcane/VariableTypedef.h"
+#include <arcane/core/MeshVariableArrayRef.h>
+
+#include "arcane/materials/MaterialsGlobal.h"
+#include "arcane/materials/MatItem.h"
+
+#include "arcane/materials/CellToAllEnvCellConverter.h"
+#include "arcane/accelerator/core/RunQueue.h"
+
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/IndexSelecter.h"
+#include "arcane/accelerator/SpanViews.h"
+#include "arcane/IApplication.h"
+#include "arcane/core/ISubDomain.h"
+#include "arcane/accelerator/Reduce.h"
+#include "arcane/accelerator/Runner.h"
+#include "arcane/accelerator/VariableViews.h"
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/RunCommandLoop.h"
+#include "arcane/accelerator/RunCommandEnumerate.h"
+#include "arcane/accelerator/core/RunQueueBuildInfo.h"
+#include "arcane/accelerator/core/Memory.h"
+#include "arcane/accelerator/MaterialVariableViews.h"
+#include "arcane/accelerator/RunCommandMaterialEnumerate.h"
+#include "arcane/accelerator/core/IAcceleratorMng.h"
+#include "arcane/accelerator/core/RunQueueEvent.h"
+
+#include "arcane/materials/internal/IMeshMaterialSynchronizerImpl.h"


Remove unneeded headers

grospelliergilles · 2024-08-21T16:44:44Z

arcane/src/arcane/materials/internal/MeshMaterialSynchronizer.h

+#include "arcane/materials/CellToAllEnvCellConverter.h"
+#include "arcane/accelerator/core/RunQueue.h"
+
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/IndexSelecter.h"
+#include "arcane/accelerator/SpanViews.h"
+#include "arcane/IApplication.h"
+#include "arcane/core/ISubDomain.h"
+#include "arcane/accelerator/Reduce.h"
+#include "arcane/accelerator/Runner.h"
+#include "arcane/accelerator/VariableViews.h"
+#include "arcane/accelerator/Accelerator.h"
+#include "arcane/accelerator/RunCommandLoop.h"
+#include "arcane/accelerator/RunCommandEnumerate.h"
+#include "arcane/accelerator/core/RunQueueBuildInfo.h"
+#include "arcane/accelerator/core/Memory.h"
+#include "arcane/accelerator/MaterialVariableViews.h"
+#include "arcane/accelerator/RunCommandMaterialEnumerate.h"
+#include "arcane/accelerator/core/IAcceleratorMng.h"
+#include "arcane/accelerator/core/RunQueueEvent.h"
+#include "arcane/utils/ValueConvert.h"
+
+#include "arcane/materials/internal/IMeshMaterialSynchronizerImpl.h"
+#include "arcane/materials/internal/MeshMaterialSynchronizerImplAcc.h"
+#include "arcane/materials/internal/MeshMaterialSynchronizerImpl.h"


Remove unneeded headers

grospelliergilles · 2024-08-21T16:48:35Z

arcane/src/arcane/materials/srcs.cmake

+  MeshMaterialSynchronizerImpl.cc
+  MeshMaterialSynchronizerImplAcc.cc


Please rename MeshMaterialSynchronizerImpl to LegacyMeshMaterialSynchronizerImpl and MeshMaterialSynchronizerImplAcc to AcceleratorMeshMaterialSynchronizerImpl.

codecov · 2024-08-21T17:16:22Z

Codecov Report

Attention: Patch coverage is 94.58128% with 11 lines in your changes missing coverage. Please review.

Project coverage is 69.63%. Comparing base (1b0afbc) to head (eed1c97).
Report is 9 commits behind head on main.

Files with missing lines	Patch %	Lines
...cane/src/arcane/materials/internal/IndexSelecter.h	83.33%	5 Missing ⚠️
...terials/AcceleratorMeshMaterialSynchronizerImpl.cc	96.77%	0 Missing and 3 partials ⚠️
arcane/src/arcane/core/ParallelMngDispatcher.cc	0.00%	0 Missing and 1 partial ⚠️
...ne/materials/LegacyMeshMaterialSynchronizerImpl.cc	98.48%	0 Missing and 1 partial ⚠️
...e/src/arcane/materials/MeshMaterialSynchronizer.cc	85.71%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1584      +/-   ##
==========================================
+ Coverage   69.60%   69.63%   +0.03%     
==========================================
  Files        2241     2245       +4     
  Lines      160221   160357     +136     
  Branches    18470    18484      +14     
==========================================
+ Hits       111514   111659     +145     
+ Misses      42052    42042      -10     
- Partials     6655     6656       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

DavidDureau · 2024-09-02T13:10:44Z

At line https://github.com/reynierf/framework/blob/a8e44d0fcb60638575f28a5e5a4a02b7661e825d/arcane/src/arcane/materials/MeshMaterialSynchronizerImplAcc.cc#L41 , could we allocate m_mat_presence as a temporary and sub-domain-depend variable?

, m_mat_presence(VariableBuildInfo(material_mng->mesh(),"ArcaneMaterialSyncPresence", IVariable::PTemporary|IVariable::PSubDomainDepend))

It would prevent positive false when we compare mono-domain vs. multi-domain.

grospelliergilles requested changes Aug 21, 2024

View reviewed changes

grospelliergilles approved these changes Sep 26, 2024

View reviewed changes

reynierf and others added 7 commits September 26, 2024 13:24

synchronizeMaterialInCells version API accélérateur

c56e1cb

modifications for pull request

fe6858b

fixing for pull request

04be3d3

clang format done

1bbcaa0

Add tests, fixing parallel execution with no cuda

85087ef

updating remaining copyrigths

7c7a836

Changing encoding of IndexSelecter.h to utf8 with BOM

eed1c97

grospelliergilles force-pushed the dev/synchronizeMaterialInCellsGPU branch from 0df7d6d to eed1c97 Compare September 26, 2024 11:24

grospelliergilles merged commit 09fd773 into arcaneframework:main Sep 26, 2024
27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

synchronizeMaterialInCells implementation using Accelerator API #1584

synchronizeMaterialInCells implementation using Accelerator API #1584

reynierf commented Aug 21, 2024

grospelliergilles left a comment

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

grospelliergilles Aug 21, 2024

codecov bot commented Aug 21, 2024 •

edited

Loading

DavidDureau commented Sep 2, 2024

		MeshMaterialSynchronizerImpl.cc
		MeshMaterialSynchronizerImplAcc.cc

synchronizeMaterialInCells implementation using Accelerator API #1584

synchronizeMaterialInCells implementation using Accelerator API #1584

Conversation

reynierf commented Aug 21, 2024

grospelliergilles left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Aug 21, 2024 • edited Loading

Codecov Report

DavidDureau commented Sep 2, 2024

codecov bot commented Aug 21, 2024 •

edited

Loading