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

Ensure cccl packages don't clash with upstream version #13235

Merged

Conversation

robertmaynard
Copy link
Contributor

Description

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.

Checklist

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

@robertmaynard robertmaynard added feature request New feature or request 3 - Ready for Review Ready for review by team 0 - Blocked Cannot progress due to external reasons labels Apr 27, 2023
@robertmaynard robertmaynard requested a review from a team as a code owner April 27, 2023 13:52
@github-actions github-actions bot added CMake CMake build issue libcudf Affects libcudf (C++/CUDA) code. labels Apr 27, 2023
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. @robertmaynard We should chat today about a merge plan for some of the rapids-cmake work in flight. I think I know what order current work should merge but would be good to confirm with you.

@robertmaynard robertmaynard requested a review from vyasr May 22, 2023 20:14
cpp/cmake/thirdparty/get_libcudacxx.cmake Outdated Show resolved Hide resolved
rapids_export_find_package_root(
INSTALL
libcudacxx
[=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/libcudacxx]=]
Copy link
Contributor

Choose a reason for hiding this comment

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

If we ever need to store other patched libraries like this it would be nice to store this path in some central location, but probably not worth it right now.

@robertmaynard robertmaynard changed the base branch from branch-23.06 to branch-23.08 May 24, 2023 18:02
@bdice
Copy link
Contributor

bdice commented May 30, 2023

@robertmaynard Is this ready to merge?

@robertmaynard
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 87a8ede into rapidsai:branch-23.08 May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 - Blocked Cannot progress due to external reasons 3 - Ready for Review Ready for review by team CMake CMake build issue feature request New feature or request libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants