examples throwing linker error

Signed-off-by: Hari Hara Naveen S <[email protected]>
STEllAR-GROUP · Sep 13, 2023 · 88a8292 · 88a8292
1 parent 9e71f77
commit 88a8292
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -558,18 +558,21 @@ hpx_option(
   ADVANCED
 )
 
+add_compile_options(-march=native)
+
 # simd sort supports only avx-512 registers
-if(__AVX512F__)
+# if(__AVX512F__)
   set(HPX_WITH_SIMD_SORT ON)
   if(HPX_WITH_FETCH_SIMD_SORT)
     include(HPX_SetupSimdSort)
   else()
     find_package(SimdSort)
   endif()
-else()
-  set(HPX_WITH_SIMD_SORT OFF)
-  set(HPX_WITH_FETCH_SIMD_SORT OFF)
-endif()
+
+# else()
+  # set(HPX_WITH_SIMD_SORT OFF)
+  # set(HPX_WITH_FETCH_SIMD_SORT OFF)
+# endif()
 
 # debug message to be removed before merge
 message(WARNING "HPX_WITH_SIMD_SORT : ${HPX_WITH_SIMD_SORT}")

diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
@@ -72,6 +72,8 @@ if("${HPX_WITH_DATAPAR_BACKEND}" STREQUAL "SVE")
   endif()
 endif()
 
+include("${CMAKE_CURRENT_LIST_DIR}/HPXSimdSortTarget.cmake")
+
 include("${CMAKE_CURRENT_LIST_DIR}/HPXInternalTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/HPXTargets.cmake")
 

diff --git a/libs/core/algorithms/CMakeLists.txt b/libs/core/algorithms/CMakeLists.txt
@@ -42,7 +42,6 @@ set(algorithms_headers
     hpx/parallel/algorithms/detail/sample_sort.hpp
     hpx/parallel/algorithms/detail/search.hpp
     hpx/parallel/algorithms/detail/set_operation.hpp
-    hpx/parallel/algorithms/detail/simd_sort.hpp
     hpx/parallel/algorithms/detail/spin_sort.hpp
     hpx/parallel/algorithms/detail/transfer.hpp
     hpx/parallel/algorithms/detail/upper_lower_bound.hpp

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
@@ -4,9 +4,14 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#pragma once
+
+// #include <avx512-16bit-qsort.hpp>
+// #include <avx512-32bit-qsort.hpp>
+#include <avx512-64bit-qsort.hpp>
+
 #include <type_traits>
 
-#pragma once
 
 namespace hpx::parallel::util {
     // TODO : add support for _Float16