Remove ambiguous tuple order checks

STEllAR-GROUP · Jun 5, 2024 · 7c3657b · 7c3657b
1 parent 7838bb1
commit 7c3657b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 25 deletions.
diff --git a/libs/core/execution/tests/unit/algorithm_let_error.cpp b/libs/core/execution/tests/unit/algorithm_let_error.cpp
@@ -79,8 +79,8 @@ int main()
 
 #ifdef HPX_HAVE_STDEXEC
         /*TODO: the following is unclear: https://rentry.org/4rzhctgx
-         * So this may be volatile to internal stdexec changes. */
-        check_value_types<hpx::variant<hpx::tuple<>, hpx::tuple<int>>>(s2);
+         * So this is volatile to internal stdexec changes, and is thus disabled
+         * check_value_types<hpx::variant<hpx::tuple<>, hpx::tuple<int>>>(s2);*/
 #else
         check_value_types<hpx::variant<hpx::tuple<int>, hpx::tuple<>>>(s2);
 #endif
@@ -113,10 +113,10 @@ int main()
         static_assert(ex::is_sender_v<decltype(s2), ex::empty_env>);
 #endif
 
-        // TODO:
 #ifdef HPX_HAVE_STDEXEC
-        check_value_types<hpx::variant<hpx::tuple<>,
-            hpx::tuple<custom_type_non_default_constructible>>>(s2);
+        /* Disabled due to ambiguous order
+         * check_value_types<hpx::variant<hpx::tuple<>,
+         *   hpx::tuple<custom_type_non_default_constructible>>>(s2); */
 #else
         check_value_types<hpx::variant<
             hpx::tuple<custom_type_non_default_constructible>, hpx::tuple<>>>(
@@ -153,9 +153,10 @@ int main()
 #endif
 
 #ifdef HPX_HAVE_STDEXEC
-        check_value_types<hpx::variant<hpx::tuple<>,
-            hpx::tuple<custom_type_non_default_constructible_non_copyable>>>(
-            s2);
+        /* Disabled due to ambiguous order
+         * check_value_types<hpx::variant<hpx::tuple<>,
+         *   hpx::tuple<custom_type_non_default_constructible_non_copyable>>>(
+         *   s2); */
 #else
         check_value_types<hpx::variant<
             hpx::tuple<custom_type_non_default_constructible_non_copyable>,
@@ -219,7 +220,8 @@ int main()
 #endif
 
 #ifdef HPX_HAVE_STDEXEC
-        check_value_types<hpx::variant<hpx::tuple<>, hpx::tuple<int>>>(s);
+        /* Disabled due to ambiguous order
+         * check_value_types<hpx::variant<hpx::tuple<>, hpx::tuple<int>>>(s); */
 #else
         check_value_types<hpx::variant<hpx::tuple<int>, hpx::tuple<>>>(s);
 #endif

diff --git a/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp b/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp
@@ -71,8 +71,7 @@ void test_async(Executor&& exec)
 {
     executed = false;
 
-    hpx::parallel::execution::async_execute(exec, &test, 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::async_execute(exec, &test, 42));
 
     HPX_TEST(executed);
 }
@@ -96,8 +95,7 @@ void test_then(Executor&& exec)
 
     executed = false;
 
-    hpx::parallel::execution::then_execute(exec, &test_f, std::move(f), 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::then_execute(exec, &test_f, std::move(f), 42));
 
     HPX_TEST(executed);
 }
@@ -141,17 +139,15 @@ void test_bulk_async_void(Executor&& exec)
 
     executed = false;
 
-    hpx::parallel::execution::bulk_async_execute(
-        exec, hpx::bind(&bulk_test_void, _1, _2), 107, 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::bulk_async_execute(
+        exec, hpx::bind(&bulk_test_void, _1, _2), 107, 42));
 
     HPX_TEST(executed);
 
     executed = false;
 
-    hpx::parallel::execution::bulk_async_execute(
-        exec, &bulk_test_void, 107, 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::bulk_async_execute(
+        exec, &bulk_test_void, 107, 42));
 
     HPX_TEST(executed);
 }
@@ -183,17 +179,15 @@ void test_bulk_then_void(Executor&& exec)
 
     executed = false;
 
-    hpx::parallel::execution::bulk_then_execute(
-        exec, hpx::bind(&bulk_test_f_void, _1, _2, _3), 107, f, 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::bulk_then_execute(
+        exec, hpx::bind(&bulk_test_f_void, _1, _2, _3), 107, f, 42));
 
     HPX_TEST(executed);
 
     executed = false;
 
-    hpx::parallel::execution::bulk_then_execute(
-        exec, &bulk_test_f_void, 107, f, 42) |
-        hpx::this_thread::experimental::sync_wait();
+    hpx::this_thread::experimental::sync_wait(hpx::parallel::execution::bulk_then_execute(
+        exec, &bulk_test_f_void, 107, f, 42));
 
     HPX_TEST(executed);
 }