From 2eaf4da348a5d83487f1dbc7da070aea1585ab30 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 6 Jul 2026 11:52:52 -0500 Subject: [PATCH] remove 'cuda-python' dependency, test against oldest numba and numpy --- ci/test_python.sh | 2 +- .../all_cuda-129_arch-aarch64.yaml | 1 - .../all_cuda-129_arch-x86_64.yaml | 1 - .../all_cuda-133_arch-aarch64.yaml | 1 - .../all_cuda-133_arch-x86_64.yaml | 1 - conda/recipes/cuopt/recipe.yaml | 6 ------ dependencies.yaml | 21 +++++++++---------- python/cuopt/pyproject.toml | 1 - 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index e346ea5fdb..06ce5a5616 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -20,7 +20,7 @@ rapids-dependency-file-generator \ --file-key test_python \ --prepend-channel "${CPP_CHANNEL}" \ --prepend-channel "${PYTHON_CHANNEL}" \ - --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index ac52f72af1..6975b7a552 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -16,7 +16,6 @@ dependencies: - cpp-argparse - cuda-nvcc - cuda-nvtx-dev -- cuda-python>=12.9.2,<13.0 - cuda-sanitizer-api - cuda-version=12.9 - cudf==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 40758e9d6d..2785e5e66c 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -16,7 +16,6 @@ dependencies: - cpp-argparse - cuda-nvcc - cuda-nvtx-dev -- cuda-python>=12.9.2,<13.0 - cuda-sanitizer-api - cuda-version=12.9 - cudf==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 2bd3831315..25ac9c4048 100644 --- a/conda/environments/all_cuda-133_arch-aarch64.yaml +++ b/conda/environments/all_cuda-133_arch-aarch64.yaml @@ -16,7 +16,6 @@ dependencies: - cpp-argparse - cuda-nvcc - cuda-nvtx-dev -- cuda-python>=13.0.1,<14.0 - cuda-sanitizer-api - cuda-version=13.3 - cudf==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 d3e3ec88ed..ad24412add 100644 --- a/conda/environments/all_cuda-133_arch-x86_64.yaml +++ b/conda/environments/all_cuda-133_arch-x86_64.yaml @@ -16,7 +16,6 @@ dependencies: - cpp-argparse - cuda-nvcc - cuda-nvtx-dev -- cuda-python>=13.0.1,<14.0 - cuda-sanitizer-api - cuda-version=13.3 - cudf==26.8.*,>=0.0.0a0 diff --git a/conda/recipes/cuopt/recipe.yaml b/conda/recipes/cuopt/recipe.yaml index 8662d54810..fa134c6e5f 100644 --- a/conda/recipes/cuopt/recipe.yaml +++ b/conda/recipes/cuopt/recipe.yaml @@ -79,9 +79,6 @@ requirements: - rapids-build-backend >=0.4.0,<0.5.0 - 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 run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - cudf =${{ minor_version }} @@ -100,9 +97,6 @@ requirements: - cuda-nvcc-impl # TODO: Add nvjitlink here # xref: https://github.com/rapidsai/cudf/issues/12822 - - if: cuda_major == "12" - then: cuda-python >=12.9.2,<13.0 - else: cuda-python >=13.0.1,<14.0 ignore_run_exports: by_name: - cuda-version diff --git a/dependencies.yaml b/dependencies.yaml index f5ccef91bc..dd2dea32be 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -310,6 +310,16 @@ dependencies: - pytest-cov - pytest-rerunfailures - pytest-xdist + specific: + - output_types: [conda, requirements, pyproject] + matrices: + - matrix: + dependencies: "oldest" + packages: + - numba-cuda==0.22.* + - numpy==2.0.* + - matrix: + packages: test_python_cuopt: common: - output_types: [conda] @@ -327,17 +337,6 @@ dependencies: - &pandas pandas>=2.0 - *pyyaml - scipy>=1.14.1 - specific: - - output_types: [conda, requirements, pyproject] - matrices: - - matrix: - cuda: "12.*" - packages: - - cuda-python>=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 test_python_cuopt_server: common: diff --git a/python/cuopt/pyproject.toml b/python/cuopt/pyproject.toml index 0353224663..e7474f51cc 100644 --- a/python/cuopt/pyproject.toml +++ b/python/cuopt/pyproject.toml @@ -19,7 +19,6 @@ authors = [ license = "Apache-2.0" requires-python = ">=3.11" dependencies = [ - "cuda-python>=13.0.1,<14.0", "cudf==26.8.*,>=0.0.0a0", "cupy-cuda13x[ctk]>=14.0.1,!=14.1.0", "libcuopt==26.8.*,>=0.0.0a0",