-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Centralize CPM dependency source metadata #24148
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
Closed
msarahan
wants to merge
6
commits into
NVIDIA:release/26.10
from
msarahan:codex/cpm-dependency-metadata
Closed
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
928c90f
Centralize CPM dependency source metadata
msarahan ab5b6da
Centralize CPM dependency source metadata
msarahan 1308d75
Merge remote CPM metadata branch
msarahan 5fec5e7
Preserve cuDF dependency version resolution
msarahan 35a448d
Fix CPM metadata configuration
msarahan 1e4aed4
Harden CPM source metadata validation
msarahan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| { | ||
| "packages": { | ||
| "Arrow": { | ||
| "version": "${CUDF_VERSION_Arrow}", | ||
| "git_url": "https://github.com/apache/arrow.git", | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| "git_tag": "apache-arrow-${version}", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we pin all of these by hash?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. I added a field, "git_tag_alias" for the human-readable info that used to be there. |
||
| "git_shallow": true, | ||
| "source_subdir": "cpp" | ||
| }, | ||
| "cudf": { | ||
| "version": "${CUDF_VERSION_MAJOR}.${CUDF_VERSION_MINOR}.00", | ||
| "git_url": "https://github.com/NVIDIA/cudf.git", | ||
| "git_tag": "${RAPIDS_BRANCH}", | ||
| "git_shallow": true, | ||
| "source_subdir": "cpp" | ||
| }, | ||
| "dlpack": { | ||
| "version": "0.8", | ||
| "git_url": "https://github.com/dmlc/dlpack.git", | ||
| "git_tag": "v${version}", | ||
| "git_shallow": true | ||
| }, | ||
| "flatbuffers": { | ||
| "version": "24.3.25", | ||
| "git_url": "https://github.com/google/flatbuffers.git", | ||
| "git_tag": "v${version}", | ||
| "git_shallow": true | ||
| }, | ||
| "kvikio": { | ||
| "version": "${rapids-cmake-version}", | ||
| "git_url": "https://github.com/rapidsai/kvikio.git", | ||
|
msarahan marked this conversation as resolved.
|
||
| "git_tag": "${RAPIDS_BRANCH}", | ||
| "git_shallow": true, | ||
| "source_subdir": "cpp" | ||
| }, | ||
| "nanoarrow": { | ||
| "version": "0.8.0", | ||
| "git_url": "https://github.com/apache/arrow-nanoarrow.git", | ||
| "git_tag": "apache-arrow-nanoarrow-${version}", | ||
| "git_shallow": true | ||
| }, | ||
| "roaring": { | ||
| "version": "4.4.2", | ||
| "git_url": "https://github.com/RoaringBitmap/CRoaring.git", | ||
| "git_tag": "v${version}", | ||
| "git_shallow": true | ||
| }, | ||
| "zstd": { | ||
| "version": "1.5.7", | ||
| "git_url": "https://github.com/facebook/zstd.git", | ||
| "git_tag": "v${version}", | ||
| "git_shallow": false, | ||
| "source_subdir": "build/cmake" | ||
| }, | ||
| "xxhash": { | ||
| "version": "0.8.3", | ||
| "git_url": "https://github.com/Cyan4973/xxHash.git", | ||
| "git_tag": "e626a72bc2321cd320e953a0ccf1584cad60f363", | ||
| "git_shallow": true | ||
| }, | ||
| "rtcx": { | ||
| "version": "0.1", | ||
| "git_url": "https://github.com/rapidsai/librtcx.git", | ||
| "git_tag": "a9f63f8cdd4b0b41a2d88a9f705576a61b4222ec", | ||
| "git_shallow": false | ||
| } | ||
| } | ||
| } | ||
19 changes: 19 additions & 0 deletions
19
cpp/cmake/thirdparty/rapids_cpm_project_package_info.cmake
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # ============================================================================= | ||
| # cmake-format: off | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # cmake-format: on | ||
| # ============================================================================= | ||
|
|
||
| include_guard(GLOBAL) | ||
|
|
||
| set(_CUDF_CPM_PROJECT_VERSIONS_FILE "${CMAKE_CURRENT_LIST_DIR}/rapids-cpm-versions.json") | ||
|
|
||
| # Resolve project-owned defaults through rapids-cmake so a parent build can | ||
| # replace a package source with RAPIDS_CMAKE_CPM_OVERRIDE_VERSION_FILE. | ||
| macro(cudf_cpm_project_package_info) | ||
| include("${rapids-cmake-dir}/cpm/package_override.cmake") | ||
| rapids_cpm_package_override("${_CUDF_CPM_PROJECT_VERSIONS_FILE}") | ||
| include("${rapids-cmake-dir}/cpm/detail/package_info.cmake") | ||
| rapids_cpm_package_info(${ARGV}) | ||
| endmacro() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/usr/bin/env bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| # Project dependency sources belong in rapids-cpm-versions.json. That allows | ||
| # RAPIDS_CMAKE_CPM_OVERRIDE_VERSION_FILE to replace them without source patches. | ||
| set -euo pipefail | ||
|
|
||
| for cmake_file in "$@"; do | ||
| if grep -nE '^[[:space:]]*GIT_(REPOSITORY|TAG|SHALLOW)[[:space:]]' "${cmake_file}"; then | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| echo "ERROR: ${cmake_file} declares a direct Git source." >&2 | ||
| echo "Move its source metadata to the project rapids-cpm-versions.json catalog and use cudf_cpm_project_package_info()." >&2 | ||
| exit 1 | ||
| fi | ||
| done | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.