Skip to content

Commit

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

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

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - Ashwin Srinath (https://github.com/shwina)

URL: #13284
  • Loading branch information
vyasr authored May 4, 2023
1 parent 219c0c3 commit 0e01f87
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
build_type: pull-request
package-name: cudf
# Install cupy-cuda11x for arm from a special index url
test-before-arm64: "python -m pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64"
test-before-arm64: "python -m pip install 'cupy-cuda11x>=12.0.0' -f https://pip.cupy.dev/aarch64"
test-unittest: "python -m pytest -n 8 ./python/cudf/cudf/tests"
test-smoketest: "python ./ci/wheel_smoke_test_cudf.py"
wheel-build-dask-cudf:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: cudf
test-before-arm64: "python -m pip install 'cupy-cuda11x<12.0.0' -f https://pip.cupy.dev/aarch64"
test-before-arm64: "python -m pip install 'cupy-cuda11x>=12.0.0' -f https://pip.cupy.dev/aarch64"
test-unittest: "python -m pytest -n 8 ./python/cudf/cudf/tests"
wheel-tests-dask-cudf:
secrets: inherit
Expand Down
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 @@ -18,7 +18,7 @@ dependencies:
- cuda-python>=11.7.1,<12.0
- cuda-sanitizer-api=11.8.86
- cudatoolkit=11.8
- 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/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ requirements:
- python
- typing_extensions
- pandas >=1.3,<1.6.0dev0
- cupy >=9.5.0,<12.0.0a0
- cupy >=12.0.0
- numba >=0.56.4,<0.57
- numpy >=1.21
- {{ pin_compatible('pyarrow', max_pin='x.x.x') }}
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ dependencies:
- output_types: conda
packages:
- cubinlinker
- cupy>=9.5.0,<12.0.0a0
- cupy>=12.0.0
- pip
- pip:
- git+https://github.com/python-streamz/streamz.git@master
Expand All @@ -374,15 +374,15 @@ dependencies:
- output_types: pyproject
packages:
- cubinlinker
- &cupy_pip cupy-cuda11x>=9.5.0,<12.0.0a0
- &cupy_pip cupy-cuda11x>=12.0.0
- ptxcompiler
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
3 changes: 2 additions & 1 deletion python/cudf/cudf/tests/test_array_ufunc.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020-2022, NVIDIA CORPORATION.
# Copyright (c) 2020-2023, NVIDIA CORPORATION.

import operator
import warnings
Expand Down Expand Up @@ -358,6 +358,7 @@ def test_ufunc_dataframe(request, ufunc, has_nulls, indexed):
"fmax",
"fmin",
"fmod",
"heaviside",
"gcd",
"hypot",
"lcm",
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"cachetools",
"cubinlinker",
"cuda-python>=11.7.1,<12.0",
"cupy-cuda11x>=9.5.0,<12.0.0a0",
"cupy-cuda11x>=12.0.0",
"fsspec>=0.6.0",
"numba>=0.56.4,<0.57",
"numpy>=1.21",
Expand Down
2 changes: 1 addition & 1 deletion python/dask_cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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==2023.3.2",
"distributed==2023.3.2.1",
"fsspec>=0.6.0",
Expand Down

0 comments on commit 0e01f87

Please sign in to comment.