Skip to content

Commit

Permalink
Fix pip dependencies (#169)
Browse files Browse the repository at this point in the history
* Move conda-only dependencies out of `pyproject` and `requirements` sections in `dependencies.yaml`
* Add `rmm`, `cudf`, and `cupy` matrices

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

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #169
  • Loading branch information
trxcllnt authored Jan 19, 2024
1 parent efb0d0b commit 611fc11
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-version=11.8
- cudatoolkit
- cudf==24.2.*
- cupy
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-cudart-dev
- cuda-version=12.0
- cudf==24.2.*
- cupy
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask
Expand Down
58 changes: 55 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ files:
- run_python
- test_cpp
- test_python
- depends_on_cupy
- depends_on_cudf
test_cpp:
output: none
includes:
Expand All @@ -27,6 +29,8 @@ files:
- cuda_version
- py_version
- test_python
- depends_on_cupy
- depends_on_cudf
checks:
output: none
includes:
Expand Down Expand Up @@ -54,6 +58,8 @@ files:
key: test
includes:
- test_python
- depends_on_cupy
- depends_on_cudf
channels:
- rapidsai
- rapidsai-nightly
Expand All @@ -76,18 +82,30 @@ dependencies:
- spdlog>=1.12.0,<1.13
build_python:
common:
- output_types: [conda]
packages:
- &rmm_conda rmm==24.2.*
- output_types: [conda, requirements, pyproject]
packages:
- *cmake_ver
- cython>=3.0.0
- ninja
- rmm==24.2.*
- output_types: conda
packages:
- scikit-build-core>=0.7.0
- output_types: [requirements, pyproject]
packages:
- scikit-build-core[pyproject]>=0.7.0
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- rmm-cu12==24.2.*
- matrix: {cuda: "11.*"}
packages:
- rmm-cu11==24.2.*
- {matrix: null, packages: [*rmm_conda]}
checks:
common:
- output_types: [conda, requirements]
Expand Down Expand Up @@ -180,11 +198,45 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- cloudpickle
- cudf==24.2.*
- cupy
- dask
- distributed
- numba>=0.57.1
- pytest
- pytest-asyncio
- pytest-rerunfailures
depends_on_cupy:
common:
- output_types: conda
packages:
- cupy>=12.0.0
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- cupy-cuda12x>=12.0.0
- matrix: {cuda: "11.*"}
packages:
- cupy-cuda11x>=12.0.0
- {matrix: null, packages: [cupy-cuda11x>=12.0.0]}
depends_on_cudf:
common:
- output_types: conda
packages:
- &cudf_conda cudf==24.2.*
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
# This index is needed for rmm, cubinlinker, ptxcompiler.
- --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.*"}
packages:
- cudf-cu12==24.2.*
- matrix: {cuda: "11.*"}
packages:
- cudf-cu11==24.2.*
- {matrix: null, packages: [*cudf_conda]}
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ classifiers = [
test = [
"cloudpickle",
"cudf==24.2.*",
"cupy",
"cupy-cuda11x>=12.0.0",
"dask",
"distributed",
"numba>=0.57.1",
Expand Down

0 comments on commit 611fc11

Please sign in to comment.