Skip to content

Commit c7b0044

Browse files
isidorostsaisidorostsa
committed
execution ns aliases
1 parent a86a1ee commit c7b0044

File tree

9 files changed

+214
-271
lines changed

9 files changed

+214
-271
lines changed

‎libs/core/execution/include/hpx/execution/algorithms/as_sender.hpp‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <utility>
2626

2727
namespace hpx::execution::experimental {
28-
28+
namespace hpxexec = hpx::execution::experimental;
2929
namespace detail {
3030

3131
///////////////////////////////////////////////////////////////////////////
@@ -54,8 +54,8 @@ namespace hpx::execution::experimental {
5454
as_sender_operation_state& operator=(
5555
as_sender_operation_state const&) = delete;
5656

57-
friend void tag_invoke(hpx::execution::experimental::start_t,
58-
as_sender_operation_state& os) noexcept
57+
friend void tag_invoke(
58+
hpxexec::start_t, as_sender_operation_state& os) noexcept
5959
{
6060
os.start_helper();
6161
}
@@ -79,19 +79,17 @@ namespace hpx::execution::experimental {
7979
{
8080
if constexpr (std::is_void_v<result_type>)
8181
{
82-
hpx::execution::experimental::set_value(
83-
HPX_MOVE(receiver_));
82+
hpxexec::set_value(HPX_MOVE(receiver_));
8483
}
8584
else
8685
{
87-
hpx::execution::experimental::set_value(
86+
hpxexec::set_value(
8887
HPX_MOVE(receiver_), future_.get());
8988
}
9089
}
9190
else if (future_.has_exception())
9291
{
93-
hpx::execution::experimental::set_error(
94-
HPX_MOVE(receiver_),
92+
hpxexec::set_error(HPX_MOVE(receiver_),
9593
future_.get_exception_ptr());
9694
}
9795
};
@@ -120,8 +118,7 @@ namespace hpx::execution::experimental {
120118
}
121119
},
122120
[&](std::exception_ptr ep) {
123-
hpx::execution::experimental::set_error(
124-
HPX_MOVE(receiver_), HPX_MOVE(ep));
121+
hpxexec::set_error(HPX_MOVE(receiver_), HPX_MOVE(ep));
125122
});
126123
}
127124

@@ -140,22 +137,19 @@ namespace hpx::execution::experimental {
140137
template <bool IsVoid, typename _result_type>
141138
struct set_value_void_checked
142139
{
143-
using type = hpx::execution::experimental::set_value_t(
144-
_result_type);
140+
using type = hpxexec::set_value_t(_result_type);
145141
};
146142

147143
template <typename _result_type>
148144
struct set_value_void_checked<true, _result_type>
149145
{
150-
using type = hpx::execution::experimental::set_value_t();
146+
using type = hpxexec::set_value_t();
151147
};
152148

153-
using completion_signatures =
154-
hpx::execution::experimental::completion_signatures<
155-
typename set_value_void_checked<std::is_void_v<result_type>,
156-
result_type>::type,
157-
hpx::execution::experimental::set_error_t(
158-
std::exception_ptr)>;
149+
using completion_signatures = hpxexec::completion_signatures<
150+
typename set_value_void_checked<std::is_void_v<result_type>,
151+
result_type>::type,
152+
hpxexec::set_error_t(std::exception_ptr)>;
159153
#else
160154
// Sender compatibility
161155
template <typename, typename T>

‎libs/core/execution/include/hpx/execution/algorithms/bulk.hpp‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <utility>
3535

3636
namespace hpx::execution::experimental {
37+
namespace hpxexec = hpx::execution::experimental;
3738

3839
///////////////////////////////////////////////////////////////////////////
3940
namespace detail {
@@ -46,37 +47,33 @@ namespace hpx::execution::experimental {
4647
HPX_NO_UNIQUE_ADDRESS std::decay_t<F> f;
4748

4849
#if defined(HPX_HAVE_STDEXEC)
49-
using sender_concept = hpx::execution::experimental::sender_t;
50+
using sender_concept = hpxexec::sender_t;
5051

5152
template <typename... Args>
5253
using default_set_value =
53-
hpx::execution::experimental::completion_signatures<
54-
hpx::execution::experimental::set_value_t(Args...)>;
54+
hpxexec::completion_signatures<hpxexec::set_value_t(Args...)>;
5555

5656
template <typename Arg>
5757
using default_set_error =
58-
hpx::execution::experimental::completion_signatures<
59-
hpx::execution::experimental::set_error_t(Arg)>;
58+
hpxexec::completion_signatures<hpxexec::set_error_t(Arg)>;
6059

61-
using disable_set_stopped =
62-
hpx::execution::experimental::completion_signatures<>;
60+
using disable_set_stopped = hpxexec::completion_signatures<>;
6361

6462
// clang-format off
6563
template <typename Env>
6664
friend auto tag_invoke(get_completion_signatures_t,
6765
bulk_sender const&, Env) noexcept -> hpx::execution::
6866
experimental::transform_completion_signatures_of<Sender, Env,
69-
hpx::execution::experimental::completion_signatures<
70-
hpx::execution::experimental::set_error_t(
67+
hpxexec::completion_signatures<
68+
hpxexec::set_error_t(
7169
std::exception_ptr)>,
7270
default_set_value, default_set_error, disable_set_stopped>;
7371
// clang-format on
7472

7573
friend constexpr auto tag_invoke(
76-
hpx::execution::experimental::get_env_t,
77-
bulk_sender const& s) noexcept
74+
hpxexec::get_env_t, bulk_sender const& s) noexcept
7875
{
79-
return hpx::execution::experimental::get_env(s.sender);
76+
return hpxexec::get_env(s.sender);
8077
}
8178
#else
8279
using is_sender = void;
@@ -107,14 +104,13 @@ namespace hpx::execution::experimental {
107104
// clang-format off
108105
template <typename CPO,
109106
HPX_CONCEPT_REQUIRES_(
110-
hpx::execution::experimental::detail::is_receiver_cpo_v<CPO> &&
111-
hpx::execution::experimental::detail::has_completion_scheduler_v<
107+
hpxexec::detail::is_receiver_cpo_v<CPO> &&
108+
hpxexec::detail::has_completion_scheduler_v<
112109
CPO, std::decay_t<Sender>>
113110
)>
114111
// clang-format on
115112
friend constexpr auto tag_invoke(
116-
hpx::execution::experimental::get_completion_scheduler_t<CPO>
117-
tag,
113+
hpxexec::get_completion_scheduler_t<CPO> tag,
118114
bulk_sender const& s)
119115
{
120116
return tag(s.sender);
@@ -124,8 +120,7 @@ namespace hpx::execution::experimental {
124120
struct bulk_receiver
125121
{
126122
#if defined(HPX_HAVE_STDEXEC)
127-
using receiver_concept =
128-
hpx::execution::experimental::receiver_t;
123+
using receiver_concept = hpxexec::receiver_t;
129124
#endif
130125
HPX_NO_UNIQUE_ADDRESS std::decay_t<Receiver> receiver;
131126
HPX_NO_UNIQUE_ADDRESS std::decay_t<Shape> shape;
@@ -143,15 +138,14 @@ namespace hpx::execution::experimental {
143138
friend void tag_invoke(
144139
set_error_t, bulk_receiver&& r, Error&& error) noexcept
145140
{
146-
hpx::execution::experimental::set_error(
141+
hpxexec::set_error(
147142
HPX_MOVE(r.receiver), HPX_FORWARD(Error, error));
148143
}
149144

150145
friend void tag_invoke(
151146
set_stopped_t, bulk_receiver&& r) noexcept
152147
{
153-
hpx::execution::experimental::set_stopped(
154-
HPX_MOVE(r.receiver));
148+
hpxexec::set_stopped(HPX_MOVE(r.receiver));
155149
}
156150

157151
template <typename... Ts>
@@ -167,19 +161,19 @@ namespace hpx::execution::experimental {
167161
{
168162
HPX_INVOKE(f, s, ts...);
169163
}
170-
hpx::execution::experimental::set_value(
164+
hpxexec::set_value(
171165
HPX_MOVE(receiver), HPX_FORWARD(Ts, ts)...);
172166
},
173167
[&](std::exception_ptr ep) {
174-
hpx::execution::experimental::set_error(
168+
hpxexec::set_error(
175169
HPX_MOVE(receiver), HPX_MOVE(ep));
176170
});
177171
}
178172

179173
template <typename... Ts>
180174
friend auto tag_invoke(
181175
set_value_t, bulk_receiver&& r, Ts&&... ts) noexcept
182-
-> decltype(hpx::execution::experimental::set_value(
176+
-> decltype(hpxexec::set_value(
183177
std::declval<std::decay_t<Receiver>&&>(),
184178
HPX_FORWARD(Ts, ts)...),
185179
void())
@@ -196,7 +190,7 @@ namespace hpx::execution::experimental {
196190
friend auto tag_invoke(
197191
connect_t, bulk_sender&& s, Receiver&& receiver)
198192
{
199-
return hpx::execution::experimental::connect(HPX_MOVE(s.sender),
193+
return hpxexec::connect(HPX_MOVE(s.sender),
200194
bulk_receiver<Receiver>(HPX_FORWARD(Receiver, receiver),
201195
HPX_MOVE(s.shape), HPX_MOVE(s.f)));
202196
}
@@ -205,7 +199,7 @@ namespace hpx::execution::experimental {
205199
friend auto tag_invoke(
206200
connect_t, bulk_sender& s, Receiver&& receiver)
207201
{
208-
return hpx::execution::experimental::connect(s.sender,
202+
return hpxexec::connect(s.sender,
209203
bulk_receiver<Receiver>(
210204
HPX_FORWARD(Receiver, receiver), s.shape, s.f));
211205
}
@@ -247,23 +241,21 @@ namespace hpx::execution::experimental {
247241
HPX_CONCEPT_REQUIRES_(
248242
is_sender_v<Sender> &&
249243
experimental::detail::is_completion_scheduler_tag_invocable_v<
250-
hpx::execution::experimental::set_value_t, Sender,
244+
hpxexec::set_value_t, Sender,
251245
bulk_t, Shape, F
252246
>
253247
)>
254248
// clang-format on
255249
friend constexpr HPX_FORCEINLINE auto tag_override_invoke(
256250
bulk_t, Sender&& sender, Shape const& shape, F&& f)
257251
{
258-
auto scheduler =
259-
hpx::execution::experimental::get_completion_scheduler<
260-
hpx::execution::experimental::set_value_t>(
252+
auto scheduler = hpxexec::get_completion_scheduler<hpxexec::set_value_t>(
261253
#if defined(HPX_HAVE_STDEXEC)
262-
hpx::execution::experimental::get_env(sender)
254+
hpxexec::get_env(sender)
263255
#else
264-
sender
256+
sender
265257
#endif
266-
);
258+
);
267259

268260
return hpx::functional::tag_invoke(bulk_t{}, HPX_MOVE(scheduler),
269261
HPX_FORWARD(Sender, sender), shape, HPX_FORWARD(F, f));

‎libs/core/execution/include/hpx/execution/algorithms/keep_future.hpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <utility>
2424

2525
namespace hpx::execution::experimental {
26+
namespace hpxexec = hpx::execution::experimental;
2627

2728
namespace detail {
2829

@@ -51,13 +52,12 @@ namespace hpx::execution::experimental {
5152
// to move receiver and future into the on_completed
5253
// callback.
5354
state->set_on_completed([&os]() mutable {
54-
hpx::execution::experimental::set_value(
55+
hpxexec::set_value(
5556
HPX_MOVE(os.receiver), HPX_MOVE(os.future));
5657
});
5758
},
5859
[&](std::exception_ptr ep) {
59-
hpx::execution::experimental::set_error(
60-
HPX_MOVE(os.receiver), HPX_MOVE(ep));
60+
hpxexec::set_error(HPX_MOVE(os.receiver), HPX_MOVE(ep));
6161
});
6262
}
6363
};
@@ -68,11 +68,9 @@ namespace hpx::execution::experimental {
6868
std::decay_t<Future> future;
6969
#if defined(HPX_HAVE_STDEXEC)
7070
using completion_signatures =
71-
hpx::execution::experimental::completion_signatures<
72-
hpx::execution::experimental::set_value_t(
73-
std::decay_t<Future>),
74-
hpx::execution::experimental::set_error_t(
75-
std::exception_ptr)>;
71+
hpxexec::completion_signatures<hpxexec::set_value_t(
72+
std::decay_t<Future>),
73+
hpxexec::set_error_t(std::exception_ptr)>;
7674
#else
7775
struct completion_signatures
7876
{

0 commit comments

Comments
 (0)