From b22dd99d9ed329b8ea95442a50daff5085d2b82c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 11:23:40 -0600 Subject: [PATCH] refactor CUDA versions in dependencies.yaml (#4084) Contributes to https://github.com/rapidsai/build-planning/issues/7. Proposes splitting the `cuda-version` dependency in `dependencies.yaml` out to its own thing, separate from the bits of the CUDA Toolkit this project needs. ### Benefits of this change * prevents accidental inclusion of multiple `cuda-version` version in environments * reduces update effort (via enabling more use of globs like `"12.*"`) * improves the chance that errors like "`conda` recipe is missing a dependency" are caught in CI Authors: - James Lamb (https://github.com/jameslamb) - Bradley Dice (https://github.com/bdice) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cugraph/pull/4084 --- .pre-commit-config.yaml | 2 +- dependencies.yaml | 47 +++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bab39557c99..188ea1a266a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,7 +52,7 @@ repos: pass_filenames: false additional_dependencies: [gitpython] - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.5.1 + rev: v1.8.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/dependencies.yaml b/dependencies.yaml index 3eed525bfe4..18ddb6c51dd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -9,7 +9,8 @@ files: - checks - common_build - cpp_build - - cudatoolkit + - cuda + - cuda_version - docs - python_build_wheel - python_build_cythonize @@ -37,19 +38,19 @@ files: docs: output: none includes: - - cudatoolkit + - cuda_version - docs - py_version - depends_on_pylibcugraphops test_cpp: output: none includes: - - cudatoolkit + - cuda_version - test_cpp test_notebooks: output: none includes: - - cudatoolkit + - cuda_version - py_version - test_notebook - test_python_common @@ -57,7 +58,7 @@ files: test_python: output: none includes: - - cudatoolkit + - cuda_version - depends_on_cudf - py_version - test_python_common @@ -273,33 +274,40 @@ dependencies: - output_types: [conda, requirements] packages: - pre-commit - cudatoolkit: + cuda_version: specific: - - output_types: [conda] + - output_types: conda matrices: - matrix: - cuda: "12.0" + cuda: "11.2" packages: - - cuda-version=12.0 + - cuda-version=11.2 - matrix: - cuda: "11.8" + cuda: "11.4" packages: - - cuda-version=11.8 - - cudatoolkit + - cuda-version=11.4 - matrix: cuda: "11.5" packages: - cuda-version=11.5 - - cudatoolkit - matrix: - cuda: "11.4" + cuda: "11.8" packages: - - cuda-version=11.4 - - cudatoolkit + - cuda-version=11.8 - matrix: - cuda: "11.2" + cuda: "12.0" + packages: + - cuda-version=12.0 + cuda: + specific: + - output_types: [conda] + matrices: + - matrix: + cuda: "12.*" + packages: + - matrix: + cuda: "11.*" packages: - - cuda-version=11.2 - cudatoolkit common_build: common: @@ -344,9 +352,8 @@ dependencies: packages: - nvcc_linux-aarch64=11.8 - matrix: - cuda: "12.0" + cuda: "12.*" packages: - - cuda-version=12.0 - cuda-nvcc docs: common: