diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 98f717bf40c..3e4c5e2bcae 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 08e7925ebbf..ff1563d3c6e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a67b9fbce4e..2c0b5448e80 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index c8f41a55694..327f7f90a82 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -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') }} diff --git a/dependencies.yaml b/dependencies.yaml index cf23bf93904..2c8b9430415 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -374,7 +374,7 @@ 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 @@ -382,7 +382,7 @@ dependencies: - 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: diff --git a/python/cudf/cudf/tests/test_array_ufunc.py b/python/cudf/cudf/tests/test_array_ufunc.py index ac77c6b89f3..81950bb8bde 100644 --- a/python/cudf/cudf/tests/test_array_ufunc.py +++ b/python/cudf/cudf/tests/test_array_ufunc.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. import operator import warnings @@ -358,6 +358,7 @@ def test_ufunc_dataframe(request, ufunc, has_nulls, indexed): "fmax", "fmin", "fmod", + "heaviside", "gcd", "hypot", "lcm", diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index cccf9e74f2f..2a686fe3016 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -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", diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index 34a10cc2c71..c6c43661e9e 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -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",