Skip to content

Commit 2d86e99

Browse files
authored
Merge pull request #6818 from STEllAR-GROUP/hpx_core_modules
Adapt last HPX modules of the HPX core library to C++ modules
2 parents 86410d6 + 4ee61b3 commit 2d86e99

98 files changed

Lines changed: 266 additions & 261 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/linux_debug.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ jobs:
4545
ctest \
4646
--output-on-failure \
4747
--tests-regex tests.examples \
48-
--exclude-regex tests.examples.transpose.transpose_block_numa
48+
--exclude-regex tests.examples.transpose.transpose_block_numa \
49+
--exclude-regex tests.examples.quickstart.1d_wave_equation

cmake/HPX_SetupEve.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ if(("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "EVE") AND NOT TARGET eve::eve)
2525
"HPX_WITH_FETCH_EVE=${HPX_WITH_FETCH_EVE}, EVE will be fetched using CMake's FetchContent and installed alongside HPX (HPX_WITH_Eve_TAG=${HPX_WITH_Eve_TAG})"
2626
)
2727
endif()
28+
29+
set(EVE_USE_PCH OFF)
30+
set(EVE_BUILD_TEST OFF)
31+
set(EVE_BUILD_RANDOM OFF)
32+
set(EVE_BUILD_BENCHMARKS OFF)
33+
set(EVE_BUILD_DOCUMENTATION OFF)
34+
2835
include(FetchContent)
2936
fetchcontent_declare(
3037
eve

examples/1d_stencil/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ foreach(example_program ${example_programs})
5858
add_hpx_executable(
5959
${example_program} INTERNAL_FLAGS
6060
SOURCES ${sources} ${${example_program}_FLAGS}
61-
FOLDER "Examples/1D Stencil"
61+
FOLDER "Examples/1D Stencil" ${HPX_WITH_CXX_MODULES_OPTION}
6262
)
6363

6464
add_hpx_example_target_dependencies("1d_stencil" ${example_program})

examples/accumulators/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ foreach(example_program ${example_programs})
3030
SOURCES ${component_sources}
3131
HEADERS ${component_headers}
3232
FOLDER "Examples/Quickstart/Accumulators/${example_program}"
33+
${HPX_WITH_CXX_MODULES_OPTION}
3334
)
3435

3536
# add example executable
@@ -38,6 +39,7 @@ foreach(example_program ${example_programs})
3839
SOURCES ${client_sources}
3940
DEPENDENCIES ${example_program}_component
4041
FOLDER "Examples/Quickstart/Accumulators/${example_program}"
42+
${HPX_WITH_CXX_MODULES_OPTION}
4143
)
4244

4345
add_hpx_example_target_dependencies("accumulators" ${example_program})

examples/apex/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ foreach(example_program ${example_programs})
2121
add_hpx_executable(
2222
${example_program} INTERNAL_FLAGS
2323
SOURCES ${sources} ${${example_program}_FLAGS}
24-
FOLDER "Examples/Apex/${example_program}"
24+
FOLDER "Examples/Apex/${example_program}" ${HPX_WITH_CXX_MODULES_OPTION}
2525
)
2626

2727
add_hpx_example_target_dependencies("apex" ${example_program})

examples/async_io/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ foreach(example_program ${example_programs})
2929
add_hpx_executable(
3030
${example_program} INTERNAL_FLAGS
3131
SOURCES ${sources} ${${example_program}_FLAGS}
32-
FOLDER "Examples/AsyncIO/${example_program}"
32+
FOLDER "Examples/AsyncIO/${example_program}" ${HPX_WITH_CXX_MODULES_OPTION}
3333
)
3434

3535
add_hpx_example_target_dependencies("async_io" ${example_program})

examples/balancing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ foreach(example_program ${example_programs})
1818
add_hpx_executable(
1919
${example_program} INTERNAL_FLAGS
2020
SOURCES ${sources} ${${example_program}_FLAGS}
21-
FOLDER "Examples/Balancing"
21+
FOLDER "Examples/Balancing" ${HPX_WITH_CXX_MODULES_OPTION}
2222
)
2323

2424
add_hpx_example_target_dependencies("balancing" ${example_program})

examples/cancelable_action/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ add_hpx_executable(
2121
cancelable_action_client INTERNAL_FLAGS
2222
SOURCES ${sources}
2323
DEPENDENCIES cancelable_action_component
24-
FOLDER "Examples/CancelableAction"
24+
FOLDER "Examples/CancelableAction" ${HPX_WITH_CXX_MODULES_OPTION}
2525
)
2626

2727
add_hpx_example_target_dependencies(

examples/cancelable_action/cancelable_action/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ add_hpx_component(
99
INSTALL_COMPONENT examples
1010
HEADER_GLOB "cancelable_action.h*"
1111
SOURCE_GLOB "cancelable_action.c*"
12-
FOLDER "Examples/CancelableAction"
12+
FOLDER "Examples/CancelableAction" ${HPX_WITH_CXX_MODULES_OPTION}
1313
)

examples/future_reduce/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ foreach(example_program ${example_programs})
1717
add_hpx_executable(
1818
${example_program} INTERNAL_FLAGS
1919
SOURCES ${sources} ${${example_program}_FLAGS}
20-
FOLDER "Examples/FutureReduce"
20+
FOLDER "Examples/FutureReduce" ${HPX_WITH_CXX_MODULES_OPTION}
2121
)
2222

2323
add_hpx_example_target_dependencies("future_reduce" ${example_program})

0 commit comments

Comments
 (0)