diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index bf34a36008..b326811fd0 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=12.9.2,<13.0 - cuda-version=12.9 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 - dlpack>=0.8,<1.0 @@ -34,7 +34,7 @@ dependencies: - nccl>=2.19 - ninja - nodejs>=22 -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - openblas - pre-commit - pylibraft==26.8.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 8c83164f58..47764174d2 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=12.9.2,<13.0 - cuda-version=12.9 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 - dlpack>=0.8,<1.0 @@ -33,7 +33,7 @@ dependencies: - nccl>=2.19 - ninja - nodejs>=22 -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - openblas - pre-commit - pylibraft==26.8.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-133_arch-aarch64.yaml b/conda/environments/all_cuda-133_arch-aarch64.yaml index 2f10891439..3fba6d460e 100644 --- a/conda/environments/all_cuda-133_arch-aarch64.yaml +++ b/conda/environments/all_cuda-133_arch-aarch64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=13.0.1,<14.0 - cuda-version=13.3 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 - dlpack>=0.8,<1.0 @@ -34,7 +34,7 @@ dependencies: - nccl>=2.19 - ninja - nodejs>=22 -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - openblas - pre-commit - pylibraft==26.8.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-133_arch-x86_64.yaml b/conda/environments/all_cuda-133_arch-x86_64.yaml index 0d98002ba2..433536e87f 100644 --- a/conda/environments/all_cuda-133_arch-x86_64.yaml +++ b/conda/environments/all_cuda-133_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=13.0.1,<14.0 - cuda-version=13.3 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cxx-compiler - cython>=3.2.2 - dlpack>=0.8,<1.0 @@ -33,7 +33,7 @@ dependencies: - nccl>=2.19 - ninja - nodejs>=22 -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - openblas - pre-commit - pylibraft==26.8.*,>=0.0.0a0 diff --git a/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml index a0e08fb5fe..10e3535a5e 100644 --- a/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=12.9.2,<13.0 - cuda-version=12.9 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 diff --git a/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml index d84bf87234..b92d3a3a09 100644 --- a/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=12.9.2,<13.0 - cuda-version=12.9 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 diff --git a/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml index c874298d7d..ed908d04ce 100644 --- a/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-133_arch-aarch64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=13.0.1,<14.0 - cuda-version=13.3 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 diff --git a/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml index 43b2dbce46..144ade2b64 100644 --- a/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-133_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cuda-profiler-api - cuda-python>=13.0.1,<14.0 - cuda-version=13.3 -- cupy>=13.6.0,!=14.0.0,!=14.1.0 +- cupy>=14.0.1,!=14.1.0 - cuvs==26.8.*,>=0.0.0a0 - cxx-compiler - cython>=3.2.2 diff --git a/conda/recipes/cuvs-bench-cpu/recipe.yaml b/conda/recipes/cuvs-bench-cpu/recipe.yaml index 4607c5f393..a90e865865 100644 --- a/conda/recipes/cuvs-bench-cpu/recipe.yaml +++ b/conda/recipes/cuvs-bench-cpu/recipe.yaml @@ -93,7 +93,7 @@ requirements: - glog ${{ glog_version }} - h5py ${{ h5py_version }} - matplotlib-base>=3.9 - - numpy >=1.23,<3.0 + - numpy >=2.0,<3.0 - opensearch-py>=2.4.0 - pandas - pyyaml diff --git a/conda/recipes/cuvs-bench/recipe.yaml b/conda/recipes/cuvs-bench/recipe.yaml index 04b2b6ee24..62c5213d56 100644 --- a/conda/recipes/cuvs-bench/recipe.yaml +++ b/conda/recipes/cuvs-bench/recipe.yaml @@ -42,7 +42,7 @@ requirements: run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - click - - cupy >=13.6.0,!=14.0.0,!=14.1.0 + - cupy >=14.0.1,!=14.1.0 - cuvs =${{ version }} - h5py ${{ h5py_version }} - libcuvs-bench-ann =${{ version }} diff --git a/conda/recipes/cuvs/recipe.yaml b/conda/recipes/cuvs/recipe.yaml index 37c4390d8f..5ae6ebf5a6 100644 --- a/conda/recipes/cuvs/recipe.yaml +++ b/conda/recipes/cuvs/recipe.yaml @@ -88,7 +88,7 @@ requirements: - libcuvs =${{ version }} - pylibraft =${{ minor_version }} - python - - numpy >=1.23,<3.0 + - numpy >=2.0,<3.0 - if: cuda_major == "12" then: cuda-python >=12.9.2,<13.0 else: cuda-python >=13.0.1,<14.0 diff --git a/dependencies.yaml b/dependencies.yaml index 744e4d9227..364c84a86f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -445,21 +445,31 @@ dependencies: common: - output_types: conda packages: - - cupy>=13.6.0,!=14.0.0,!=14.1.0 + - cupy>=14.0.1,!=14.1.0 # NOTE: This is intentionally not broken into groups by a 'cuda_suffixed' selector like # other packages with -cu{nn}x suffixes in this file. # All RAPIDS wheel builds (including in devcontainers) expect cupy to be suffixed. specific: - - output_types: [requirements, pyproject] + - output_types: requirements + matrices: + - matrix: + cuda: "12.*" + packages: + - cupy-cuda12x>=14.0.1,!=14.1.0 + # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided + - matrix: + packages: + - cupy-cuda13x>=14.0.1,!=14.1.0 + - output_types: pyproject matrices: - matrix: cuda: "12.*" packages: - - cupy-cuda12x>=13.6.0,!=14.0.0,!=14.1.0 + - cupy-cuda12x[ctk]>=14.0.1,!=14.1.0 # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided - matrix: packages: - - &cupy_cu13 cupy-cuda13x>=13.6.0,!=14.0.0,!=14.1.0 + - &cupy_cu13 cupy-cuda13x[ctk]>=14.0.1,!=14.1.0 test_libcuvs: common: - output_types: [conda] @@ -518,7 +528,7 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: - - &numpy numpy>=1.23,<3.0 + - &numpy numpy>=2.0,<3.0 test_python_common: common: - output_types: [conda, requirements, pyproject] diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml index edf323bf9e..0d4bb7c8bd 100644 --- a/python/cuvs/pyproject.toml +++ b/python/cuvs/pyproject.toml @@ -22,7 +22,7 @@ requires-python = ">=3.11" dependencies = [ "cuda-python>=13.0.1,<14.0", "libcuvs==26.8.*,>=0.0.0a0", - "numpy>=1.23,<3.0", + "numpy>=2.0,<3.0", "pylibraft==26.8.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ @@ -36,7 +36,7 @@ classifiers = [ [project.optional-dependencies] test = [ - "cupy-cuda13x>=13.6.0,!=14.0.0,!=14.1.0", + "cupy-cuda13x[ctk]>=14.0.1,!=14.1.0", "pytest", "pytest-cov", "scikit-learn>=1.5",