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

Update to CCCL 2.2.0. #2049

Merged
merged 7 commits into from
Dec 19, 2023
Merged

Update to CCCL 2.2.0. #2049

merged 7 commits into from
Dec 19, 2023

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Dec 7, 2023

This PR updates RAFT to CCCL 2.2.0. Do not merge until all of RAPIDS is ready to update.

Depends on #2048.

Replaces #1464.

@bdice bdice self-assigned this Dec 7, 2023
@bdice bdice added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change 5 - DO NOT MERGE Hold off on merging; see PR for details and removed cpp CMake labels Dec 7, 2023
@bdice bdice mentioned this pull request Dec 8, 2023
26 tasks
@github-actions github-actions bot added the ci label Dec 11, 2023
@bdice bdice force-pushed the cccl-2.2.0 branch 2 times, most recently from 37849ac to a0bfac0 Compare December 14, 2023 07:03
@bdice bdice marked this pull request as ready for review December 18, 2023 15:28
@bdice bdice requested review from a team as code owners December 18, 2023 15:28
ci/build_cpp.sh Outdated
@@ -9,10 +9,14 @@ export CMAKE_GENERATOR=Ninja

rapids-print-env

LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert changes to CI scripts that use upstream artifacts before merging.

Comment on lines 14 to 15
set(rapids-cmake-repo bdice/rapids-cmake)
set(rapids-cmake-branch cuco-cccl-2.2.0)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert this before merging. Depends on NVIDIA/cuCollections#404 merging, and rapids-cmake being updated to use that commit in versions.json.

cpp/CMakeLists.txt Show resolved Hide resolved
@github-actions github-actions bot removed the ci label Dec 19, 2023
@raydouglass raydouglass removed the request for review from a team December 19, 2023 16:21
@bdice bdice added breaking Breaking change and removed 5 - DO NOT MERGE Hold off on merging; see PR for details non-breaking Non-breaking change labels Dec 19, 2023
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
@bdice
Copy link
Contributor Author

bdice commented Dec 19, 2023

/merge

@rapids-bot rapids-bot bot merged commit 2962169 into rapidsai:branch-24.02 Dec 19, 2023
61 checks passed
@dantegd
Copy link
Member

dantegd commented Dec 20, 2023

/merge

ChristinaZ pushed a commit to ChristinaZ/raft that referenced this pull request Jan 17, 2024
This PR updates RAFT to CCCL 2.2.0. Do not merge until all of RAPIDS is ready to update.

Depends on rapidsai#2048.

Replaces rapidsai#1464.

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Robert Maynard (https://github.com/robertmaynard)

URL: rapidsai#2049
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking Breaking change CMake cpp improvement Improvement / enhancement to an existing function
Projects
Development

Successfully merging this pull request may close these issues.

4 participants