Fixes to account for stdexec #2124

Signed-off-by: Maarten Arnst <maarten.arnst@uliege.be>

Author: maartenarnst

external/stdexec

@@ -70,28 +70,18 @@ TEST_F(WhenAllTest, single_branch) {
                   Kokkos::Execution::ExecutionSpaceImpl::Domain
     >);
 
-    /// Even though the sender returned by @c stdexec::when_all is in the customized domain,
-    /// it does not have a completion scheduler and so it is not an execution space completing sender.
-    static_assert(!Kokkos::Execution::ExecutionSpaceImpl::execution_space_completing_sender<decltype(sndr)>);
+    /// After the implementation of P4269R0 in https://github.com/NVIDIA/stdexec/pull/2124,
+    /// when_all(s) with a single sender is expression-equivalent to auto(s).
+    static_assert(std::same_as<stdexec::tag_of_t<decltype(sndr)>, stdexec::then_t>);
+    static_assert(Kokkos::Execution::ExecutionSpaceImpl::execution_space_completing_sender<decltype(sndr)>);
 
     ASSERT_EQ(data(), 0) << "Eager execution is not allowed.";
 
-    const auto recorded_events = Tests::Utils::record_sync_wait<recorder_listener_t>(std::move(sndr));
-
-    /// Because the sender returned by @c stdexec::when_all is not an execution space completing sender,
-    /// the default implementation of @c stdexec::sync_wait is used.
-    ASSERT_THAT(recorded_events, [&]() {
-        if constexpr (Kokkos::Execution::Impl::has_non_blocking_dispatch<TEST_EXECUTION_SPACE>) {
-            return testing::ElementsAre(
-                MATCHER_FOR_BEGIN_PFOR(exec, dispatch_label(exec, "then")),
-                MATCHER_FOR_RECORD_EVENT(exec),
-                MATCHER_FOR_WAIT_EVENT(recorded_events.at(1)));
-        } else {
-            return testing::ElementsAre(
-                MATCHER_FOR_BEGIN_PFOR(exec, dispatch_label(exec, "then")),
-                MATCHER_FOR_BEGIN_FENCE(exec, dispatch_label(exec, "after dispatch")));
-        }
-    }());
+    ASSERT_THAT(
+        Tests::Utils::record_sync_wait<recorder_listener_t>(std::move(sndr)),
+        testing::ElementsAre(
+            MATCHER_FOR_BEGIN_PFOR(exec, dispatch_label(exec, "then")),
+            MATCHER_FOR_BEGIN_FENCE(exec, dispatch_label(exec, "sync_wait"))));
 
     ASSERT_EQ(data(), 1);
 }

tests/execution_space/test_when_all.cpp

@@ -101,13 +101,9 @@ consteval bool test_sndr_nothrow_transformable() {
     static_assert(std::same_as<
                   stdexec::__demangle_t<when_all_sndr_t>,
                   Tests::Utils::basic_sender_t<
-                      stdexec::when_all_t,
-                      stdexec::__,
-                      Tests::Utils::basic_sender_t<
-                          stdexec::then_t,
-                          Tests::Utils::Functors::NoOp<false, false, false>,
-                          typename TEST_CATEGORY(WhenAllTest)::schedule_sender_t
-                      >
+                      stdexec::then_t,
+                      Tests::Utils::Functors::NoOp<false, false, false>,
+                      typename TEST_CATEGORY(WhenAllTest)::schedule_sender_t
                   >
     >);