Add patch reverting CCCL PR 211. #511
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bdice
added
improvement
bdice
changed the title
miscco
approved these changes
Dec 19, 2023
robertmaynard
approved these changes
Dec 19, 2023
|
/merge |
1 task
3 tasks
|
rapidsai/cuspatial#1402 will fix a bug that was being masked by this CCCL patch. I will open a PR to remove this patch. |
This was referenced Jul 7, 2024
rapids-bot bot
pushed a commit
to rapidsai/cuspatial
that referenced
this pull request
Jul 9, 2024
This PR fixes a bug in the multipolygon geometry iterator. The geometry iterator was returning part iterators by mistake, which masked an issue that we were patching out in rapids-cmake's CCCL. See rapidsai/rapids-cmake#511. With this fix, we can remove that patch from rapids-cmake's CCCL: rapidsai/rapids-cmake#640 Authors: - Bradley Dice (https://github.com/bdice) - Paul Taylor (https://github.com/trxcllnt) Approvers: - Michael Schellenberger Costa (https://github.com/miscco) - Mark Harris (https://github.com/harrism) - Michael Wang (https://github.com/isVoid) - Paul Taylor (https://github.com/trxcllnt) URL: #1402
rapids-bot bot
pushed a commit
to rapidsai/cudf
that referenced
this pull request
Jul 9, 2024
While upgrading CCCL, we ran into a test failure in cuSpatial. We added a patch to revert some changes from CCCL but the root cause was a bug in cuSpatial. I have fixed that bug here: rapidsai/cuspatial#1402 Once that PR is merged, we can remove this CCCL patch. See also: - rapids-cmake patch removal: rapidsai/rapids-cmake#640 - Original rapids-cmake patch: rapidsai/rapids-cmake#511 - CCCL epic to remove RAPIDS patches: NVIDIA/cccl#1939 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Robert Maynard (https://github.com/robertmaynard) URL: #16207
rapids-bot bot
pushed a commit
that referenced
this pull request
Jul 9, 2024
While upgrading CCCL, we ran into a test failure in cuSpatial. We added a patch to revert some changes from CCCL but the root cause was a bug in cuSpatial. I have fixed that bug here: rapidsai/cuspatial#1402 Once that PR is merged, we can remove this CCCL patch. See also: - #511 - NVIDIA/cccl#1939 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Robert Maynard (https://github.com/robertmaynard) URL: #640
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Something is going wrong in
thrust::copy, so I am adding a patch to revert NVIDIA/cccl#211. This will fix the failing tests for rapidsai/cuspatial#1315.This is where it's failing, with
thrust::copy:https://github.com/rapidsai/cuspatial/blob/8e8fa0689339c0288746b01a8af66fb599f5c770/cpp/tests/range/multipolygon_range_test.cu#L800
CI log: https://github.com/rapidsai/cuspatial/actions/runs/7229405991/job/19700477218?pr=1315#step:7:3280
I traced it down to this CCCL PR - note that
thrust::transform(..., thrust::identity{})works, but the newthrust::copycode path in NVIDIA/cccl#211 that callscudaMemcpyAsyncdoesn't work for some reason. I was not able to identify the exact reason why that PR causes the failure. Patching this out will unblock RAPIDS and let us migrate forward with CCCL 2.2.0.This helps with #502.
Checklist
cmake-format.jsonis up to date with these changes.include_guard(GLOBAL))