Skip to content

Commit

Permalink
Update cupy dependency (#5401)
Browse files Browse the repository at this point in the history
Switch to requiring cupy 12

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

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Jake Awe (https://github.com/AyodeAwe)

URL: #5401
  • Loading branch information
vyasr authored May 4, 2023
1 parent 7534850 commit 80c0c4b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
test-before-amd64: "pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/[email protected]"
# On arm also need to install cupy from the specific webpage and CMake
# because treelite needs to be compiled (no wheels available for arm).
test-before-arm64: "pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/[email protected]"
test-before-arm64: "pip install 'cupy-cuda11x>=12.0.0' -f https://pip.cupy.dev/aarch64 && pip install cmake && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/[email protected]"
# parallelization is based on current test memory usage
test-unittest: "pytest ./python/cuml/tests -k 'not test_sparse_pca_inputs' -n 8 --ignore=python/cuml/tests/dask && pytest ./python/cuml/tests -k 'test_sparse_pca_inputs' && pytest ./python/cuml/tests/dask"
test-smoketest: "python ci/wheel_smoke_test_cuml.py"
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 @@ -12,7 +12,7 @@ dependencies:
- cuda-python>=11.7.1,<12.0
- cudatoolkit=11.8
- cudf==23.6.*
- cupy>=9.5.0,<12.0.0a0
- cupy>=12.0.0
- cxx-compiler
- cython>=0.29,<0.30
- dask-core==2023.3.2
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ requirements:
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
- cuda-python >=11.7.1,<12.0
- cudf ={{ minor_version }}
- cupy >=7.8.0,<12.0.0a0
- cupy >=12.0.0
- dask-cudf ={{ minor_version }}
- dask ==2023.3.2
- dask-core==2023.3.2
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,21 @@ dependencies:
- *treelite
- output_types: [conda, requirements]
packages:
- cupy>=9.5.0,<12.0.0a0
- cupy>=12.0.0
- output_types: conda
packages:
- dask-core==2023.3.2
- output_types: pyproject
packages:
- &cupy_pip cupy-cuda11x>=9.5.0,<12.0.0a0
- &cupy_pip cupy-cuda11x>=12.0.0
- *treelite_runtime
specific:
- output_types: requirements
matrices:
- matrix:
arch: x86_64
packages:
- cupy-cuda115>=9.5.0,<12.0.0a0 # TODO: This might change to cupy-cuda11x?
- cupy-cuda115>=12.0.0
- matrix:
arch: aarch64
packages:
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"cudf==23.6.*",
"cupy-cuda11x>=9.5.0,<12.0.0a0",
"cupy-cuda11x>=12.0.0",
"dask-cuda==23.6.*",
"dask-cudf==23.6.*",
"dask==2023.3.2",
Expand Down

0 comments on commit 80c0c4b

Please sign in to comment.