Merge #6344 #6348 #6349

6344: uninitialized_relocate w/ type_support primitive r=hkaiser a=isidorostsa This PR replaces the `type_support::uninitialized_relocate` with a primitive version for uninitialized relocation, named `uninitialized_relocate_n_primitive`. This is used by the parallel and sequenced versions of `algorithms::uninitialized_relocate`. In contrast to the previous attempt of implementing the relocation functions, #6314, this does not place the primitive in `transfer.hpp`, which is in the `algorithms` module, nor does it modify `loop.hpp` to add the specific exception handling method required by `uninitialized_relocate`. The goal of keeping a primitive in type support, which is relatively low level in terms of dependencies, is to use it in the higher level `small_vector` and other data structures. 6348: Adding --exclusive to launching tests on rostam r=hkaiser a=hkaiser 6349: Moving hpx::threads::run_as_xxx to namespace hpx r=hkaiser a=hkaiser - run_as_os_thread - run_as_hpx_thread Co-authored-by: isidorostsa <[email protected]> Co-authored-by: Hartmut Kaiser <[email protected]>
STEllAR-GROUP · Sep 25, 2023 · a771096 · a771096
4 parents 4a66ce5 + 82f2907 + b894f5e + 496f4ba
commit a771096
Show file tree

Hide file tree

Showing 36 changed files with 2,103 additions and 378 deletions.
diff --git a/.jenkins/lsu-perftests/entry.sh b/.jenkins/lsu-perftests/entry.sh
@@ -31,6 +31,7 @@ sleep $[(RANDOM % 10) + 1].$[(RANDOM % 10)]s
 set +e
 sbatch \
     --verbose --verbose --verbose --verbose \
+    --exclusive \
     --job-name="${job_name}" \
     --nodes="1" \
     --partition="${configuration_slurm_partition}" \

diff --git a/.jenkins/lsu-test-coverage/entry.sh b/.jenkins/lsu-test-coverage/entry.sh
@@ -43,6 +43,7 @@ fi
 set +e
 sbatch \
     --verbose --verbose --verbose --verbose \
+    --exclusive \
     --job-name="${job_name}" \
     --nodes="1" \
     --partition="${configuration_slurm_partition}" \

diff --git a/.jenkins/lsu/entry.sh b/.jenkins/lsu/entry.sh
@@ -43,6 +43,7 @@ sleep $[(RANDOM % 10) + 1].$[(RANDOM % 10)]s
 set +e
 sbatch \
     --verbose --verbose --verbose --verbose \
+    --exclusive \
     --job-name="${job_name}" \
     --nodes="${configuration_slurm_num_nodes}" \
     --partition="${configuration_slurm_partition}" \

diff --git a/components/process/src/server/child_component.cpp b/components/process/src/server/child_component.cpp
@@ -34,7 +34,7 @@ namespace hpx { namespace components { namespace process { namespace server
     {
         int (*f)(process::util::child const&) =
             &process::util::wait_for_exit<process::util::child>;
-        return hpx::threads::run_as_os_thread(f, std::ref(child_)).get();
+        return hpx::run_as_os_thread(f, std::ref(child_)).get();
     }
 }}}}
 
diff --git a/examples/quickstart/init_globally.cpp b/examples/quickstart/init_globally.cpp
@@ -270,12 +270,12 @@ void thread_func()
 
     // Create an HPX thread (returning an int) and wait for it to run to
     // completion.
-    int result = hpx::threads::run_as_hpx_thread(&hpx_thread_func2, 42);
+    int result = hpx::run_as_hpx_thread(&hpx_thread_func2, 42);
 
     // Create an HPX thread (returning void) and wait for it to run to
     // completion.
     if (result == 42)
