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.7.0-rc2. #17233

Merged
merged 11 commits into from
Dec 4, 2024
Merged

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Nov 1, 2024

This PR updates to CCCL 2.7.0-rc2. Do not merge until all of RAPIDS is ready to update.

Depends on rapidsai/rapids-cmake#710 and should be admin-merged immediately after that PR.

Part of rapidsai/build-planning#115.

miscco and others added 2 commits August 27, 2024 14:18
… due to code changes in thrust.

This adopts those patches to apply with CCCL 2.6.

Should only be merged when updating the CCCL version
@bdice bdice added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Nov 1, 2024
@github-actions github-actions bot added the CMake CMake build issue label Nov 1, 2024
@github-actions github-actions bot added the libcudf Affects libcudf (C++/CUDA) code. label Nov 13, 2024
Comment on lines 37 to 39
# TODO: Does this work correctly? Is there a better way to set this? Should
# CCCL be setting THRUST_DISPATCH_TYPE with "FORCE"?
set(THRUST_DISPATCH_TYPE "Force32bit" STRING "Thrust offset type dispatch")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@robertmaynard I'd appreciate your eyes on this. There was an upstream change in CCCL in NVIDIA/cccl#2310 that made it possible to force CCCL to only compile kernels with 32-bit offsets when THRUST_DISPATCH_TYPE is set to "Force32bit". However, I do not know how to forward this argument through rapids_cpm_cccl. If I were using rapids_cpm_find I think I could use OPTIONS. What's the best approach?

Secondly, I am wondering if CCCL should be using FORCE here: https://github.com/NVIDIA/cccl/blob/264b587d0621ee2c6bec27aa015078056cb5f021/thrust/CMakeLists.txt#L38
Does that override my ability to set the variable ahead of time, or not since it's marked as CACHE?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes the FORCE means that we can't overwrite as each time CMake is invoked the value will be reset to Force32bit.

As for passing this down from rapids_cpm_cccl you would do rapids_cpm_cccl(CPM_ARGS OPTIONS "THRUST_DISPATCH_TYPE Force32bit")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

NVIDIA/cccl#2844 exposed the dispatch mode in thrust_create_target but I don't see how we are calling that in rapids-cmake. For now I am going to try and move forward with 2.7.0-rc2 as-is rather than trying to backport this with a patch. We can adopt that dispatch option in a later CCCL update.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted ce7e991 for now.

@bdice bdice changed the base branch from branch-24.12 to branch-25.02 November 25, 2024 23:05
@bdice bdice added the 5 - DO NOT MERGE Hold off on merging; see PR for details label Nov 26, 2024
Copy link

copy-pr-bot bot commented Dec 3, 2024

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

rapids_config.cmake Outdated Show resolved Hide resolved
@bdice bdice marked this pull request as ready for review December 3, 2024 23:19
@bdice bdice requested a review from a team as a code owner December 3, 2024 23:19
@bdice
Copy link
Contributor Author

bdice commented Dec 3, 2024

/ok to test

@bdice
Copy link
Contributor Author

bdice commented Dec 3, 2024

This is ready for review by cuDF CMake codeowners.

@AyodeAwe AyodeAwe merged commit 38820ff into rapidsai:branch-25.02 Dec 4, 2024
21 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - DO NOT MERGE Hold off on merging; see PR for details CMake CMake build issue improvement Improvement / enhancement to an existing function libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants