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.

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

Revert "patch thrust to fix intmax num elements limitation in scan_by_key" #8263

Merged
merged 5 commits into from
May 24, 2021
+0 −22
Merged

Revert "patch thrust to fix intmax num elements limitation in scan_by_key" #8263

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c42502e
Revert "patch thrust to fix intmax num elements limitation in scan_by…
cwharris May 12, 2021
d9eea56
Merge branch 'branch-0.20' of github.com:rapidsai/cudf into revert-81…
cwharris May 17, 2021
eec348e
.
cwharris May 17, 2021
603ec07
Merge branch 'branch-21.06' of github.com:rapidsai/cudf into revert-8…
cwharris May 17, 2021
6e6a164
Merge branch 'branch-21.06' of github.com:rapidsai/cudf into revert-8…
cwharris May 20, 2021
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
22 changes: 0 additions & 22 deletions cpp/cmake/thrust.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,25 +81,3 @@ index c0c6d59..937ee31 100644
{
typedef AgentScanPolicy<
128, 15, ///< Threads per block, items per thread
diff --git a/thrust/system/cuda/detail/scan_by_key.h b/thrust/system/cuda/detail/scan_by_key.h
index fe4b321c..b3974c69 100644
--- a/thrust/system/cuda/detail/scan_by_key.h
+++ b/thrust/system/cuda/detail/scan_by_key.h
@@ -513,7 +513,7 @@ namespace __scan_by_key {
scan_op(scan_op_)
{
int tile_idx = blockIdx.x;
- Size tile_base = ITEMS_PER_TILE * tile_idx;
+ Size tile_base = ITEMS_PER_TILE * static_cast<Size>(tile_idx);
Size num_remaining = num_items - tile_base;

if (num_remaining > ITEMS_PER_TILE)
@@ -734,7 +734,7 @@ namespace __scan_by_key {
ScanOp scan_op,
AddInitToScan add_init_to_scan)
{
- int num_items = static_cast<int>(thrust::distance(keys_first, keys_last));
+ size_t num_items = static_cast<size_t>(thrust::distance(keys_first, keys_last));
size_t storage_size = 0;
cudaStream_t stream = cuda_cub::stream(policy);
bool debug_sync = THRUST_DEBUG_SYNC_FLAG;