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. #14576

Merged
merged 12 commits into from
Dec 19, 2023
Merged

Update to CCCL 2.2.0. #14576

merged 12 commits into from
Dec 19, 2023

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Dec 5, 2023

Description

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

Depends on #14577.

Replaces #13222.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

Copy link

copy-pr-bot bot commented Dec 5, 2023

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@bdice bdice added the 5 - DO NOT MERGE Hold off on merging; see PR for details label Dec 5, 2023
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. CMake CMake build issue conda Java Affects Java cuDF API. labels Dec 5, 2023
@bdice bdice changed the title Build with CCCL 2.2.0. Update to CCCL 2.2.0. Dec 7, 2023
rapids-bot bot pushed a commit that referenced this pull request Dec 8, 2023
This PR makes cudf compatible with Thrust 2 by adding `cuda::proclaim_return_type`, but does not upgrade the version of Thrust/CCCL just yet. Currently we use libcudacxx 2.1.0, which makes `cuda::proclaim_return_type` available, but we still use Thrust 1.17.2 which doesn't require device lambdas to have proclaimed return types. This diff is separated out from #14576 and reduces the diff we must carry in #14576 -- which should contain only packaging changes / version updates for the CCCL 2 migration. This PR is **nonbreaking**, while #14576 will be **breaking**.

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

Approvers:
  - Nghia Truong (https://github.com/ttnghia)
  - David Wendt (https://github.com/davidwendt)

URL: #14577
@bdice bdice mentioned this pull request Dec 8, 2023
26 tasks
@github-actions github-actions bot added ci and removed conda Java Affects Java cuDF API. labels Dec 11, 2023
@bdice bdice self-assigned this Dec 11, 2023
karthikeyann pushed a commit to karthikeyann/cudf that referenced this pull request Dec 12, 2023
This PR makes cudf compatible with Thrust 2 by adding `cuda::proclaim_return_type`, but does not upgrade the version of Thrust/CCCL just yet. Currently we use libcudacxx 2.1.0, which makes `cuda::proclaim_return_type` available, but we still use Thrust 1.17.2 which doesn't require device lambdas to have proclaimed return types. This diff is separated out from rapidsai#14576 and reduces the diff we must carry in rapidsai#14576 -- which should contain only packaging changes / version updates for the CCCL 2 migration. This PR is **nonbreaking**, while rapidsai#14576 will be **breaking**.

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

Approvers:
  - Nghia Truong (https://github.com/ttnghia)
  - David Wendt (https://github.com/davidwendt)

URL: rapidsai#14577
@bdice bdice force-pushed the cccl-2.2.0 branch 3 times, most recently from d077b68 to 1481b0d Compare December 14, 2023 07:02
@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
Comment on lines 12 to 13
LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)

Copy link
Contributor Author

@bdice bdice Dec 18, 2023

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.

Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

Couple of questions regarding changes to patches.

Co-authored-by: Vyas Ramasubramani <[email protected]>
@bdice bdice removed the 5 - DO NOT MERGE Hold off on merging; see PR for details label Dec 19, 2023
@bdice bdice added improvement Improvement / enhancement to an existing function breaking Breaking change labels Dec 19, 2023
@bdice
Copy link
Contributor Author

bdice commented Dec 19, 2023

/merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking Breaking change CMake CMake build issue improvement Improvement / enhancement to an existing function libcudf Affects libcudf (C++/CUDA) code.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants