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

rapids_cpm cccl packages cmake files are now relocated to not clash with upstream #393

Conversation

robertmaynard
Copy link
Contributor

Description

This way rapids-cmake versions of these projects don't clash with the upstream versions.

Fixes #367

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.

Fixes rapidsai#367

This way rapids-cmake versions of these projects don't clash
with the upstream versions.
@robertmaynard robertmaynard added breaking Introduces a breaking change bug Something isn't working 3 - Ready for Review Ready for review by team labels Mar 27, 2023
@robertmaynard robertmaynard requested a review from a team as a code owner March 27, 2023 16:41
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.

Looks good to me. Should we add tests?

rapids-cmake/cpm/libcudacxx.cmake Outdated Show resolved Hide resolved
@robertmaynard robertmaynard force-pushed the bug/install_cccl_cmake_modules_in_namespace branch 2 times, most recently from ffc1f7c to cfd5f72 Compare April 10, 2023 20:16
@robertmaynard robertmaynard force-pushed the bug/install_cccl_cmake_modules_in_namespace branch from cfd5f72 to 7455f36 Compare April 11, 2023 13:46
@vyasr
Copy link
Contributor

vyasr commented Apr 11, 2023

I do plan to review this PR, just haven't gotten around to it quite yet.

@bdice bdice mentioned this pull request Apr 14, 2023
7 tasks
@bdice
Copy link
Contributor

bdice commented Apr 14, 2023

@vyasr Would you be able to review this PR? I'd like to have this merged and then update the CCCL versions in #399 for the 23.06 release.

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.

I would recommend changing the title to more clearly indicate that what this PR is doing is relocating where rapids-cmake installs CCCL packages. Vendor sounds like the files are embedded in some way, and tbh I was expecting this PR to be about creating a rapids-cmake conda package containing the rapids-specific CCCL dependencies before I read through it.

rapids-cmake/cpm/libcudacxx.cmake Show resolved Hide resolved
rapids-cmake/cpm/libcudacxx.cmake Show resolved Hide resolved
rapids-cmake/cpm/libcudacxx.cmake Outdated Show resolved Hide resolved
rapids-cmake/cpm/thrust.cmake Show resolved Hide resolved
@robertmaynard robertmaynard changed the title rapids_cpm cccl packages cmake files are now vendored rapids_cpm cccl packages cmake files are now relocated to not clash with upstream Apr 27, 2023
@vyasr
Copy link
Contributor

vyasr commented May 11, 2023

@robertmaynard can we merge this now? Then we can also finalize rapidsai/cudf#13235

@robertmaynard
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 2ca5443 into rapidsai:branch-23.06 May 12, 2023
@robertmaynard robertmaynard deleted the bug/install_cccl_cmake_modules_in_namespace branch May 12, 2023 12:50
rapids-bot bot pushed a commit to rapidsai/cudf that referenced this pull request May 30, 2023
Depends on: rapidsai/rapids-cmake#393

Once the above PR is merged, this updated logic ensures that cudf places the custom versions of cccl packages in correct places, and can find them once installed.

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

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #13235
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 - Ready for Review Ready for review by team breaking Introduces a breaking change bug Something isn't working
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[BUG] Thrust (and cub) cmake files aren't installed in a rapids specific location
3 participants