diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index e031bb0e1e..eb65106dbb 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -15,7 +15,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 - dask-cuda==26.8.*,>=0.0.0a0 @@ -31,7 +31,7 @@ dependencies: - libucxx==0.51.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - numpydoc - 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 524d462636..7efe10afd0 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -15,7 +15,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 - dask-cuda==26.8.*,>=0.0.0a0 @@ -31,7 +31,7 @@ dependencies: - libucxx==0.51.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - numpydoc - 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 eea90d2ff4..46fb9f72ac 100644 --- a/conda/environments/all_cuda-133_arch-aarch64.yaml +++ b/conda/environments/all_cuda-133_arch-aarch64.yaml @@ -15,7 +15,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 - dask-cuda==26.8.*,>=0.0.0a0 @@ -31,7 +31,7 @@ dependencies: - libucxx==0.51.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - numpydoc - 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 25e8abe3c6..8121267477 100644 --- a/conda/environments/all_cuda-133_arch-x86_64.yaml +++ b/conda/environments/all_cuda-133_arch-x86_64.yaml @@ -15,7 +15,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 - dask-cuda==26.8.*,>=0.0.0a0 @@ -31,7 +31,7 @@ dependencies: - libucxx==0.51.*,>=0.0.0a0 - nccl>=2.19 - ninja -- numpy>=1.23,<3.0 +- numpy>=2.0,<3.0 - numpydoc - pre-commit - pylibraft==26.8.*,>=0.0.0a0 diff --git a/conda/recipes/pylibraft/recipe.yaml b/conda/recipes/pylibraft/recipe.yaml index 28f095f5c1..3373fd706b 100644 --- a/conda/recipes/pylibraft/recipe.yaml +++ b/conda/recipes/pylibraft/recipe.yaml @@ -89,13 +89,13 @@ requirements: - libraft =${{ version }} - libraft-headers =${{ version }} - python - - numpy >=1.23,<3.0 + - numpy >=2.0,<3.0 - rmm =${{ minor_version }} - if: cuda_major == "12" then: cuda-python >=12.9.2,<13.0 else: cuda-python >=13.0.1,<14.0 run_constraints: - - cupy >=13.6.0,!=14.0.0,!=14.1.0 + - cupy >=14.0.1,!=14.1.0 ignore_run_exports: from_package: - ${{ compiler("c") }} diff --git a/conda/recipes/raft-dask/recipe.yaml b/conda/recipes/raft-dask/recipe.yaml index 282dec6331..dae5b73dec 100644 --- a/conda/recipes/raft-dask/recipe.yaml +++ b/conda/recipes/raft-dask/recipe.yaml @@ -99,7 +99,7 @@ requirements: then: cuda-python >=12.9.2,<13.0 else: cuda-python >=13.0.1,<14.0 run_constraints: - - cupy >=13.6.0,!=14.0.0,!=14.1.0 + - cupy >=14.0.1,!=14.1.0 ignore_run_exports: from_package: - ${{ compiler("c") }} diff --git a/dependencies.yaml b/dependencies.yaml index 43ac510c2f..0d7a739bb4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -367,21 +367,41 @@ 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_cu12 cupy-cuda12x>=14.0.1,!=14.1.0 + # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided + - matrix: + packages: + - &cupy_cu13 cupy-cuda13x>=14.0.1,!=14.1.0 + - output_types: pyproject matrices: + - matrix: + cuda: "12.*" + use_cuda_wheels: "false" + packages: + - *cupy_cu12 + - matrix: + cuda: "13.*" + use_cuda_wheels: "false" + packages: + - *cupy_cu13 - 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-cuda13x>=13.6.0,!=14.0.0,!=14.1.0 + - cupy-cuda13x[ctk]>=14.0.1,!=14.1.0 depends_on_rapids_logger: common: - output_types: [conda, requirements, pyproject] @@ -438,7 +458,7 @@ dependencies: common: - output_types: [conda, pyproject, requirements] packages: - - numpy>=1.23,<3.0 + - numpy>=2.0,<3.0 run_raft_dask: common: - output_types: [conda, pyproject, requirements] diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index 345162788d..7df18bc2c1 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -22,7 +22,7 @@ requires-python = ">=3.11" dependencies = [ "cuda-python>=13.0.1,<14.0", "libraft==26.8.*,>=0.0.0a0", - "numpy>=1.23,<3.0", + "numpy>=2.0,<3.0", "rmm==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",