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.

Sign up for GitHub

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

Jump to bottom

split up CUDA-suffixed dependencies in dependencies.yaml #1627

Merged
merged 4 commits into from
Jul 24, 2024
Merged

split up CUDA-suffixed dependencies in dependencies.yaml #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1325cb7
split up CUDA-suffixed dependencies in dependencies.yaml
jameslamb Jul 23, 2024
bbe5d34
Merge branch 'branch-24.08' of github.com:rapidsai/rmm into suffix-split
jameslamb Jul 24, 2024
a401ee0
consolidate cuda_suffixed=false blocks
jameslamb Jul 24, 2024
674fd7b
reformat fallback matrix
jameslamb Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,15 @@ dependencies:
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- librmm-cu12==24.8.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- librmm-cu11==24.8.*,>=0.0.0a0
- matrix:
- matrix: null
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be nice to be consistent about when we do and don't use inline tables (some of the other PRs for this did), but nbd.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess in all those cases the package list only contained YAML anchors and not actual package specs.

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah exactly, that was the difference here.> inside a [] causes a YAML-parsing error, and when I surrounded this in single quotes that caused some of the pattern-matching in ci/release/update-version.sh to break. I thought just splitting it out to an indented map was simpler and safer than modifying update-version.sh to account for the possibility of quotes.

packages:
- librmm==24.8.*,>=0.0.0a0
checks:
Expand Down
1 change: 1 addition & 0 deletions python/librmm/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ librmm = "librmm"
[tool.rapids-build-backend]
build-backend = "scikit_build_core.build"
dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"ninja",
Expand Down
1 change: 1 addition & 0 deletions python/rmm/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ regex = "(?P<value>.*)"
[tool.rapids-build-backend]
build-backend = "scikit_build_core.build"
dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cuda-python>=11.7.1,<12.0a0",
Expand Down
Loading