Skip to content

fix(rocthrust): qualify invocations to thrust::distance to resolve potential ambiguity #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stanleytsang-amd merged 3 commits into from
Jun 13, 2025
Merged

fix(rocthrust): qualify invocations to thrust::distance to resolve potential ambiguity #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
236912f
fix(rocthrust): qualify invocations to thrust::distance to resolve po…
Naraenda Jun 6, 2025
de1ea51
style: fix formatting
Naraenda Jun 11, 2025
a18af27
docs(rocthrust): update changelog
Naraenda Jun 11, 2025
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
4 changes: 4 additions & 0 deletions projects/rocthrust/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ Documentation for rocThrust available at

* `thrust::device_malloc_allocator` is deprecated as of this version. It will be removed in an upcoming version.

### Resolved issues

* Fixed an issue with internal calls to unqualified `distance()` which would be ambigious due to also visibile implementation through ADL.

## rocThrust 3.4.0 for ROCm 6.5

### Added
Expand Down
9 changes: 6 additions & 3 deletions projects/rocthrust/thrust/system/hip/detail/async/copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,8 @@ auto async_copy(thrust::hip::execution_policy<FromPolicy>& from_exec,
ForwardIt first,
Sentinel last,
OutputIt output)
THRUST_RETURNS(thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, distance(first, last), output))
THRUST_RETURNS(
thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))

// ADL entry point.
template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
Expand All @@ -338,7 +339,8 @@ auto async_copy(thrust::hip::execution_policy<FromPolicy>& from_exec,
ForwardIt first,
Sentinel last,
OutputIt output)
THRUST_RETURNS(thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, distance(first, last), output))
THRUST_RETURNS(
thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))

// ADL entry point.
template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
Expand All @@ -347,7 +349,8 @@ auto async_copy(thrust::hip::execution_policy<FromPolicy>& from_exec,
ForwardIt first,
Sentinel last,
OutputIt output)
THRUST_RETURNS(thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, distance(first, last), output))
THRUST_RETURNS(
thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))

} // namespace hip_rocprim

Expand Down
2 changes: 1 addition & 1 deletion projects/rocthrust/thrust/system/hip/detail/async/exclusive_scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ auto async_exclusive_scan(
InitialValueType&& init,
BinaryOp&& op)
THRUST_RETURNS(thrust::system::hip::detail::async_exclusive_scan_n(
policy, first, distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))

} // namespace hip_rocprim

Expand Down
3 changes: 2 additions & 1 deletion projects/rocthrust/thrust/system/hip/detail/async/for_each.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ namespace hip_rocprim
// ADL entry point.
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
auto async_for_each(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, UnaryFunction&& func)
THRUST_RETURNS(thrust::system::hip::detail::async_for_each_n(policy, first, distance(first, last), THRUST_FWD(func)));
THRUST_RETURNS(
thrust::system::hip::detail::async_for_each_n(policy, first, thrust::distance(first, last), THRUST_FWD(func)));

} // namespace hip_rocprim

Expand Down
4 changes: 2 additions & 2 deletions projects/rocthrust/thrust/system/hip/detail/async/inclusive_scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typenam
auto async_inclusive_scan(
execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel&& last, OutputIt&& out, BinaryOp&& op)
THRUST_RETURNS(thrust::system::hip::detail::async_inclusive_scan_n(
policy, first, distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(op)))
policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(op)))

// ADL entry point.
template <typename DerivedPolicy,
Expand All @@ -205,7 +205,7 @@ auto async_inclusive_scan(
InitialValueType&& init,
BinaryOp&& op)
THRUST_RETURNS(thrust::system::hip::detail::async_inclusive_scan_n(
policy, first, distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))

} // namespace hip_rocprim

Expand Down
4 changes: 2 additions & 2 deletions projects/rocthrust/thrust/system/hip/detail/async/reduce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ namespace hip_rocprim
// ADL entry point.
template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
auto async_reduce(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, T init, BinaryOp op)
THRUST_RETURNS(thrust::system::hip::detail::async_reduce_n(policy, first, distance(first, last), init, op))
THRUST_RETURNS(thrust::system::hip::detail::async_reduce_n(policy, first, thrust::distance(first, last), init, op))

} // namespace hip_rocprim
///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -228,7 +228,7 @@ template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typenam
auto async_reduce_into(
execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, OutputIt output, T init, BinaryOp op)
THRUST_RETURNS(
thrust::system::hip::detail::async_reduce_into_n(policy, first, distance(first, last), output, init, op))
thrust::system::hip::detail::async_reduce_into_n(policy, first, thrust::distance(first, last), output, init, op))

} // namespace hip_rocprim

Expand Down