tidy some nvexec test utilities

Author: ericniebler

test/nvexec/common.cuh

@@ -89,7 +89,7 @@ namespace {
     }
 
     auto is_set_n_times(int n) -> bool {
-      int host_flags[N];
+      int host_flags[N]; // NOLINT
       THROW_ON_CUDA_ERROR(cudaMemcpy(host_flags, flags_, sizeof(int) * N, cudaMemcpyDeviceToHost));
 
       return std::count(host_flags, host_flags + N, n) == N;
@@ -183,13 +183,12 @@ namespace {
         using op_t =
           _operation_state_t<stdexec::__copy_cvref_t<Self, Sender>, _receiver_t<Receiver, Fun>>;
 
-        template <class Self, class Env>
+        template <class Self, class... Env>
         using __completions_t = //
-          stdexec::__try_make_completion_signatures<
-            stdexec::__copy_cvref_t<Self, Sender>,
-            Env,
+          stdexec::transform_completion_signatures<
+            stdexec::__completion_signatures_of_t<stdexec::__copy_cvref_t<Self, Sender>, Env...>,
             stdexec::completion_signatures<>,
-            stdexec::__mbind_front_q<stdexec::__set_value_invoke_t, Fun>>;
+            stdexec::__mbind_front_q<stdexec::__set_value_invoke_t, Fun>::template __f>;
 
         template <stdexec::__decays_to<__t> Self, stdexec::receiver Receiver>
           requires stdexec::receiver_of<Receiver, __completions_t<Self, stdexec::env_of_t<Receiver>>>
@@ -200,8 +199,8 @@ namespace {
             _receiver_t<Receiver, Fun>(static_cast<Receiver&&>(rcvr), self.fun_));
         }
 
-        template <stdexec::__decays_to<__t> Self, class Env>
-        static auto get_completion_signatures(Self&&, Env) -> __completions_t<Self, Env> {
+        template <stdexec::__decays_to<__t> Self, class... Env>
+        static auto get_completion_signatures(Self&&, Env&&...) -> __completions_t<Self, Env...> {
           return {};
         }
 
@@ -255,24 +254,19 @@ namespace {
         template <class Self, class Receiver>
         using op_t = _operation_state_t<stdexec::__copy_cvref_t<Self, Sender>, Receiver>;
 
-        template <class Self, class Env>
-        using completion_signatures = //
-          stdexec::__try_make_completion_signatures<
-            stdexec::__copy_cvref_t<Self, Sender>,
-            Env,
-            stdexec::completion_signatures<>>;
+        template <class Self, class... Env>
+        using _completions_t = //
+          stdexec::__completion_signatures_of_t<stdexec::__copy_cvref_t<Self, Sender>, Env...>;
 
         template <stdexec::__decays_to<__t> Self, stdexec::receiver Receiver>
-          requires stdexec::
-            receiver_of<Receiver, completion_signatures<Self, stdexec::env_of_t<Receiver>>>
-          friend auto
-          tag_invoke(stdexec::connect_t, Self&& self, Receiver&& rcvr) -> op_t<Self, Receiver> {
+          requires stdexec::receiver_of<Receiver, _completions_t<Self, stdexec::env_of_t<Receiver>>>
+        static auto connect(Self&& self, Receiver&& rcvr) -> op_t<Self, Receiver> {
           return op_t<Self, Receiver>(
             static_cast<Self&&>(self).sndr_, static_cast<Receiver&&>(rcvr));
         }
 
-        template <stdexec::__decays_to<__t> Self, class Env>
-        static auto get_completion_signatures(Self&&, Env&&) -> completion_signatures<Self, Env> {
+        template <stdexec::__decays_to<__t> Self, class... Env>
+        static auto get_completion_signatures(Self&&, Env&&...) -> _completions_t<Self, Env...> {
           return {};
         }
 
@@ -300,7 +294,6 @@ namespace {
     using sender_th = detail::a_sender::_sender_t<_Sender, _Fun>;
 
     template <stdexec::sender _Sender, class _Fun>
-      requires stdexec::sender<sender_th<_Sender, _Fun>>
     auto operator()(_Sender&& __sndr, _Fun __fun) const -> sender_th<_Sender, _Fun> {
       return sender_th<_Sender, _Fun>{static_cast<_Sender&&>(__sndr), static_cast<_Fun&&>(__fun)};
     }
@@ -318,7 +311,6 @@ namespace {
     using receiverless_sender_th = detail::a_receiverless_sender::_sender_t<_Sender>;
 
     template <stdexec::sender _Sender>
-      requires stdexec::sender<receiverless_sender_th<_Sender>>
     auto operator()(_Sender&& __sndr) const -> receiverless_sender_th<_Sender> {
       return receiverless_sender_th<_Sender>{static_cast<_Sender&&>(__sndr)};
     }
@@ -336,7 +328,7 @@ namespace {
     using a_sender_helper_t<a_sender_kind::receiverless>::operator();
   };
 
-  constexpr a_sender_t a_sender;
+  constexpr a_sender_t a_sender; // NOLINT (unused-const-variable)
 
   struct move_only_t {
     static constexpr auto invalid() -> int {

test/nvexec/start_detached.cpp

@@ -1,9 +1,8 @@
 #include <cstdlib>
-#include <atomic>
 #include <catch2/catch.hpp>
 #include <stdexec/execution.hpp>
 
-#include "nvexec/detail/cuda_atomic.cuh"
+#include "nvexec/detail/cuda_atomic.cuh" // IWYU pragma: keep
 #include "nvexec/stream/common.cuh"
 #include "nvexec/stream_context.cuh"
 #include "common.cuh"

test/nvexec/tracer_resource.h

@@ -48,4 +48,4 @@ namespace {
       return this == &other;
     }
   };
-}
+} // namespace

test/nvexec/variant.cpp

@@ -23,6 +23,7 @@
 #include "nvexec/detail/variant.cuh"
 #include "common.cuh"
 
+STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_EDG(cuda_compile)
 
 using nvexec::variant_t;
@@ -145,3 +146,5 @@ namespace {
       1);
   }
 } // namespace
+
+STDEXEC_PRAGMA_POP()