Skip to content

Commit 4f3e79f

Browse files
ericnieblerericniebler
committed
clang-format
1 parent 4667eb2 commit 4f3e79f

20 files changed

+123
-98
lines changed

‎include/exec/async_scope.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,9 @@ namespace exec {
524524

525525
__future_state(_Sender __sndr, _Env __env, const __impl* __scope)
526526
: __future_state_base<_Completions, _Env>((_Env&&) __env, __scope)
527-
, __op_(stdexec::connect((_Sender&&) __sndr, __future_receiver_t<_Sender, _Env>{this, __scope})) {
527+
, __op_(stdexec::connect(
528+
(_Sender&&) __sndr,
529+
__future_receiver_t<_Sender, _Env>{this, __scope})) {
528530
}
529531

530532
connect_result_t<_Sender, __future_receiver_t<_Sender, _Env>> __op_;

‎include/exec/finally.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ namespace exec {
101101
class __t {
102102
public:
103103
using is_receiver = void;
104+
104105
explicit __t(__final_operation_base<_ResultType, _ReceiverId>* __op) noexcept
105106
: __op_{__op} {
106107
}
@@ -167,6 +168,7 @@ namespace exec {
167168
class __t {
168169
public:
169170
using is_receiver = void;
171+
170172
explicit __t(__base_op_t* __op) noexcept
171173
: __op_(__op) {
172174
}
@@ -228,7 +230,8 @@ namespace exec {
228230
, __op_(std::in_place_index<0>, __conv{[&] {
229231
return __initial_op_t{
230232
(_FinalSender&&) __final_sender,
231-
stdexec::connect((_InitialSender&&) __initial_sender, __initial_receiver_t{this})};
233+
stdexec::connect(
234+
(_InitialSender&&) __initial_sender, __initial_receiver_t{this})};
232235
}}) {
233236
}
234237
};

‎include/exec/materialize.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ namespace exec {
2828

2929
class __t {
3030
public:
31-
using is_receiver = void;
31+
using is_receiver = void;
32+
3233
__t(_Receiver&& __upstream)
3334
: __upstream_{(_Receiver&&) __upstream} {
3435
}
@@ -123,6 +124,7 @@ namespace exec {
123124
class __t {
124125
public:
125126
using is_receiver = void;
127+
126128
__t(_Receiver&& __upstream)
127129
: __upstream_{(_Receiver&&) __upstream} {
128130
}

‎include/exec/sequence/empty_sequence.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ namespace exec {
4444
using completion_signatures = stdexec::completion_signatures<>;
4545

4646
template <__decays_to<__t> _Self, receiver_of<completion_signatures> _Rcvr>
47-
friend auto
48-
tag_invoke(subscribe_t, _Self&&, _Rcvr&& __rcvr) noexcept(__nothrow_decay_copyable<_Rcvr>) {
47+
friend auto tag_invoke(subscribe_t, _Self&&, _Rcvr&& __rcvr) noexcept(
48+
__nothrow_decay_copyable<_Rcvr>) {
4949
return stdexec::__t<__operation<stdexec::__id<__decay_t<_Rcvr>>>>{
5050
static_cast<_Rcvr&&>(__rcvr)};
5151
}

‎include/exec/sequence_senders.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ namespace exec {
199199
sender_in<_Sender, env_of_t<_Receiver>> && //
200200
!sequence_sender_in<_Sender, env_of_t<_Receiver>> && //
201201
sequence_receiver_of<_Receiver, completion_signatures_of_t<_Sender, env_of_t<_Receiver>>>
202-
&& //
202+
&& //
203203
__receiver_from<__stopped_means_break_t<_Receiver>, __next_sender_of_t<_Receiver, _Sender>>
204-
&& //
204+
&& //
205205
__connect::__connectable_with_tag_invoke<
206206
__next_sender_of_t<_Receiver, _Sender>&&,
207207
__stopped_means_break_t<_Receiver>>;

‎include/nvexec/detail/memory.cuh

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
5050
T* ptr = nullptr;
5151
if (status = STDEXEC_DBG_ERR(::cudaMalloc(&ptr, sizeof(T))); status == cudaSuccess) {
5252
try {
53-
T h((As&&) as...);
53+
T h((As&&) as...);
5454
status = STDEXEC_DBG_ERR(::cudaMemcpy(ptr, &h, sizeof(T), cudaMemcpyHostToDevice));
5555
if (status == cudaSuccess) {
5656
return device_ptr<T>(ptr);
5757
}
58-
} catch(...) {
58+
} catch (...) {
5959
status = cudaErrorUnknown;
6060
STDEXEC_DBG_ERR(::cudaFree(ptr));
6161
}
@@ -112,8 +112,8 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
112112
requires same_as<T, void>
113113
host_ptr<__decay_t<A>>
114114
make_host(cudaError_t& status, std::pmr::memory_resource* resource, A&& t) {
115-
return make_host<__decay_t<A>>(status, resource, (A&&) t);
116-
}
115+
return make_host<__decay_t<A>>(status, resource, (A&&) t);
116+
}
117117

118118
struct pinned_resource : public std::pmr::memory_resource {
119119
pinned_resource() noexcept {
@@ -130,7 +130,8 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
130130
return ret;
131131
}
132132

133-
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */) override {
133+
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */)
134+
override {
134135
STDEXEC_DBG_ERR(cudaFreeHost(ptr));
135136
}
136137

@@ -153,7 +154,8 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
153154
return ret;
154155
}
155156

156-
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */) override {
157+
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */)
158+
override {
157159
STDEXEC_DBG_ERR(cudaFree(ptr));
158160
}
159161

@@ -174,7 +176,8 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
174176
return ret;
175177
}
176178

177-
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */) override {
179+
void do_deallocate(void* ptr, const std::size_t /* bytes */, const std::size_t /* alignment */)
180+
override {
178181
STDEXEC_DBG_ERR(cudaFree(ptr));
179182
}
180183

@@ -236,7 +239,10 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
236239
return ptr;
237240
}
238241

239-
void do_deallocate(void* /* ptr */, const std::size_t /* bytes */, const std::size_t /* alignment */) override {
242+
void do_deallocate(
243+
void* /* ptr */,
244+
const std::size_t /* bytes */,
245+
const std::size_t /* alignment */) override {
240246
}
241247

242248
bool do_is_equal(const std::pmr::memory_resource& other) const noexcept override {
@@ -349,7 +355,7 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
349355
monotonic_buffer_resource monotonic_resource_;
350356
synchronized_pool_resource resource_;
351357

352-
public:
358+
public:
353359
resource_storage()
354360
: underlying_resource_{}
355361
, monotonic_resource_{512 * 1024, &underlying_resource_}

‎include/nvexec/detail/variant.cuh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ namespace nvexec {
175175
return get<detail::nth_type<I, Ts...>>();
176176
}
177177

178-
STDEXEC_DETAIL_CUDACC_HOST_DEVICE variant_t() requires std::default_initializable<front_t> {
178+
STDEXEC_DETAIL_CUDACC_HOST_DEVICE variant_t()
179+
requires std::default_initializable<front_t>
180+
{
179181
emplace<front_t>();
180182
}
181183

‎include/nvexec/nvtx.cuh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ namespace nvexec {
115115

116116
struct push_t {
117117
template <stdexec::sender Sender>
118-
nvtx_sender_th<kind::push, Sender> operator()(Sender&& sndr, std::string &&name) const {
118+
nvtx_sender_th<kind::push, Sender> operator()(Sender&& sndr, std::string&& name) const {
119119
return nvtx_sender_th<kind::push, Sender>{{}, (Sender&&) sndr, std::move(name)};
120120
}
121121

@@ -140,7 +140,7 @@ namespace nvexec {
140140

141141
struct scoped_t {
142142
template <stdexec::sender Sender, stdexec::__sender_adaptor_closure Closure>
143-
auto operator()(Sender&& __sndr, std::string &&name, Closure closure) const noexcept {
143+
auto operator()(Sender&& __sndr, std::string&& name, Closure closure) const noexcept {
144144
return (Sender&&) __sndr | push(std::move(name)) | closure | pop();
145145
}
146146

@@ -160,9 +160,9 @@ namespace nvexec {
160160
}} // STDEXEC_STREAM_DETAIL_NS
161161

162162
namespace nvtx {
163-
using STDEXEC_STREAM_DETAIL_NS::nvtx::push;
164-
using STDEXEC_STREAM_DETAIL_NS::nvtx::pop;
165-
using STDEXEC_STREAM_DETAIL_NS::nvtx::scoped;
163+
using STDEXEC_STREAM_DETAIL_NS::nvtx::push;
164+
using STDEXEC_STREAM_DETAIL_NS::nvtx::pop;
165+
using STDEXEC_STREAM_DETAIL_NS::nvtx::scoped;
166166
}
167167

168168
} // namespace nvexec

‎include/nvexec/stream/bulk.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
5858
constexpr int block_threads = 256;
5959
const int grid_blocks = (static_cast<int>(self.shape_) + block_threads - 1)
6060
/ block_threads;
61-
kernel<block_threads, As&...><<<grid_blocks, block_threads, 0, stream>>>(
62-
self.shape_, std::move(self.f_), as...);
61+
kernel<block_threads, As&...>
62+
<<<grid_blocks, block_threads, 0, stream>>>(self.shape_, std::move(self.f_), as...);
6363
}
6464

6565
if (cudaError_t status = STDEXEC_DBG_ERR(cudaPeekAtLastError()); status == cudaSuccess) {

‎include/nvexec/stream/common.cuh

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace nvexec {
100100
std::stack<cudaStream_t> streams_;
101101
std::mutex mtx_;
102102

103-
public:
103+
public:
104104
stream_pool_t() = default;
105105
stream_pool_t(const stream_pool_t&) = delete;
106106
stream_pool_t& operator=(const stream_pool_t&) = delete;
@@ -127,7 +127,7 @@ namespace nvexec {
127127
}
128128

129129
return std::make_pair(stream, status);
130-
}
130+
}
131131

132132
cudaStream_t stream = streams_.top();
133133
streams_.pop();
@@ -155,7 +155,7 @@ namespace nvexec {
155155
return pools_[static_cast<int>(priority)];
156156
}
157157

158-
public:
158+
public:
159159
std::pair<cudaStream_t, cudaError_t> borrow_stream(stream_priority priority) {
160160
return get(priority).borrow_stream(priority);
161161
}
@@ -213,7 +213,6 @@ namespace nvexec {
213213
obj->~T();
214214
}
215215

216-
217216
struct stream_provider_t {
218217
cudaError_t status_{cudaSuccess};
219218
std::optional<cudaStream_t> own_stream_{};
@@ -325,15 +324,14 @@ namespace nvexec {
325324

326325
template <class BaseEnv>
327326
requires __callable<get_stream_provider_t, const BaseEnv&>
328-
BaseEnv make_stream_env(BaseEnv&& base_env, stream_provider_t* ) noexcept {
327+
BaseEnv make_stream_env(BaseEnv&& base_env, stream_provider_t*) noexcept {
329328
return (BaseEnv&&) base_env;
330329
}
331330

332331
template <class BaseEnv>
333-
using stream_env =
334-
decltype(STDEXEC_STREAM_DETAIL_NS::make_stream_env(
335-
__declval<BaseEnv>(),
336-
static_cast<stream_provider_t*>(nullptr)));
332+
using stream_env = decltype(STDEXEC_STREAM_DETAIL_NS::make_stream_env(
333+
__declval<BaseEnv>(),
334+
static_cast<stream_provider_t*>(nullptr)));
337335

338336
template <class BaseEnv>
339337
auto make_terminal_stream_env(BaseEnv&& base_env, stream_provider_t* stream_provider) noexcept {
@@ -505,7 +503,7 @@ namespace nvexec {
505503
}
506504

507505
stream_provider_t* get_stream_provider() const {
508-
stream_provider_t *stream_provider{};
506+
stream_provider_t* stream_provider{};
509507

510508
if constexpr (borrows_stream) {
511509
const outer_env_t& env = get_env(rcvr_);
@@ -522,12 +520,12 @@ namespace nvexec {
522520
}
523521

524522
template <class T>
525-
void defer_temp_storage_destruction(T *ptr) {
523+
void defer_temp_storage_destruction(T* ptr) {
526524
STDEXEC_ASSERT(ptr == this->temp_storage_);
527525

528526
if constexpr (!std::is_trivially_destructible_v<T>) {
529527
temp_storage_ = nullptr; // defer deallocation to the stream provider
530-
stream_provider_t *stream_provider = get_stream_provider();
528+
stream_provider_t* stream_provider = get_stream_provider();
531529
std::pmr::memory_resource* managed_resource = context_state_.managed_resource_;
532530

533531
// Stream is destroyed when the last object is buried, so it's safe to use it here
@@ -543,9 +541,9 @@ namespace nvexec {
543541
} else {
544542
destructor_kernel<<<1, 1, 0, stream>>>(ptr);
545543

546-
// TODO Bury all the memory associated with the stream provider and then
544+
// TODO Bury all the memory associated with the stream provider and then
547545
// deallocate the memory
548-
cudaStreamSynchronize(stream);
546+
cudaStreamSynchronize(stream);
549547
}
550548

551549
managed_resource->deallocate(ptr, sizeof(T));
@@ -628,7 +626,8 @@ namespace nvexec {
628626

629627
if (op.stream_provider_.status_ != cudaSuccess) {
630628
// Couldn't allocate memory for operation state, complete with error
631-
op.propagate_completion_signal(stdexec::set_error, std::move(op.stream_provider_.status_));
629+
op.propagate_completion_signal(
630+
stdexec::set_error, std::move(op.stream_provider_.status_));
632631
return;
633632
}
634633

@@ -666,7 +665,8 @@ namespace nvexec {
666665
ReceiverProvider receiver_provider,
667666
context_state_t context_state)
668667
: base_t((outer_receiver_t&&) out_receiver, context_state)
669-
, storage_(make_host<variant_t>(this->stream_provider_.status_, context_state.pinned_resource_))
668+
, storage_(
669+
make_host<variant_t>(this->stream_provider_.status_, context_state.pinned_resource_))
670670
, task_(make_host<task_t>(
671671
this->stream_provider_.status_,
672672
context_state.pinned_resource_,
@@ -675,7 +675,10 @@ namespace nvexec {
675675
this->get_stream(),
676676
context_state.pinned_resource_)
677677
.release())
678-
, env_(make_host<env_t>(this->stream_provider_.status_, context_state.pinned_resource_, this->make_env()))
678+
, env_(make_host<env_t>(
679+
this->stream_provider_.status_,
680+
context_state.pinned_resource_,
681+
this->make_env()))
679682
, inner_op_{connect(
680683
(sender_t&&) sender,
681684
stream_enqueue_receiver_t{

0 commit comments

Comments
 (0)