diff --git a/ci/test_python.sh b/ci/test_python.sh index 1e5b80d434..1fe29dad8b 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -20,7 +20,7 @@ rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ --file-key test_python \ - --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \ + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES}" \ --prepend-channel "${CPP_CHANNEL}" \ --prepend-channel "${PYTHON_CHANNEL}" \ | tee env.yaml diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index eb65106dbb..f57f075a6c 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -10,10 +10,10 @@ dependencies: - clang-tools=20.1.8 - clang==20.1.8 - cmake>=4.0 +- cuda-bindings>=12.9.2,<13.0 - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=12.9.2,<13.0 - cuda-version=12.9 - cupy>=14.0.1,!=14.1.0 - cxx-compiler diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index 7efe10afd0..f7a7162611 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -10,10 +10,10 @@ dependencies: - clang-tools=20.1.8 - clang==20.1.8 - cmake>=4.0 +- cuda-bindings>=12.9.2,<13.0 - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=12.9.2,<13.0 - cuda-version=12.9 - cupy>=14.0.1,!=14.1.0 - cxx-compiler diff --git a/conda/environments/all_cuda-133_arch-aarch64.yaml b/conda/environments/all_cuda-133_arch-aarch64.yaml index 46fb9f72ac..7755411e16 100644 --- a/conda/environments/all_cuda-133_arch-aarch64.yaml +++ b/conda/environments/all_cuda-133_arch-aarch64.yaml @@ -10,10 +10,10 @@ dependencies: - clang-tools=20.1.8 - clang==20.1.8 - cmake>=4.0 +- cuda-bindings>=13.0.1,<14.0 - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=13.0.1,<14.0 - cuda-version=13.3 - cupy>=14.0.1,!=14.1.0 - cxx-compiler diff --git a/conda/environments/all_cuda-133_arch-x86_64.yaml b/conda/environments/all_cuda-133_arch-x86_64.yaml index 8121267477..54553027f9 100644 --- a/conda/environments/all_cuda-133_arch-x86_64.yaml +++ b/conda/environments/all_cuda-133_arch-x86_64.yaml @@ -10,10 +10,10 @@ dependencies: - clang-tools=20.1.8 - clang==20.1.8 - cmake>=4.0 +- cuda-bindings>=13.0.1,<14.0 - cuda-nvcc - cuda-nvtx-dev - cuda-profiler-api -- cuda-python>=13.0.1,<14.0 - cuda-version=13.3 - cupy>=14.0.1,!=14.1.0 - cxx-compiler diff --git a/conda/recipes/pylibraft/recipe.yaml b/conda/recipes/pylibraft/recipe.yaml index a86100b64c..b12f35b29b 100644 --- a/conda/recipes/pylibraft/recipe.yaml +++ b/conda/recipes/pylibraft/recipe.yaml @@ -82,8 +82,8 @@ requirements: - rmm =${{ minor_version }} - scikit-build-core>=0.11.0 - if: cuda_major == "12" - then: cuda-python >=12.9.2,<13.0 - else: cuda-python >=13.0.1,<14.0 + then: cuda-bindings >=12.9.2,<13.0 + else: cuda-bindings >=13.0.1,<14.0 run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - libraft =${{ version }} @@ -92,8 +92,8 @@ requirements: - 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 + then: cuda-bindings >=12.9.2,<13.0 + else: cuda-bindings >=13.0.1,<14.0 run_constraints: - cupy >=14.0.1,!=14.1.0 ignore_run_exports: diff --git a/conda/recipes/raft-dask/recipe.yaml b/conda/recipes/raft-dask/recipe.yaml index 55178d745d..0466e2e5e9 100644 --- a/conda/recipes/raft-dask/recipe.yaml +++ b/conda/recipes/raft-dask/recipe.yaml @@ -84,8 +84,8 @@ requirements: - scikit-build-core>=0.11.0 - ucxx ${{ ucxx_version }} - if: cuda_major == "12" - then: cuda-python >=12.9.2,<13.0 - else: cuda-python >=13.0.1,<14.0 + then: cuda-bindings >=12.9.2,<13.0 + else: cuda-bindings >=13.0.1,<14.0 run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - dask-cuda =${{ minor_version }} @@ -96,8 +96,8 @@ requirements: - rapids-dask-dependency =${{ minor_version }} - rmm =${{ minor_version }} - if: cuda_major == "12" - then: cuda-python >=12.9.2,<13.0 - else: cuda-python >=13.0.1,<14.0 + then: cuda-bindings >=12.9.2,<13.0 + else: cuda-bindings >=13.0.1,<14.0 run_constraints: - cupy >=14.0.1,!=14.1.0 ignore_run_exports: diff --git a/dependencies.yaml b/dependencies.yaml index 81322728ce..3e7ac6e987 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -497,6 +497,21 @@ dependencies: packages: - pytest - pytest-cov + specific: + - output_types: [conda, requirements, pyproject] + matrices: + - matrix: + dependencies: "oldest" + cuda: "12.*" + packages: + - cuda-bindings==12.9.2 + - matrix: + dependencies: "oldest" + cuda: "13.*" + packages: + - cuda-bindings==13.0.1 + - matrix: + packages: test_pylibraft: common: - output_types: [conda, requirements, pyproject] @@ -510,11 +525,11 @@ dependencies: - matrix: cuda: "12.*" packages: - - cuda-python>=12.9.2,<13.0 + - cuda-bindings>=12.9.2,<13.0 # fallback to CUDA 13 versions if 'cuda' is '13.*' or not provided - matrix: packages: - - cuda-python>=13.0.1,<14.0 + - cuda-bindings>=13.0.1,<14.0 depends_on_distributed_ucxx: common: - output_types: conda diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index ba6b895753..675221e4d5 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -20,7 +20,7 @@ authors = [ license = "Apache-2.0" requires-python = ">=3.11" dependencies = [ - "cuda-python>=13.0.1,<14.0", + "cuda-bindings>=13.0.1,<14.0", "libraft==26.8.*,>=0.0.0a0", "numpy>=2.0,<3.0", "rmm==26.8.*,>=0.0.0a0", @@ -85,7 +85,7 @@ regex = "(?P.*)" build-backend = "scikit_build_core.build" requires = [ "cmake>=4.0", - "cuda-python>=13.0.1,<14.0", + "cuda-bindings>=13.0.1,<14.0", "cython>=3.2.2", "libraft==26.8.*,>=0.0.0a0", "librmm==26.8.*,>=0.0.0a0",