diff --git a/CMakeLists.txt b/CMakeLists.txt index b561f99a723d..3e6feafbe2db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -561,16 +561,14 @@ hpx_option( hpx_check_for_avx512f(DEFINITIONS HPX_HAVE_AVX512F) -if(NOT (HPX_WITH_AVX512F)) +if(NOT HPX_WITH_AVX512F) set(HPX_WITH_SIMD_SORT Off) endif() - if(HPX_WITH_SIMD_SORT) include(HPX_SetupSimdSort) hpx_add_config_define(HPX_HAVE_SIMD_SORT) add_compile_options(-mavx512f) - MESSAGE("HPX_WITH_SIMD_SORT : ${HPX_WITH_SIMD_SORT}") endif() # ############################################################################## diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake index 57ed28c2f25f..e7b650a0ba8c 100644 --- a/cmake/HPX_AddConfigTest.cmake +++ b/cmake/HPX_AddConfigTest.cmake @@ -719,6 +719,6 @@ function(hpx_check_for_avx512f) add_hpx_config_test( HPX_WITH_AVX512F SOURCE cmake/tests/avx512f.cpp - FILE ${ARGN} CXXFLAGS -mavx512f + FILE ${ARGN} CXXFLAGS -mavx512f ) endfunction() diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/detail/simd_sort.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/detail/simd_sort.hpp index cfd4a32a9def..7e0585632ef3 100644 --- a/libs/core/algorithms/include/hpx/parallel/algorithms/detail/simd_sort.hpp +++ b/libs/core/algorithms/include/hpx/parallel/algorithms/detail/simd_sort.hpp @@ -51,4 +51,12 @@ namespace hpx::parallel::util { return avx512_qsort(arr, arrsize); } } // namespace hpx::parallel::util +#else +namespace hpx::parallel::util { + template + void simd_quicksort(T* arr, int64_t arrsize) + { + static_assert(false); + } +} // namespace hpx::parallel::util #endif