Skip to content

Commit

Permalink
split up CUDA-suffixed dependencies in dependencies.yaml (#609)
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

## Notes for Reviewers

### Why target 24.08?

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)

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

URL: #609
  • Loading branch information
jameslamb committed Jul 25, 2024
1 parent 09182b5 commit 1fa738d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 9 deletions.
42 changes: 33 additions & 9 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,33 +195,57 @@ dependencies:
- panel>=1.0
- output_types: conda
packages:
- &cudf_conda cudf==24.8.*,>=0.0.0a0
- &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0
- cupy>=12.0.0
- &cuspatial_conda cuspatial==24.8.*,>=0.0.0a0
- &dask_cudf_conda dask-cudf==24.8.*,>=0.0.0a0
- &cuspatial_unsuffixed cuspatial==24.8.*,>=0.0.0a0
- &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0
- nodejs>=18
- libwebp-base
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- cudf-cu12==24.8.*,>=0.0.0a0
- cupy-cuda12x>=12.0.0
- &cupy_cu12 cupy-cuda12x>=12.0.0
- cuspatial-cu12==24.8.*,>=0.0.0a0
- dask-cudf-cu12==24.8.*,>=0.0.0a0
- matrix: {cuda: "11.*"}
- matrix:
cuda: "12.*"
cuda_suffixed: "false"
packages:
- *cudf_unsuffixed
# NOTE: cupy still has a "-cuda12x" suffix here, because it's suffixed
# in DLFW builds
- *cupy_cu12
- *cuspatial_unsuffixed
- *dask_cudf_unsuffixed
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cudf-cu11==24.8.*,>=0.0.0a0
- &cupy_cu11 cupy-cuda11x>=12.0.0
- cuspatial-cu11==24.8.*,>=0.0.0a0
- dask-cudf-cu11==24.8.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "false"
packages:
- *cudf_unsuffixed
# NOTE: cupy still has a "-cuda11x" suffix here, because it's suffixed
# in DLFW builds
- *cupy_cu11
- *cuspatial_unsuffixed
- *dask_cudf_unsuffixed
- matrix:
packages:
- *cudf_conda
- *cudf_unsuffixed
- *cupy_cu11
- *cuspatial_conda
- *dask_cudf_conda
- *cuspatial_unsuffixed
- *dask_cudf_unsuffixed
test_python:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
1 change: 1 addition & 0 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Documentation = "https://docs.rapids.ai/api/cuxfilter/stable/"
[tool.rapids-build-backend]
build-backend = "setuptools.build_meta"
dependencies-file = "../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"wheel",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down

0 comments on commit 1fa738d

Please sign in to comment.