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

Test updates of CCCL (thrust, cub, libcudacxx) to 2.1.0. #5623

Closed
wants to merge 7 commits into from

Conversation

hcho3
Copy link
Contributor

@hcho3 hcho3 commented Oct 17, 2023

Continues #5388

This PR tests a rapids-cmake branch with CCCL (thrust, cub, libcudacxx) updated to 2.1.0. Do not merge this PR. The changes will be merged upstream in rapids-cmake after all libraries pass CI.

cc @bdice

bdice and others added 2 commits October 13, 2023 15:29
* Test rapids-cmake branch with CCCL updates to 2.1.0.
* Add thrust and rmm before raft, so that rapids-cmake controls them correctly.
* Define rapids-cmake variables outside if statement.
@hcho3 hcho3 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Oct 17, 2023
@bdice bdice changed the base branch from branch-23.12 to branch-24.02 December 11, 2023 21:32
rapids-bot bot pushed a commit that referenced this pull request Dec 12, 2023
This PR updates parts of the code that require `cuda::proclaim_return_type` for compatibility with CCCL 2.2.0 (Thrust). This pulls out part of the diff of #5623. I left the part that is needed to upgrade to CUB 2.2.0, because those changes will have to go into a separate PR that updates to CCCL 2.2.0.

I also added explicit CMake dependencies on Thrust and RMM. Without these, cuml is reliant on RAFT for transitive dependencies, which makes it very difficult to test upstream changes to Thrust and RMM.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Divye Gala (https://github.com/divyegala)
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #5696
@bdice bdice mentioned this pull request Dec 16, 2023
@bdice
Copy link
Contributor

bdice commented Dec 16, 2023

Thanks so much for your help here @hcho3. We have ported in the changes we need in #5696, and the remaining bits will be merged with #5702. Closing this.

@bdice bdice closed this Dec 16, 2023
rapids-bot bot pushed a commit that referenced this pull request Dec 19, 2023
This PR updates cuml to CCCL 2.2.0. Do not merge until all of RAPIDS is ready to update.

Replaces #5623.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Divye Gala (https://github.com/divyegala)
  - Ray Douglass (https://github.com/raydouglass)

URL: #5702
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake CUDA/C++ improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants