Skip to content

Commit

Permalink
rearrange dependencies.yaml, fix development instructions (#1451)
Browse files Browse the repository at this point in the history
Follow-up to #1448. This proposes some `dependencies.yaml` changes that I noticed while working on adding `libcuspatial` wheels in #1450.

I've left inline comments with more details, but in short:

* not including any cuspatial projects in the conda environment files checked into this repo (which are intended to be used to set up a development environment)
* removing an unnecessary conda-only list of dependencies from pyproject.toml-specific config for `cuproj`
* introduction of `depends_on_libcuspatial` and `depends_on_cuproj` lists in `dependencies.yaml`, to reduce duplication

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

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

URL: #1451
  • Loading branch information
jameslamb authored Sep 9, 2024
1 parent 9385e49 commit 0bbd71d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 20 deletions.
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies:
- ipython
- ipywidgets
- libcudf==24.10.*,>=0.0.0a0
- libcuspatial-tests==24.10.*,>=0.0.0a0
- libcuspatial==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- myst-parser
- nbsphinx
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ dependencies:
- ipython
- ipywidgets
- libcudf==24.10.*,>=0.0.0a0
- libcuspatial-tests==24.10.*,>=0.0.0a0
- libcuspatial==24.10.*,>=0.0.0a0
- librmm==24.10.*,>=0.0.0a0
- myst-parser
- nbsphinx
Expand Down
47 changes: 31 additions & 16 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ files:
- depends_on_cuml
- depends_on_cupy
- depends_on_libcudf
- depends_on_libcuspatial
- depends_on_librmm
- rapids_build_skbuild
- run_python_cuspatial
- test_libcuspatial
- test_notebooks
- test_python_cuspatial
- test_python_cuproj
Expand All @@ -37,21 +35,21 @@ files:
output: none
includes:
- cuda_version
- depends_on_libcuspatial
- depends_on_cuproj
- depends_on_cuspatial
- py_version
- test_python_cuspatial
- test_python_cuproj
- test_cuspatial
test_notebooks:
output: none
includes:
- cuda_version
- depends_on_cuml
- depends_on_libcuspatial
- depends_on_cuproj
- depends_on_cuspatial
- test_notebooks
- notebooks
- py_version
- test_cuspatial
checks:
output: none
includes:
Expand All @@ -61,10 +59,10 @@ files:
output: none
includes:
- cuda_version
- depends_on_libcuspatial
- depends_on_cuspatial
- depends_on_cuproj
- docs
- py_version
- test_cuspatial
py_build_libcuspatial:
output: [pyproject]
pyproject_dir: python/libcuspatial
Expand Down Expand Up @@ -165,7 +163,6 @@ files:
includes:
- test_python_cuproj
- depends_on_cuspatial
- test_cuspatial

channels:
- rapidsai
Expand Down Expand Up @@ -551,6 +548,31 @@ dependencies:
- cuspatial-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*cuspatial_unsuffixed]}

depends_on_cuproj:
common:
- output_types: conda
packages:
- &cuproj_unsuffixed cuproj==24.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- cuproj-cu12==24.10.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cuproj-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*cuproj_unsuffixed]}

depends_on_cupy:
common:
- output_types: conda
Expand All @@ -573,13 +595,6 @@ dependencies:
- output_types: conda
packages:
- libcuspatial-tests==24.10.*,>=0.0.0a0
test_cuspatial:
common:
- output_types: conda
packages:
- cuspatial==24.10.*,>=0.0.0a0
- cuproj==24.10.*,>=0.0.0a0

depends_on_libcuspatial:
common:
- output_types: conda
Expand Down

0 comments on commit 0bbd71d

Please sign in to comment.