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

Manually invoke install rules for components #505

Merged
merged 7 commits into from
Dec 14, 2023

Conversation

vyasr
Copy link
Contributor

@vyasr vyasr commented Dec 13, 2023

Description

CCCL's CMake is currently set up to exit early whenever it's added via add_subdirectory, which inadvertently prevents the install rules of its components (Thrust/CUB/libcudacxx) from being called. We don't currently have a way to tell CCCL not to do this because preventing that early exit leads to other undesirable outcomes (such as the CCCL::CCCL targets not being created correctly). Therefore, to work around this we must include the various install rule modules directly until this can be fixed upstream in CCCL.

In addition, we require a couple of patches to CCCL's CMake so that 1) the correct config files are installed, and 2) so that multiple invocations of find_package(CCCL) will work. These patches have already been fixed on the latest CCCL, see NVIDIA/cccl#298 and NVIDIA/cccl#1157.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.
  • The cmake-format.json is up to date with these changes.
  • I have added new files under rapids-cmake/
    • I have added include guards (include_guard(GLOBAL))
    • I have added the associated docs/ rst file and update the api.rst

@vyasr vyasr added bug Something isn't working non-breaking Introduces a non-breaking change labels Dec 13, 2023
@vyasr vyasr self-assigned this Dec 13, 2023
@vyasr vyasr marked this pull request as ready for review December 13, 2023 20:48
@vyasr vyasr requested a review from a team as a code owner December 13, 2023 20:48
Copy link
Contributor

@bdice bdice left a comment

Choose a reason for hiding this comment

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

Approving based on rapidsai/rmm#1404 passing CI.

@bdice
Copy link
Contributor

bdice commented Dec 14, 2023

@vyasr I'm going to merge this - we already discussed adding a test after the fact, which would be helpful to verify the future bug fixes in CCCL.

@bdice
Copy link
Contributor

bdice commented Dec 14, 2023

/merge

@rapids-bot rapids-bot bot merged commit c7de042 into rapidsai:branch-24.02 Dec 14, 2023
17 checks passed
@bdice bdice mentioned this pull request Dec 14, 2023
7 tasks
@vyasr vyasr deleted the fix/cccl_component_install branch December 14, 2023 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants