Skip to content

Re-enable Clang executor tests #7254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hkaiser wants to merge 1 commit into from
Closed

Re-enable Clang executor tests #7254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions libs/core/algorithms/tests/performance/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@ set(benchmarks
transform_reduce_scaling
)

# foreach_report uses tag_invoke-based sender patterns that do not compile with
# Clang < 22 / AppleClang < 18 against the current stdexec.
if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION
VERSION_LESS "22")
OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "18")
)
list(REMOVE_ITEM benchmarks foreach_report)
endif()

foreach(benchmark ${benchmarks})
set(sources ${benchmark}.cpp)

Expand Down
156 changes: 75 additions & 81 deletions libs/core/algorithms/tests/unit/algorithms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,87 +161,81 @@ if(HPX_WITH_CXX17_STD_EXECUTION_POLICES)
set(tests ${tests} foreach_std_policies)
endif()

if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
set(tests
${tests}
adjacentdifference_sender
adjacentfind_sender
all_of_sender
any_of_sender
copy_sender
copyn_sender
count_sender
countif_sender
destroy_sender
destroyn_sender
ends_with_sender
equal_sender
equal_binary_sender
fill_sender
filln_sender
find_sender
findend_sender
findfirstof_sender
findif_sender
findifnot_sender
foreach_sender
foreachn_sender
generate_sender
generaten_sender
is_heap_sender
is_heap_until_sender
includes_sender
is_partitioned_sender
is_sorted_sender
is_sorted_until_sender
lexicographical_compare_sender
max_element_sender
min_element_sender
minmax_element_sender
mismatch_sender
mismatch_binary_sender
move_sender
none_of_sender
partial_sort_sender
reduce_sender
remove_sender
remove_if_sender
replace_sender
replace_if_sender
replace_copy_sender
replace_copy_if_sender
reverse_sender
reverse_copy_sender
rotate_sender
rotate_copy_sender
search_sender
starts_with_sender
swapranges_sender
transform_sender
transform_binary_sender
transform_binary2_sender
transform_reduce_sender
transform_reduce_binary_sender
uninitialized_copy_sender
uninitialized_copyn_sender
uninitialized_default_construct_sender
uninitialized_default_constructn_sender
uninitialized_fill_sender
uninitialized_filln_sender
uninitialized_move_sender
uninitialized_moven_sender
uninitialized_relocate_sender
uninitialized_relocate_backward_sender
uninitialized_relocaten_sender
uninitialized_value_construct_sender
uninitialized_value_constructn_sender
unique_sender
)
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
list(REMOVE_ITEM tests foreach_scheduler)
endif()
set(tests
${tests}
adjacentdifference_sender
adjacentfind_sender
all_of_sender
any_of_sender
copy_sender
copyn_sender
count_sender
countif_sender
destroy_sender
destroyn_sender
ends_with_sender
equal_sender
equal_binary_sender
fill_sender
filln_sender
find_sender
findend_sender
findfirstof_sender
findif_sender
findifnot_sender
foreach_sender
foreachn_sender
generate_sender
generaten_sender
is_heap_sender
is_heap_until_sender
includes_sender
is_partitioned_sender
is_sorted_sender
is_sorted_until_sender
lexicographical_compare_sender
max_element_sender
min_element_sender
minmax_element_sender
mismatch_sender
mismatch_binary_sender
move_sender
none_of_sender
partial_sort_sender
reduce_sender
remove_sender
remove_if_sender
replace_sender
replace_if_sender
replace_copy_sender
replace_copy_if_sender
reverse_sender
reverse_copy_sender
rotate_sender
rotate_copy_sender
search_sender
starts_with_sender
swapranges_sender
transform_sender
transform_binary_sender
transform_binary2_sender
transform_reduce_sender
transform_reduce_binary_sender
uninitialized_copy_sender
uninitialized_copyn_sender
uninitialized_default_construct_sender
uninitialized_default_constructn_sender
uninitialized_fill_sender
uninitialized_filln_sender
uninitialized_move_sender
uninitialized_moven_sender
uninitialized_relocate_sender
uninitialized_relocate_backward_sender
uninitialized_relocaten_sender
uninitialized_value_construct_sender
uninitialized_value_constructn_sender
unique_sender
)

foreach(test ${tests})
set(sources ${test}.cpp)
Expand Down
6 changes: 0 additions & 6 deletions libs/core/algorithms/tests/unit/container_algorithms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,6 @@ if(HPX_WITH_CXX20_COROUTINES)
set(tests ${tests} for_loop_range_generator)
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
list(REMOVE_ITEM tests adjacentdifference_range_sender foreach_range
foreach_range_sender
)
endif()

foreach(test ${tests})
set(sources ${test}.cpp)

Expand Down
35 changes: 16 additions & 19 deletions libs/core/execution/tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ set(tests
algorithm_as_sender
algorithm_bulk
algorithm_ensure_started
algorithm_execute
algorithm_just
algorithm_just_error
algorithm_just_stopped
Expand Down Expand Up @@ -45,28 +44,26 @@ set(tests

set(future_then_executor_PARAMETERS THREADS_PER_LOCALITY 4)

if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
foreach(test ${tests})
set(sources ${test}.cpp)
foreach(test ${tests})
set(sources ${test}.cpp)

set(${test}_PARAMETERS THREADS_PER_LOCALITY 4)
set(${test}_PARAMETERS THREADS_PER_LOCALITY 4)

source_group("Source Files" FILES ${sources})
source_group("Source Files" FILES ${sources})

set(folder_name "Tests/Unit/Modules/Core/Execution")
set(folder_name "Tests/Unit/Modules/Core/Execution")

# add example executable
add_hpx_executable(
${test}_test INTERNAL_FLAGS
SOURCES ${sources} ${${test}_FLAGS}
EXCLUDE_FROM_ALL
HPX_PREFIX ${HPX_BUILD_PREFIX}
FOLDER ${folder_name}
)
# add example executable
add_hpx_executable(
${test}_test INTERNAL_FLAGS
SOURCES ${sources} ${${test}_FLAGS}
EXCLUDE_FROM_ALL
HPX_PREFIX ${HPX_BUILD_PREFIX}
FOLDER ${folder_name}
)

target_link_libraries(${test}_test PRIVATE hpx_execution_test_utilities)
target_link_libraries(${test}_test PRIVATE hpx_execution_test_utilities)

add_hpx_unit_test("modules.execution" ${test} ${${test}_PARAMETERS})
add_hpx_unit_test("modules.execution" ${test} ${${test}_PARAMETERS})

endforeach()
endif()
endforeach()
Loading
Loading