Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/exec/just_from.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace experimental::execution
auto operator()(Ts &&...ts) const noexcept -> _error_t<Ts...>;

template <class... Ts>
requires STDEXEC::__cmplsigs::__is_compl_sig<_set_tag_t(Ts...)>
requires STDEXEC::__completion_signature<_set_tag_t(Ts...)>
auto operator()(Ts &&...) const noexcept -> STDEXEC::completion_signatures<_set_tag_t(Ts...)>
{
return {};
Expand Down
3 changes: 2 additions & 1 deletion include/exec/sequence/merge_each.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "../../stdexec/__detail/__config.hpp"
#include "../../stdexec/__detail/__diagnostics.hpp"
#include "../../stdexec/__detail/__execution_fwd.hpp"
#include "../../stdexec/__detail/__gather_completion_signatures.hpp"
#include "../../stdexec/__detail/__meta.hpp"
#include "../../stdexec/__detail/__sender_introspection.hpp"
#include "../../stdexec/__detail/__stop_token.hpp"
Expand Down Expand Up @@ -833,7 +834,7 @@ namespace experimental::execution
struct __gather_sequences_t
{
template <class _Completions>
using __f = STDEXEC::__gather_completions_t<
using __f = STDEXEC::__gather_completion_signatures_t<
STDEXEC::set_value_t,
_Completions,
__arg_of_t<_Sequence, _Sender, _Env...>,
Expand Down
13 changes: 7 additions & 6 deletions include/exec/sequence_senders.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import stdexec;
# include "../stdexec/__detail/__env.hpp"
# include "../stdexec/__detail/__just.hpp"
# include "../stdexec/__detail/__meta.hpp"
# include "../stdexec/__detail/__normalize_completion_signature.hpp"
# include "../stdexec/__detail/__receivers.hpp"
# include "../stdexec/__detail/__senders.hpp"
# include "../stdexec/__detail/__stop_token.hpp"
Expand Down Expand Up @@ -1315,12 +1316,12 @@ namespace experimental::execution
};

template <class _CvSequence, class _Env, class _Items, class _Sigs>
using __sequence_receiver_t = STDEXEC::__mapply<
STDEXEC::__mtransform<
STDEXEC::__mcompose<STDEXEC::__q1<std::remove_pointer_t>,
STDEXEC::__q1<STDEXEC::__cmplsigs::__normalize_sig_t>>,
STDEXEC::__mbind_front_q<__sequence_receiver, _CvSequence, _Env, _Items>>,
_Sigs>;
using __sequence_receiver_t =
STDEXEC::__mapply<STDEXEC::__mtransform<
STDEXEC::__mcompose<STDEXEC::__q1<std::remove_pointer_t>,
STDEXEC::__q1<STDEXEC::__cmplsigs::__normalize_t>>,
STDEXEC::__mbind_front_q<__sequence_receiver, _CvSequence, _Env, _Items>>,
_Sigs>;

template <class _CvSequence, class _Env>
constexpr void __debug_sequence_sender(_CvSequence&& __sequence, _Env const &)
Expand Down
19 changes: 9 additions & 10 deletions include/nvexec/stream/when_all.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,13 @@ namespace nv::execution::_strm
exit_opstate_t<__copy_cvref_t<_when_all_sender_t, Sender>, receiver<CvReceiver, Index>>;

// tuple<tuple<Vs1...>, tuple<Vs2...>, ...>
using _child_values_t =
__if_c<STDEXEC::__detail::__count_of<set_value_t, _completions_t> != 0,
__minvoke<__qq<__tuple>,
__value_types_of_t<Senders,
_when_all::env_t<_env_t>,
__qq<__decayed_tuple>,
__msingle_or<void>>...>,
__>;
using _child_values_t = __if_c<_completions_t::__count(set_value_t()) != 0,
__minvoke<__qq<__tuple>,
__value_types_of_t<Senders,
_when_all::env_t<_env_t>,
__qq<__decayed_tuple>,
__msingle_or<void>>...>,
__>;

using _errors_t =
error_types_of_t<when_all_sender, _when_all::env_t<_env_t>, __uniqued_variant>;
Expand Down Expand Up @@ -389,7 +388,7 @@ namespace nv::execution::_strm
switch (state_.load(std::memory_order_relaxed))
{
case _when_all::started:
if constexpr (STDEXEC::__detail::__count_of<set_value_t, _completions_t> != 0)
if constexpr (_completions_t::__count(set_value_t()) != 0)
{
// All child operations completed successfully:
STDEXEC::__apply(
Expand Down Expand Up @@ -457,7 +456,7 @@ namespace nv::execution::_strm
template <std::size_t Index, class... Args>
void _set_value(Args&&... args) noexcept
{
if constexpr (STDEXEC::__detail::__count_of<set_value_t, _completions_t> != 0)
if constexpr (_completions_t::__count(set_value_t()) != 0)
{
// We only need to bother recording the completion values
// if we're not already in the "error" or "stopped" state.
Expand Down
Loading
Loading