Skip to content

Commit

Permalink
split up CUDA-suffixed dependencies in dependencies.yaml (rapidsai#247)
Browse files Browse the repository at this point in the history
Contributes to rapidsai/build-planning#31

In short, RAPIDS DLFW builds want to produce wheels with unsuffixed dependencies, e.g. `cudf` depending on `rmm`, not `rmm-cu12`.

This PR is part of a series across all of RAPIDS to try to support that type of build by setting up CUDA-suffixed and CUDA-unsuffixed dependency lists in `dependencies.yaml`.

For more details, see:
* rapidsai/build-planning#31 (comment)
* rapidsai/cudf#16183

This is targeting 24.08 because:

1. it should be very low-risk
2. getting these changes into 24.08 prevents the need to carry around patches for every library in DLFW builds using RAPIDS 24.08

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Paul Taylor (https://github.com/trxcllnt)

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

URL: rapidsai#247
  • Loading branch information
jameslamb authored and divyegala committed Jul 31, 2024
1 parent 9bceabc commit d802986
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
28 changes: 16 additions & 12 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ dependencies:
common:
- output_types: [conda]
packages:
- &rmm_conda rmm==24.10.*,>=0.0.0a0
- &pylibraft_conda pylibraft==24.10.*,>=0.0.0a0
- &rmm_unsuffixed rmm==24.8.*,>=0.0.0a0
- &pylibraft_unsuffixed pylibraft==24.8.*,>=0.0.0a0
- dlpack>=0.8,<1.0
- output_types: requirements
packages:
Expand All @@ -182,15 +182,19 @@ dependencies:
- &cuda_python cuda-python
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- &rmm_cu12 rmm-cu12==24.10.*,>=0.0.0a0
- &pylibraft_cu12 pylibraft-cu12==24.10.*,>=0.0.0a0
- matrix: {cuda: "11.*"}
- &rmm_cu12 rmm-cu12==24.8.*,>=0.0.0a0
- &pylibraft_cu12 pylibraft-cu12==24.8.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- &rmm_cu11 rmm-cu11==24.10.*,>=0.0.0a0
- &pylibraft_cu11 pylibraft-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*rmm_conda, *pylibraft_conda] }
- &rmm_cu11 rmm-cu11==24.8.*,>=0.0.0a0
- &pylibraft_cu11 pylibraft-cu11==24.8.*,>=0.0.0a0
- {matrix: null, packages: [*rmm_unsuffixed, *pylibraft_unsuffixed] }
checks:
common:
- output_types: [conda, requirements]
Expand Down Expand Up @@ -383,8 +387,8 @@ dependencies:
- &numpy numpy>=1.23,<2.0a0
- output_types: [conda]
packages:
- *rmm_conda
- *pylibraft_conda
- *rmm_unsuffixed
- *pylibraft_unsuffixed
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand Down Expand Up @@ -413,7 +417,7 @@ dependencies:
- matrix: {cuda: "11.*"}
packages:
- *pylibraft_cu11
- {matrix: null, packages: [*pylibraft_conda]}
- {matrix: null, packages: [*pylibraft_unsuffixed]}
test_python_common:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
1 change: 1 addition & 0 deletions python/cuvs/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ requires = [
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
build-backend = "scikit_build_core.build"
dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"

[tool.pytest.ini_options]
filterwarnings = [
Expand Down

0 comments on commit d802986

Please sign in to comment.