Skip to content

Commit e71f4b8

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1185 from arcaneframework/dev/gg-add-accelerator-api-to-materials
Add support for accelerator API for component 'arcane_materials'
2 parents d356b1e + 2bf81b2 commit e71f4b8

File tree

6 files changed

+82
-61
lines changed

6 files changed

+82
-61
lines changed

‎arcane/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,9 @@ add_subdirectory(samples_build)
10231023
# Pour l'instant on le fait après les tests pour cohérence avec l'existant
10241024
# car avant ces répertoires étaientt dans ceapart.
10251025
add_subdirectory(src/arcane/cartesianmesh)
1026-
add_subdirectory(src/arcane/materials)
1026+
if (ARCANE_HAS_ACCELERATOR_API)
1027+
add_subdirectory(src/arcane/materials)
1028+
endif()
10271029

10281030
# ----------------------------------------------------------------------------
10291031
# Ajoute les sources spécifiques CEA.

‎arcane/ceapart/src/arcane/tests/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
if (ARCANE_HAS_ACCELERATOR_API)
44
list(APPEND ARCANE_SOURCES
55
AdiProjectionModule.cc
6-
MaterialHeatTestModule.cc
6+
${ARCANE_MATERIAL_SOURCES}
77
)
88
set(ARCANE_ACCELERATOR_SOURCES
99
AdiProjectionModule.cc
@@ -23,7 +23,7 @@ arcane_add_library(arcane_cea_tests
2323

2424
target_compile_definitions(arcane_cea_tests PRIVATE ARCANE_COMPONENT_arcane_cea_tests)
2525

26-
target_link_libraries(arcane_cea_tests PUBLIC arcane_materials arcane_cea_geometric arcane_cea ${ARCANE_BASE_LIBRARIES})
26+
target_link_libraries(arcane_cea_tests PUBLIC $<TARGET_NAME_IF_EXISTS:arcane_materials> arcane_cea_geometric arcane_cea ${ARCANE_BASE_LIBRARIES})
2727
if(TARGET arcane_aleph)
2828
target_link_libraries(arcane_cea_tests PUBLIC arcane_aleph)
2929
endif()

‎arcane/ceapart/src/arcane/tests/srcs.cmake‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
set(ARCANE_SOURCES
22
RayMeshIntersectionUnitTest.cc
3-
MeshMaterialTesterModule.cc
43
CartesianMeshTesterModule.cc
5-
HyodaMixedCellsUnitTest.cc
64
GeometricUnitTest.cc
7-
MeshMaterialSyncUnitTest.cc
8-
MeshMaterialSimdUnitTest.cc
95
AMRCartesianMeshTesterModule.cc
106
CartesianMeshTestUtils.cc
117
CartesianMeshTestUtils.h
@@ -15,6 +11,14 @@ set(ARCANE_SOURCES
1511
IMaterialEquationOfState.h
1612
)
1713

14+
set(ARCANE_MATERIAL_SOURCES
15+
HyodaMixedCellsUnitTest.cc
16+
MeshMaterialTesterModule.cc
17+
MeshMaterialSyncUnitTest.cc
18+
MeshMaterialSimdUnitTest.cc
19+
MaterialHeatTestModule.cc
20+
)
21+
1822
set(AXL_FILES
1923
RayMeshIntersectionUnitTest
2024
MaterialHeatTest

‎arcane/ceapart/tests/CMakeLists.txt‎

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -61,58 +61,60 @@ if (Parmetis_FOUND AND Lima_FOUND)
6161
ARCANE_ADD_TEST_PARALLEL(case_part_metis_2_mli testCasePart-2.arc 4)
6262
endif ()
6363

64-
arcane_add_test(material1 testMaterial-1.arc "-m 10")
65-
arcane_add_test_parallel_thread(material1 testMaterial-1.arc 4 "-m 10")
66-
arcane_add_test_parallel(material1_legacy_sync testMaterial-1.arc 4 "-m 10" "-We,ARCANE_MATERIAL_LEGACY_SYNCHRONIZE,1")
67-
if (LZ4_FOUND)
68-
arcane_add_test_sequential(material1_lz4 testMaterial-1.arc "-m 10" "-We,ARCANE_MATERIAL_DATA_COMPRESSOR_NAME,LZ4DataCompressor")
69-
endif()
70-
arcane_add_test_sequential_task(material1 testMaterial-1.arc 4 "-m 10")
71-
72-
# Les trois tests suivants doivent faire le même nombre d'itérations et avoir le
73-
# même nombre de mailles (pour test)
74-
ARCANE_ADD_TEST(material2 testMaterial-2.arc "-m 13")
75-
ARCANE_ADD_TEST(material2_opt1 testMaterial-2-opt1.arc "-m 13")
76-
ARCANE_ADD_TEST(material2_opt3 testMaterial-2-opt3.arc "-m 13")
77-
ARCANE_ADD_TEST(material2_opt5 testMaterial-2-opt5.arc "-m 13")
78-
ARCANE_ADD_TEST(material2_opt7 testMaterial-2-opt7.arc "-m 13")
79-
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv2 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,2)
80-
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv3 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,3)
81-
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv6 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,6)
82-
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv7 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
83-
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv8 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,8)
84-
ARCANE_ADD_TEST_CHECKPOINT_SEQUENTIAL(material_checkpoint testMaterial-checkpoint.arc 3 3)
85-
ARCANE_ADD_TEST_CHECKPOINT_SEQUENTIAL(material_checkpoint_recreate testMaterial-checkpoint-recreate.arc 3 3)
86-
87-
arcane_add_test_sequential_task(material2 testMaterial-2task.arc 4 "-m 1")
88-
89-
ARCANE_ADD_TEST(material_sync1 testMaterial-sync-1.arc)
90-
ARCANE_ADD_TEST_PARALLEL_THREAD(material_sync1 testMaterial-sync-1.arc 4)
91-
ARCANE_ADD_TEST_PARALLEL(material_sync2 testMaterial-sync-2.arc 4)
92-
ARCANE_ADD_TEST_PARALLEL(material_sync2_v3 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,3)
93-
arcane_add_test(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
94-
arcane_add_test_parallel_thread(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
95-
arcane_add_test_message_passing_hybrid(material_sync2_v7 CASE_FILE testMaterial-sync-2.arc NB_MPI 3 NB_SHM 4 ARGS -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
96-
97-
arcane_add_accelerator_test_parallel(material_sync2_v6 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,6)
98-
arcane_add_accelerator_test_parallel(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
99-
arcane_add_accelerator_test_parallel(material_sync2_v8 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,8)
100-
arcane_add_accelerator_test_parallel_thread(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
101-
102-
ARCANE_ADD_TEST(material3 testMaterial-3.arc "-m 20")
103-
# NOTE Ajoute test optmisation uniquement en sequentiel car pour l'instant cela
104-
# ne marche pas en parallele a cause de la suppression de mailles.
105-
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt1 testMaterial-3-opt1.arc "-m 20")
106-
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt3 testMaterial-3-opt3.arc "-m 20")
107-
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt5 testMaterial-3-opt5.arc "-m 20")
108-
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt7 testMaterial-3-opt7.arc "-m 20")
109-
if(NOT ARCANE_DISABLE_PERFCOUNTER_TESTS)
110-
arcane_add_test_sequential(material3_opt7_trace testMaterial-3-opt7.arc "-m 20" "-We,ARCANE_TRACE_ENUMERATOR,1")
111-
endif()
64+
if (ARCANE_HAS_ACCELERATOR_API)
65+
arcane_add_test(material1 testMaterial-1.arc "-m 10")
66+
arcane_add_test_parallel_thread(material1 testMaterial-1.arc 4 "-m 10")
67+
arcane_add_test_parallel(material1_legacy_sync testMaterial-1.arc 4 "-m 10" "-We,ARCANE_MATERIAL_LEGACY_SYNCHRONIZE,1")
68+
if (LZ4_FOUND)
69+
arcane_add_test_sequential(material1_lz4 testMaterial-1.arc "-m 10" "-We,ARCANE_MATERIAL_DATA_COMPRESSOR_NAME,LZ4DataCompressor")
70+
endif()
71+
arcane_add_test_sequential_task(material1 testMaterial-1.arc 4 "-m 10")
72+
73+
# Les trois tests suivants doivent faire le même nombre d'itérations et avoir le
74+
# même nombre de mailles (pour test)
75+
ARCANE_ADD_TEST(material2 testMaterial-2.arc "-m 13")
76+
ARCANE_ADD_TEST(material2_opt1 testMaterial-2-opt1.arc "-m 13")
77+
ARCANE_ADD_TEST(material2_opt3 testMaterial-2-opt3.arc "-m 13")
78+
ARCANE_ADD_TEST(material2_opt5 testMaterial-2-opt5.arc "-m 13")
79+
ARCANE_ADD_TEST(material2_opt7 testMaterial-2-opt7.arc "-m 13")
80+
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv2 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,2)
81+
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv3 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,3)
82+
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv6 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,6)
83+
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv7 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
84+
ARCANE_ADD_TEST_PARALLEL(material2_opt3_syncv8 testMaterial-2-opt3.arc 4 -m 13 -We,ARCANE_MATSYNCHRONIZE_VERSION,8)
85+
ARCANE_ADD_TEST_CHECKPOINT_SEQUENTIAL(material_checkpoint testMaterial-checkpoint.arc 3 3)
86+
ARCANE_ADD_TEST_CHECKPOINT_SEQUENTIAL(material_checkpoint_recreate testMaterial-checkpoint-recreate.arc 3 3)
87+
88+
arcane_add_test_sequential_task(material2 testMaterial-2task.arc 4 "-m 1")
89+
90+
ARCANE_ADD_TEST(material_sync1 testMaterial-sync-1.arc)
91+
ARCANE_ADD_TEST_PARALLEL_THREAD(material_sync1 testMaterial-sync-1.arc 4)
92+
ARCANE_ADD_TEST_PARALLEL(material_sync2 testMaterial-sync-2.arc 4)
93+
ARCANE_ADD_TEST_PARALLEL(material_sync2_v3 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,3)
94+
arcane_add_test(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
95+
arcane_add_test_parallel_thread(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
96+
arcane_add_test_message_passing_hybrid(material_sync2_v7 CASE_FILE testMaterial-sync-2.arc NB_MPI 3 NB_SHM 4 ARGS -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
97+
98+
arcane_add_accelerator_test_parallel(material_sync2_v6 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,6)
99+
arcane_add_accelerator_test_parallel(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
100+
arcane_add_accelerator_test_parallel(material_sync2_v8 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,8)
101+
arcane_add_accelerator_test_parallel_thread(material_sync2_v7 testMaterial-sync-2.arc 4 -We,ARCANE_MATSYNCHRONIZE_VERSION,7)
102+
103+
ARCANE_ADD_TEST(material3 testMaterial-3.arc "-m 20")
104+
# NOTE Ajoute test optmisation uniquement en sequentiel car pour l'instant cela
105+
# ne marche pas en parallele a cause de la suppression de mailles.
106+
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt1 testMaterial-3-opt1.arc "-m 20")
107+
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt3 testMaterial-3-opt3.arc "-m 20")
108+
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt5 testMaterial-3-opt5.arc "-m 20")
109+
ARCANE_ADD_TEST_SEQUENTIAL(material3_opt7 testMaterial-3-opt7.arc "-m 20")
110+
if(NOT ARCANE_DISABLE_PERFCOUNTER_TESTS)
111+
arcane_add_test_sequential(material3_opt7_trace testMaterial-3-opt7.arc "-m 20" "-We,ARCANE_TRACE_ENUMERATOR,1")
112+
endif()
112113

113-
ARCANE_ADD_TEST_PARALLEL(material3_opt7_lb testMaterial-3-opt7-lb.arc 4 "-m 20")
114+
ARCANE_ADD_TEST_PARALLEL(material3_opt7_lb testMaterial-3-opt7-lb.arc 4 "-m 20")
114115

115-
ARCANE_ADD_TEST_SEQUENTIAL(material1_simd1 testMaterialSimd-1.arc)
116+
ARCANE_ADD_TEST_SEQUENTIAL(material1_simd1 testMaterialSimd-1.arc)
117+
endif()
116118

117119
ARCANE_ADD_TEST(cartesian1 testCartesianMesh-1.arc "-m 20")
118120
arcane_add_accelerator_test_sequential(cartesian1 testCartesianMesh-1.arc "-m 20")
@@ -258,7 +260,9 @@ arcane_add_test_sequential(cartesianpatch1 unitCartesianPatch1.arc)
258260
#####################
259261
# HyODA Mixed Cells #
260262
#####################
261-
ARCANE_ADD_TEST_SEQUENTIAL(hyoda_mixed_cells testHyodaMixedCells.arc)
263+
if (ARCANE_HAS_ACCELERATOR_API)
264+
ARCANE_ADD_TEST_SEQUENTIAL(hyoda_mixed_cells testHyodaMixedCells.arc)
265+
endif()
262266

263267
# Fonction pour recopier les maillages issus de répertoires
264268
# qui ne sont pas dans les dépots arcane (pour des raisons de taille)

‎arcane/src/arcane/materials/CMakeLists.txt‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
message(STATUS "Parsing ${CMAKE_CURRENT_SOURCE_DIR}")
1+
message(STATUS "Parsing ${CMAKE_CURRENT_SOURCE_DIR}")
22

33
include(srcs.cmake)
44

@@ -8,8 +8,17 @@ arcane_add_library(arcane_materials
88
FILES ${ARCANE_SOURCES}
99
)
1010

11+
arcane_accelerator_add_source_files(AllEnvData.cc)
12+
1113
target_compile_definitions(arcane_materials PRIVATE ARCANE_COMPONENT_arcane_materials)
1214
target_include_directories(arcane_materials PUBLIC $<BUILD_INTERFACE:${Arcane_SOURCE_DIR}/src> $<INSTALL_INTERFACE:include>)
1315

14-
target_link_libraries(arcane_materials PUBLIC arcane_core)
16+
target_link_libraries(arcane_materials PUBLIC arcane_accelerator arcane_core)
1517
arcane_register_library(arcane_materials)
18+
19+
# ----------------------------------------------------------------------------
20+
# Local Variables:
21+
# tab-width: 2
22+
# indent-tabs-mode: nil
23+
# coding: utf-8-with-signature
24+
# End:

‎arcane/tools/wrapper/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ add_subdirectory(services)
2929
add_subdirectory(hdf5)
3030
add_subdirectory(launcher)
3131
add_subdirectory(main)
32-
add_subdirectory(materials)
32+
if (ARCANE_HAS_ACCELERATOR_API)
33+
add_subdirectory(materials)
34+
endif()
3335

3436
# ----------------------------------------------------------------------------
3537

0 commit comments

Comments
 (0)