Skip to content
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.

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

Add patch reverting CCCL PR 211. #511

Merged
merged 1 commit into from
Dec 19, 2023
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
79 changes: 79 additions & 0 deletions rapids-cmake/cpm/patches/cccl/revert_pr_211.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
diff --git a/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h b/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
index a0d9d492d..69c4e20df 100644
--- a/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
+++ b/thrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
@@ -33,38 +33,12 @@
#include <thrust/system/cuda/config.h>
#include <thrust/system/cuda/detail/execution_policy.h>
#include <thrust/system/cuda/detail/transform.h>
-#include <thrust/system/cuda/detail/util.h>
-#include <thrust/distance.h>
#include <thrust/functional.h>
-#include <thrust/type_traits/is_trivially_relocatable.h>

THRUST_NAMESPACE_BEGIN
namespace cuda_cub {

namespace __copy {
- template <class Derived,
- class InputIt,
- class OutputIt>
- OutputIt THRUST_RUNTIME_FUNCTION
- device_to_device(execution_policy<Derived>& policy,
- InputIt first,
- InputIt last,
- OutputIt result,
- thrust::detail::true_type)
- {
- typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
- const auto n = thrust::distance(first, last);
- if (n > 0) {
- cudaError status;
- status = trivial_copy_device_to_device(policy,
- reinterpret_cast<InputTy*>(thrust::raw_pointer_cast(&*result)),
- reinterpret_cast<InputTy const*>(thrust::raw_pointer_cast(&*first)),
- n);
- cuda_cub::throw_on_error(status, "__copy:: D->D: failed");
- }
-
- return result + n;
- }

template <class Derived,
class InputIt,
@@ -73,32 +47,16 @@ namespace __copy {
device_to_device(execution_policy<Derived>& policy,
InputIt first,
InputIt last,
- OutputIt result,
- thrust::detail::false_type)
+ OutputIt result)
{
typedef typename thrust::iterator_traits<InputIt>::value_type InputTy;
return cuda_cub::transform(policy,
- first,
- last,
- result,
- thrust::identity<InputTy>());
- }
-
- template <class Derived,
- class InputIt,
- class OutputIt>
- OutputIt THRUST_RUNTIME_FUNCTION
- device_to_device(execution_policy<Derived>& policy,
- InputIt first,
- InputIt last,
- OutputIt result)
- {
- return device_to_device(policy,
first,
last,
result,
- typename is_indirectly_trivially_relocatable_to<InputIt, OutputIt>::type());
+ thrust::identity<InputTy>());
}
+
} // namespace __copy

} // namespace cuda_cub
5 changes: 5 additions & 0 deletions rapids-cmake/cpm/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"file" : "cccl/bug_fixes.diff",
"issue" : "CCCL installs header-search.cmake files in nondeterministic order and has a typo in checking target creation that leads to duplicates",
"fixed_in" : "2.3"
},
{
"file" : "cccl/revert_pr_211.diff",
"issue" : "thrust::copy introduced a change in behavior that causes failures with cudaErrorInvalidValue.",
"fixed_in" : ""
}
]
},
Expand Down