Skip to content

Commit d9a8c54

Browse files
bernhardmgruberbernhardmgruber
committed
nvcc 11.1 fixes
1 parent 4712885 commit d9a8c54

File tree

6 files changed

+59
-46
lines changed

6 files changed

+59
-46
lines changed

‎thrust/thrust/async/copy.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ using thrust::async::unimplemented::async_copy;
7373

7474
struct copy_fn final
7575
{
76+
_CCCL_SUPPRESS_DEPRECATED_PUSH
7677
template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
77-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH static auto
78+
_CCCL_HOST static auto
7879
call(thrust::detail::execution_policy_base<FromPolicy> const& from_exec,
7980
thrust::detail::execution_policy_base<ToPolicy> const& to_exec,
8081
ForwardIt&& first,

‎thrust/thrust/async/for_each.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ using thrust::async::unimplemented::async_for_each;
6969

7070
struct for_each_fn final
7171
{
72+
_CCCL_SUPPRESS_DEPRECATED_PUSH
7273
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
73-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH static auto
74+
_CCCL_HOST static auto
7475
call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
7576
ForwardIt&& first,
7677
Sentinel&& last,

‎thrust/thrust/async/reduce.h‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ using thrust::async::unimplemented::async_reduce;
7171

7272
struct reduce_fn final
7373
{
74+
_CCCL_SUPPRESS_DEPRECATED_PUSH
7475
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
75-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH static auto
76+
_CCCL_HOST static auto
7677
call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
7778
ForwardIt&& first,
7879
Sentinel&& last,
@@ -86,13 +87,13 @@ struct reduce_fn final
8687
THRUST_FWD(init),
8788
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
8889

89-
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T>
90-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH
91-
static auto call4(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
92-
ForwardIt&& first,
93-
Sentinel&& last,
94-
T&& init,
95-
thrust::true_type)
90+
_CCCL_SUPPRESS_DEPRECATED_PUSH template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T>
91+
_CCCL_HOST static auto call4(
92+
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
93+
ForwardIt&& first,
94+
Sentinel&& last,
95+
T&& init,
96+
thrust::true_type)
9697
// ADL dispatch.
9798
THRUST_RETURNS(async_reduce(
9899
thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
@@ -101,12 +102,11 @@ struct reduce_fn final
101102
THRUST_FWD(init),
102103
thrust::plus<::cuda::std::remove_cvref_t<T>>{})) _CCCL_SUPPRESS_DEPRECATED_POP
103104

104-
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel>
105-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH
106-
static auto call3(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
107-
ForwardIt&& first,
108-
Sentinel&& last,
109-
thrust::true_type)
105+
_CCCL_SUPPRESS_DEPRECATED_PUSH template <typename DerivedPolicy, typename ForwardIt, typename Sentinel>
106+
_CCCL_HOST static auto call3(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
107+
ForwardIt&& first,
108+
Sentinel&& last,
109+
thrust::true_type)
110110
// ADL dispatch.
111111
THRUST_RETURNS(async_reduce(
112112
thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
@@ -194,8 +194,9 @@ using thrust::async::unimplemented::async_reduce_into;
194194

195195
struct reduce_into_fn final
196196
{
197+
_CCCL_SUPPRESS_DEPRECATED_PUSH
197198
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
198-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH static auto
199+
_CCCL_HOST static auto
199200
call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
200201
ForwardIt&& first,
201202
Sentinel&& last,
@@ -211,8 +212,9 @@ struct reduce_into_fn final
211212
THRUST_FWD(init),
212213
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
213214

215+
_CCCL_SUPPRESS_DEPRECATED_PUSH
214216
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T>
215-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH static auto call5(
217+
_CCCL_HOST static auto call5(
216218
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
217219
ForwardIt&& first,
218220
Sentinel&& last,
@@ -228,13 +230,14 @@ struct reduce_into_fn final
228230
THRUST_FWD(init),
229231
thrust::plus<::cuda::std::remove_cvref_t<T>>{})) _CCCL_SUPPRESS_DEPRECATED_POP
230232

233+
_CCCL_SUPPRESS_DEPRECATED_PUSH
231234
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
232-
_CCCL_HOST _CCCL_SUPPRESS_DEPRECATED_PUSH
233-
static auto call4(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
234-
ForwardIt&& first,
235-
Sentinel&& last,
236-
OutputIt&& output,
237-
thrust::true_type)
235+
_CCCL_HOST static auto call4(
236+
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
237+
ForwardIt&& first,
238+
Sentinel&& last,
239+
OutputIt&& output,
240+
thrust::true_type)
238241
// ADL dispatch.
239242
THRUST_RETURNS(async_reduce_into(
240243
thrust::detail::derived_cast(thrust::detail::strip_const(exec)),

‎thrust/thrust/async/scan.h‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ using thrust::async::unimplemented::async_inclusive_scan;
8686
// Implementation of the thrust::async::inclusive_scan CPO.
8787
struct inclusive_scan_fn final
8888
{
89+
_CCCL_SUPPRESS_DEPRECATED_PUSH
8990
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
90-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH auto operator()(
91+
CCCL_DEPRECATED auto operator()(
9192
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
9293
ForwardIt&& first,
9394
Sentinel&& last,
@@ -101,8 +102,9 @@ struct inclusive_scan_fn final
101102
THRUST_FWD(out),
102103
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
103104

105+
_CCCL_SUPPRESS_DEPRECATED_PUSH
104106
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
105-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
107+
CCCL_DEPRECATED
106108
auto operator()(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
107109
ForwardIt&& first,
108110
Sentinel&& last,
@@ -113,15 +115,16 @@ struct inclusive_scan_fn final
113115
THRUST_FWD(first),
114116
THRUST_FWD(last),
115117
THRUST_FWD(out),
116-
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_PUSH
118+
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_POP
117119

120+
_CCCL_SUPPRESS_DEPRECATED_PUSH
118121
template <typename DerivedPolicy,
119122
typename ForwardIt,
120123
typename Sentinel,
121124
typename OutputIt,
122125
typename InitialValueType,
123126
typename BinaryOp>
124-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH auto operator()(
127+
CCCL_DEPRECATED auto operator()(
125128
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
126129
ForwardIt&& first,
127130
Sentinel&& last,
@@ -137,13 +140,13 @@ struct inclusive_scan_fn final
137140
THRUST_FWD(init),
138141
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
139142

143+
_CCCL_SUPPRESS_DEPRECATED_PUSH
140144
template <typename ForwardIt,
141145
typename Sentinel,
142146
typename OutputIt,
143147
typename BinaryOp,
144148
typename = std::enable_if_t<!is_execution_policy_v<::cuda::std::remove_cvref_t<ForwardIt>>>>
145-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
146-
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, BinaryOp&& op) const
149+
CCCL_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, BinaryOp&& op) const
147150
// ADL dispatch.
148151
THRUST_RETURNS(async_inclusive_scan(
149152
thrust::detail::select_system(iterator_system_t<::cuda::std::remove_cvref_t<ForwardIt>>{},
@@ -153,9 +156,8 @@ struct inclusive_scan_fn final
153156
THRUST_FWD(out),
154157
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
155158

156-
template <typename ForwardIt, typename Sentinel, typename OutputIt>
157-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
158-
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
159+
_CCCL_SUPPRESS_DEPRECATED_PUSH template <typename ForwardIt, typename Sentinel, typename OutputIt>
160+
CCCL_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
159161
// ADL dispatch.
160162
THRUST_RETURNS(async_inclusive_scan(
161163
thrust::detail::select_system(iterator_system_t<::cuda::std::remove_cvref_t<ForwardIt>>{},
@@ -165,13 +167,14 @@ struct inclusive_scan_fn final
165167
THRUST_FWD(out),
166168
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_POP
167169

170+
_CCCL_SUPPRESS_DEPRECATED_PUSH
168171
template <typename ForwardIt,
169172
typename Sentinel,
170173
typename OutputIt,
171174
typename InitialValueType,
172175
typename BinaryOp,
173176
typename = std::enable_if_t<!is_execution_policy_v<::cuda::std::remove_cvref_t<ForwardIt>>>>
174-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
177+
CCCL_DEPRECATED
175178
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init, BinaryOp&& op) const
176179
// ADL dispatch.
177180
THRUST_RETURNS(async_inclusive_scan(
@@ -200,13 +203,14 @@ using thrust::async::unimplemented::async_exclusive_scan;
200203
// Implementation of the thrust::async::exclusive_scan CPO.
201204
struct exclusive_scan_fn final
202205
{
206+
_CCCL_SUPPRESS_DEPRECATED_PUSH
203207
template <typename DerivedPolicy,
204208
typename ForwardIt,
205209
typename Sentinel,
206210
typename OutputIt,
207211
typename InitialValueType,
208212
typename BinaryOp>
209-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH auto operator()(
213+
CCCL_DEPRECATED auto operator()(
210214
thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
211215
ForwardIt&& first,
212216
Sentinel&& last,
@@ -222,8 +226,9 @@ struct exclusive_scan_fn final
222226
THRUST_FWD(init),
223227
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
224228

229+
_CCCL_SUPPRESS_DEPRECATED_PUSH
225230
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename InitialValueType>
226-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
231+
CCCL_DEPRECATED
227232
auto operator()(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
228233
ForwardIt&& first,
229234
Sentinel&& last,
@@ -238,8 +243,9 @@ struct exclusive_scan_fn final
238243
THRUST_FWD(init),
239244
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_POP
240245

246+
_CCCL_SUPPRESS_DEPRECATED_PUSH
241247
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
242-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
248+
CCCL_DEPRECATED
243249
auto operator()(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
244250
ForwardIt&& first,
245251
Sentinel&& last,
@@ -253,13 +259,14 @@ struct exclusive_scan_fn final
253259
iterator_value_t<::cuda::std::remove_cvref_t<ForwardIt>>{},
254260
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_POP
255261

262+
_CCCL_SUPPRESS_DEPRECATED_PUSH
256263
template <typename ForwardIt,
257264
typename Sentinel,
258265
typename OutputIt,
259266
typename InitialValueType,
260267
typename BinaryOp,
261268
typename = std::enable_if_t<!is_execution_policy_v<::cuda::std::remove_cvref_t<ForwardIt>>>>
262-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
269+
CCCL_DEPRECATED
263270
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init, BinaryOp&& op) const
264271
// ADL dispatch.
265272
THRUST_RETURNS(async_exclusive_scan(
@@ -271,13 +278,13 @@ struct exclusive_scan_fn final
271278
THRUST_FWD(init),
272279
THRUST_FWD(op))) _CCCL_SUPPRESS_DEPRECATED_POP
273280

281+
_CCCL_SUPPRESS_DEPRECATED_PUSH
274282
template <typename ForwardIt,
275283
typename Sentinel,
276284
typename OutputIt,
277285
typename InitialValueType,
278286
typename = std::enable_if_t<!is_execution_policy_v<::cuda::std::remove_cvref_t<ForwardIt>>>>
279-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
280-
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init) const
287+
CCCL_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init) const
281288
// ADL dispatch.
282289
THRUST_RETURNS(async_exclusive_scan(
283290
thrust::detail::select_system(iterator_system_t<::cuda::std::remove_cvref_t<ForwardIt>>{},
@@ -288,9 +295,8 @@ struct exclusive_scan_fn final
288295
THRUST_FWD(init),
289296
thrust::plus<>{})) _CCCL_SUPPRESS_DEPRECATED_POP
290297

291-
template <typename ForwardIt, typename Sentinel, typename OutputIt>
292-
CCCL_DEPRECATED _CCCL_SUPPRESS_DEPRECATED_PUSH
293-
auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
298+
_CCCL_SUPPRESS_DEPRECATED_PUSH template <typename ForwardIt, typename Sentinel, typename OutputIt>
299+
CCCL_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
294300
// ADL dispatch.
295301
THRUST_RETURNS(async_exclusive_scan(
296302
thrust::detail::select_system(iterator_system_t<::cuda::std::remove_cvref_t<ForwardIt>>{},

‎thrust/thrust/async/sort.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,13 @@ using thrust::async::unimplemented::async_stable_sort;
7272
// clang-format off
7373
struct stable_sort_fn final
7474
{
75+
_CCCL_SUPPRESS_DEPRECATED_PUSH
7576
template <
7677
typename DerivedPolicy
7778
, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
7879
>
7980
_CCCL_HOST
80-
_CCCL_SUPPRESS_DEPRECATED_PUSH
81+
8182
static auto call(
8283
thrust::detail::execution_policy_base<DerivedPolicy> const& exec
8384
, ForwardIt&& first, Sentinel&& last
@@ -93,12 +94,13 @@ struct stable_sort_fn final
9394
)
9495
_CCCL_SUPPRESS_DEPRECATED_POP
9596

97+
_CCCL_SUPPRESS_DEPRECATED_PUSH
9698
template <
9799
typename DerivedPolicy
98100
, typename ForwardIt, typename Sentinel
99101
>
100102
_CCCL_HOST
101-
_CCCL_SUPPRESS_DEPRECATED_PUSH
103+
102104
static auto call(
103105
thrust::detail::execution_policy_base<DerivedPolicy> const& exec
104106
, ForwardIt&& first, Sentinel&& last

‎thrust/thrust/async/transform.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ using thrust::async::unimplemented::async_transform;
7070
// clang-format off
7171
struct transform_fn final
7272
{
73+
_CCCL_SUPPRESS_DEPRECATED_PUSH
7374
template <
7475
typename DerivedPolicy
7576
, typename ForwardIt, typename Sentinel, typename OutputIt
7677
, typename UnaryOperation
7778
>
7879
_CCCL_HOST
79-
_CCCL_SUPPRESS_DEPRECATED_PUSH
8080
static auto
8181
call(
8282
thrust::detail::execution_policy_base<DerivedPolicy> const& exec

0 commit comments

Comments
 (0)