-        hpx::threads::run_as_hpx_thread(&hpx_thread_func1);
+        hpx::run_as_hpx_thread(&hpx_thread_func1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -286,7 +286,7 @@ int main()
 
     // The main thread was automatically registered with the HPX runtime,
     // no explicit registration for this thread is necessary.
-    hpx::threads::run_as_hpx_thread(&hpx_thread_func1);
+    hpx::run_as_hpx_thread(&hpx_thread_func1);
 
     // wait for the (kernel) thread to run to completion
     t.join();

diff --git a/libs/core/algorithms/CMakeLists.txt b/libs/core/algorithms/CMakeLists.txt
@@ -97,6 +97,7 @@ set(algorithms_headers
     hpx/parallel/algorithms/uninitialized_default_construct.hpp
     hpx/parallel/algorithms/uninitialized_fill.hpp
     hpx/parallel/algorithms/uninitialized_move.hpp
+    hpx/parallel/algorithms/uninitialized_relocate.hpp
     hpx/parallel/algorithms/uninitialized_value_construct.hpp
     hpx/parallel/algorithms/unique.hpp
     hpx/parallel/container_algorithms/adjacent_difference.hpp

diff --git a/libs/core/algorithms/include/hpx/algorithms/traits/pointer_category.hpp b/libs/core/algorithms/include/hpx/algorithms/traits/pointer_category.hpp
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <hpx/iterator_support/traits/is_iterator.hpp>
+#include <hpx/type_support/is_contiguous_iterator.hpp>
 #include <hpx/type_support/is_relocatable.hpp>
 
 #include <type_traits>
@@ -145,7 +146,7 @@ namespace hpx::traits {
         {
             using type = std::conditional_t<
                 std::is_same_v<iter_value_t<Source>, iter_value_t<Dest>> &&
-                    is_relocatable_v<iter_value_t<Source>>,
+                    hpx::experimental::is_relocatable_v<iter_value_t<Source>>,
                 relocatable_pointer_tag, general_pointer_tag>;
         };
 

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_relocate.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_relocate.hpp
diff --git a/libs/core/algorithms/include/hpx/parallel/util/transfer.hpp b/libs/core/algorithms/include/hpx/parallel/util/transfer.hpp
@@ -15,6 +15,7 @@
 #include <hpx/parallel/algorithms/detail/distance.hpp>
 #include <hpx/parallel/util/loop.hpp>
 #include <hpx/parallel/util/result_types.hpp>
+#include <hpx/type_support/is_contiguous_iterator.hpp>
 
 #include <algorithm>
 #include <cstddef>

diff --git a/libs/core/algorithms/tests/unit/algorithms/CMakeLists.txt b/libs/core/algorithms/tests/unit/algorithms/CMakeLists.txt
@@ -146,6 +146,9 @@ set(tests
     uninitialized_filln
     uninitialized_move
     uninitialized_moven
+    uninitialized_relocate
+    uninitialized_relocaten
+    uninitialized_relocate_par
     uninitialized_value_construct
     uninitialized_value_constructn
     unique

diff --git a/...ort/tests/unit/uninitialized_relocate.cpp → ...nit/algorithms/uninitialized_relocate.cpp b/...ort/tests/unit/uninitialized_relocate.cpp → ...nit/algorithms/uninitialized_relocate.cpp
@@ -6,11 +6,14 @@
 
 #include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/type_support/uninitialized_relocate.hpp>
+#include <hpx/parallel/algorithms/uninitialized_relocate.hpp>
 
 #define N 50
 #define K 10
 
+using hpx::experimental::is_trivially_relocatable_v;
+using hpx::experimental::uninitialized_relocate;
+
 struct trivially_relocatable_struct
 {
     static int count;
@@ -43,7 +46,7 @@ int trivially_relocatable_struct::move_count = 0;
 int trivially_relocatable_struct::dtor_count = 0;
 
 HPX_DECLARE_TRIVIALLY_RELOCATABLE(trivially_relocatable_struct);
-static_assert(hpx::is_trivially_relocatable_v<trivially_relocatable_struct>);
+static_assert(is_trivially_relocatable_v<trivially_relocatable_struct>);
 
 struct non_trivially_relocatable_struct
 {
@@ -78,8 +81,7 @@ int non_trivially_relocatable_struct::count = 0;
 int non_trivially_relocatable_struct::move_count = 0;
 int non_trivially_relocatable_struct::dtor_count = 0;
 
-static_assert(
-    !hpx::is_trivially_relocatable_v<non_trivially_relocatable_struct>);
+static_assert(!is_trivially_relocatable_v<non_trivially_relocatable_struct>);
 
 struct non_trivially_relocatable_struct_throwing
 {
@@ -121,8 +123,8 @@ int non_trivially_relocatable_struct_throwing::count = 0;
 int non_trivially_relocatable_struct_throwing::move_count = 0;
 int non_trivially_relocatable_struct_throwing::dtor_count = 0;
 
-static_assert(!hpx::is_trivially_relocatable_v<
-              non_trivially_relocatable_struct_throwing>);
+static_assert(
+    !is_trivially_relocatable_v<non_trivially_relocatable_struct_throwing>);
 
 int hpx_main()
 {
@@ -150,7 +152,7 @@ int hpx_main()
         HPX_TEST(trivially_relocatable_struct::count == N);
 
         // relocate them to ptr2
-        hpx::experimental::uninitialized_relocate(ptr1, ptr1 + N, ptr2);
+        uninitialized_relocate(ptr1, ptr1 + N, ptr2);
 
         // All creations - destructions balance out
         HPX_TEST(trivially_relocatable_struct::count == N);
@@ -165,7 +167,6 @@ int hpx_main()
         }
 
         std::destroy(ptr2, ptr2 + N);
-        HPX_TEST(trivially_relocatable_struct::dtor_count == N);
 
         std::free(mem1);
         std::free(mem2);
@@ -194,7 +195,7 @@ int hpx_main()
         HPX_TEST(non_trivially_relocatable_struct::count == N);
 
         // relocate them to ptr2
-        hpx::experimental::uninitialized_relocate(ptr1, ptr1 + N, ptr2);
+        uninitialized_relocate(ptr1, ptr1 + N, ptr2);
 
         // All creations - destructions balance out
         HPX_TEST(non_trivially_relocatable_struct::count == N);
@@ -241,12 +242,11 @@ int hpx_main()
         // relocate them to ptr2
         try
         {
-            hpx::experimental::uninitialized_relocate(ptr1, ptr1 + N, ptr2);
-            HPX_TEST(false);    // should never reach this
+            uninitialized_relocate(ptr1, ptr1 + N, ptr2);
+            HPX_UNREACHABLE;    // should have thrown
         }
-        catch (int forty_two)
+        catch (...)
         {
-            HPX_TEST(forty_two == 42);
         }
 
         // K move constructors were called