Move vector_pack utilities to algorithms module

pika-org · Nov 11, 2022 · a0232b9 · a0232b9
1 parent 63deaf2
commit a0232b9
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 360 deletions.
diff --git a/libs/pika/algorithms/CMakeLists.txt b/libs/pika/algorithms/CMakeLists.txt
@@ -175,6 +175,12 @@ set(algorithms_headers
     pika/parallel/util/detail/scoped_executor_parameters.hpp
     pika/parallel/util/detail/select_partitioner.hpp
     pika/parallel/util/detail/sender_util.hpp
+    pika/parallel/util/detail/simd/vector_pack_alignment_size.hpp
+    pika/parallel/util/detail/simd/vector_pack_all_any_none.hpp
+    pika/parallel/util/detail/simd/vector_pack_count_bits.hpp
+    pika/parallel/util/detail/simd/vector_pack_find.hpp
+    pika/parallel/util/detail/simd/vector_pack_load_store.hpp
+    pika/parallel/util/detail/simd/vector_pack_type.hpp
     pika/parallel/util/foreach_partitioner.hpp
     pika/parallel/util/invoke_projected.hpp
     pika/parallel/util/loop.hpp
@@ -192,6 +198,12 @@ set(algorithms_headers
     pika/parallel/util/scan_partitioner.hpp
     pika/parallel/util/transfer.hpp
     pika/parallel/util/transform_loop.hpp
+    pika/parallel/util/vector_pack_alignment_size.hpp
+    pika/parallel/util/vector_pack_all_any_none.hpp
+    pika/parallel/util/vector_pack_count_bits.hpp
+    pika/parallel/util/vector_pack_find.hpp
+    pika/parallel/util/vector_pack_load_store.hpp
+    pika/parallel/util/vector_pack_type.hpp
     pika/parallel/util/zip_iterator.hpp
 )
 

diff --git a/libs/pika/algorithms/include/pika/algorithms/traits/projected.hpp b/libs/pika/algorithms/include/pika/algorithms/traits/projected.hpp
@@ -8,11 +8,11 @@
 
 #include <pika/config.hpp>
 #include <pika/execution/traits/is_execution_policy.hpp>
-#include <pika/execution/traits/vector_pack_load_store.hpp>
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/functional/invoke_result.hpp>
 #include <pika/functional/traits/is_invocable.hpp>
 #include <pika/iterator_support/traits/is_iterator.hpp>
+#include <pika/parallel/util/vector_pack_load_store.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 #include <pika/type_support/pack.hpp>
 
 #include <iterator>

diff --git a/libs/pika/algorithms/include/pika/parallel/algorithms/count.hpp b/libs/pika/algorithms/include/pika/parallel/algorithms/count.hpp
@@ -162,14 +162,14 @@ namespace pika {
 #include <pika/parallel/util/detail/sender_util.hpp>
 
 #include <pika/algorithms/traits/projected.hpp>
-#include <pika/execution/traits/vector_pack_count_bits.hpp>
 #include <pika/executors/execution_policy.hpp>
 #include <pika/parallel/algorithms/detail/dispatch.hpp>
 #include <pika/parallel/algorithms/detail/distance.hpp>
 #include <pika/parallel/util/detail/algorithm_result.hpp>
 #include <pika/parallel/util/invoke_projected.hpp>
 #include <pika/parallel/util/loop.hpp>
 #include <pika/parallel/util/partitioner.hpp>
+#include <pika/parallel/util/vector_pack_count_bits.hpp>
 
 #include <algorithm>
 #include <cstddef>

diff --git a/libs/pika/algorithms/include/pika/parallel/datapar/find.hpp b/libs/pika/algorithms/include/pika/parallel/datapar/find.hpp
@@ -10,14 +10,14 @@
 
 #if defined(PIKA_HAVE_DATAPAR)
 #include <pika/execution/traits/is_execution_policy.hpp>
-#include <pika/execution/traits/vector_pack_all_any_none.hpp>
-#include <pika/execution/traits/vector_pack_find.hpp>
 #include <pika/functional/tag_invoke.hpp>
 #include <pika/parallel/algorithms/detail/find.hpp>
 #include <pika/parallel/datapar/iterator_helpers.hpp>
 #include <pika/parallel/datapar/loop.hpp>
 #include <pika/parallel/datapar/zip_iterator.hpp>
 #include <pika/parallel/util/result_types.hpp>
+#include <pika/parallel/util/vector_pack_all_any_none.hpp>
+#include <pika/parallel/util/vector_pack_find.hpp>
 
 #include <cstddef>
 #include <type_traits>

diff --git a/libs/pika/algorithms/include/pika/parallel/datapar/generate.hpp b/libs/pika/algorithms/include/pika/parallel/datapar/generate.hpp
@@ -10,13 +10,13 @@
 
 #if defined(PIKA_HAVE_DATAPAR)
 #include <pika/execution/traits/is_execution_policy.hpp>
-#include <pika/execution/traits/vector_pack_alignment_size.hpp>
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/functional/tag_invoke.hpp>
 #include <pika/parallel/algorithms/detail/generate.hpp>
 #include <pika/parallel/datapar/iterator_helpers.hpp>
 #include <pika/parallel/datapar/loop.hpp>
 #include <pika/parallel/util/result_types.hpp>
+#include <pika/parallel/util/vector_pack_alignment_size.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/libs/pika/algorithms/include/pika/parallel/datapar/iterator_helpers.hpp b/libs/pika/algorithms/include/pika/parallel/datapar/iterator_helpers.hpp
@@ -10,12 +10,12 @@
 
 #if defined(PIKA_HAVE_DATAPAR)
 #include <pika/assert.hpp>
-#include <pika/execution/traits/vector_pack_alignment_size.hpp>
-#include <pika/execution/traits/vector_pack_load_store.hpp>
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/functional/detail/invoke.hpp>
 #include <pika/functional/invoke_result.hpp>
 #include <pika/iterator_support/traits/is_iterator.hpp>
+#include <pika/parallel/util/vector_pack_alignment_size.hpp>
+#include <pika/parallel/util/vector_pack_load_store.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 
 #include <cstddef>
 #include <iterator>

diff --git a/libs/pika/algorithms/include/pika/parallel/datapar/loop.hpp b/libs/pika/algorithms/include/pika/parallel/datapar/loop.hpp
@@ -10,15 +10,15 @@
 
 #if defined(PIKA_HAVE_DATAPAR)
 #include <pika/execution/traits/is_execution_policy.hpp>
-#include <pika/execution/traits/vector_pack_alignment_size.hpp>
-#include <pika/execution/traits/vector_pack_load_store.hpp>
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/executors/datapar/execution_policy.hpp>
 #include <pika/executors/execution_policy.hpp>
 #include <pika/functional/tag_invoke.hpp>
 #include <pika/parallel/algorithms/detail/predicates.hpp>
 #include <pika/parallel/datapar/iterator_helpers.hpp>
 #include <pika/parallel/util/loop.hpp>
+#include <pika/parallel/util/vector_pack_alignment_size.hpp>
+#include <pika/parallel/util/vector_pack_load_store.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 
 #include <algorithm>
 #include <cstddef>

diff --git a/libs/pika/algorithms/include/pika/parallel/datapar/zip_iterator.hpp b/libs/pika/algorithms/include/pika/parallel/datapar/zip_iterator.hpp
@@ -14,10 +14,10 @@
 #include <pika/iterator_support/zip_iterator.hpp>
 #include <pika/type_support/pack.hpp>
 
-#include <pika/execution/traits/vector_pack_alignment_size.hpp>
-#include <pika/execution/traits/vector_pack_load_store.hpp>
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/parallel/datapar/iterator_helpers.hpp>
+#include <pika/parallel/util/vector_pack_alignment_size.hpp>
+#include <pika/parallel/util/vector_pack_load_store.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 
 #include <algorithm>
 #include <cstddef>

diff --git a/...ion/traits/vector_pack_alignment_size.hpp → ...allel/util/vector_pack_alignment_size.hpp b/...ion/traits/vector_pack_alignment_size.hpp → ...allel/util/vector_pack_alignment_size.hpp
@@ -67,7 +67,7 @@ namespace pika::parallel::traits::detail {
 }    // namespace pika::parallel::traits::detail
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_alignment_size.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_alignment_size.hpp>
 #endif
 
 #endif
diff --git a/...ution/traits/vector_pack_all_any_none.hpp → ...arallel/util/vector_pack_all_any_none.hpp b/...ution/traits/vector_pack_all_any_none.hpp → ...arallel/util/vector_pack_all_any_none.hpp
@@ -11,7 +11,7 @@
 #if defined(PIKA_HAVE_DATAPAR)
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_all_any_none.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_all_any_none.hpp>
 #endif
 
 #endif
diff --git a/...ecution/traits/vector_pack_count_bits.hpp → .../parallel/util/vector_pack_count_bits.hpp b/...ecution/traits/vector_pack_count_bits.hpp → .../parallel/util/vector_pack_count_bits.hpp
@@ -21,7 +21,7 @@ namespace pika::parallel::traits::detail {
 #if defined(PIKA_HAVE_DATAPAR)
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_count_bits.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_count_bits.hpp>
 #endif
 
 #endif
diff --git a/...ika/execution/traits/vector_pack_find.hpp → ...e/pika/parallel/util/vector_pack_find.hpp b/...ika/execution/traits/vector_pack_find.hpp → ...e/pika/parallel/util/vector_pack_find.hpp
@@ -11,7 +11,7 @@
 #if defined(PIKA_HAVE_DATAPAR)
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_find.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_find.hpp>
 #endif
 
 #endif
diff --git a/...ecution/traits/vector_pack_load_store.hpp → .../parallel/util/vector_pack_load_store.hpp b/...ecution/traits/vector_pack_load_store.hpp → .../parallel/util/vector_pack_load_store.hpp
@@ -23,7 +23,7 @@ namespace pika::parallel::traits::detail {
 }    // namespace pika::parallel::traits::detail
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_load_store.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_load_store.hpp>
 #endif
 
 #endif
diff --git a/...ika/execution/traits/vector_pack_type.hpp → ...e/pika/parallel/util/vector_pack_type.hpp b/...ika/execution/traits/vector_pack_type.hpp → ...e/pika/parallel/util/vector_pack_type.hpp
@@ -32,7 +32,7 @@ namespace pika::parallel::traits::detail {
 }    // namespace pika::parallel::traits::detail
 
 #if !defined(__CUDACC__)
-#include <pika/execution/traits/detail/simd/vector_pack_type.hpp>
+#include <pika/parallel/util/detail/simd/vector_pack_type.hpp>
 #endif
 
 #endif
diff --git a/libs/pika/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp b/libs/pika/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/init.hpp>
 #include <pika/parallel/algorithms/generate.hpp>
 #include <pika/parallel/datapar.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 #include <pika/testing.hpp>
 
 #include <cstddef>

diff --git a/libs/pika/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp b/libs/pika/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <pika/execution/traits/vector_pack_type.hpp>
 #include <pika/init.hpp>
 #include <pika/parallel/algorithms/generate.hpp>
 #include <pika/parallel/datapar.hpp>
+#include <pika/parallel/util/vector_pack_type.hpp>
 #include <pika/testing.hpp>
 
 #include <cstddef>

diff --git a/libs/pika/execution/CMakeLists.txt b/libs/pika/execution/CMakeLists.txt
@@ -46,21 +46,9 @@ set(execution_headers
     pika/execution/executors/rebind_executor.hpp
     pika/execution/executors/static_chunk_size.hpp
     pika/execution/scheduler_queries.hpp
-    pika/execution/traits/detail/simd/vector_pack_alignment_size.hpp
-    pika/execution/traits/detail/simd/vector_pack_all_any_none.hpp
-    pika/execution/traits/detail/simd/vector_pack_count_bits.hpp
-    pika/execution/traits/detail/simd/vector_pack_find.hpp
-    pika/execution/traits/detail/simd/vector_pack_load_store.hpp
-    pika/execution/traits/detail/simd/vector_pack_type.hpp
     pika/execution/traits/executor_traits.hpp
     pika/execution/traits/future_then_result_exec.hpp
     pika/execution/traits/is_execution_policy.hpp
-    pika/execution/traits/vector_pack_alignment_size.hpp
-    pika/execution/traits/vector_pack_all_any_none.hpp
-    pika/execution/traits/vector_pack_count_bits.hpp
-    pika/execution/traits/vector_pack_find.hpp
-    pika/execution/traits/vector_pack_load_store.hpp
-    pika/execution/traits/vector_pack_type.hpp
 )
 
 set(execution_sources execution_parameter_callbacks.cpp)

diff --git a/libs/pika/execution/include/pika/execution/traits/detail/simd/vector_pack_alignment_size.hpp b/libs/pika/execution/include/pika/execution/traits/detail/simd/vector_pack_alignment_size.hpp