From a3c0f13551d9d7545381774b87a1a80dbd5d27c1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 10:59:33 -0600 Subject: [PATCH] refactor CUDA versions in dependencies.yaml (#671) 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) Approvers: - https://github.com/jakirkham - Jake Awe (https://github.com/AyodeAwe) URL: https://github.com/rapidsai/cucim/pull/671 --- dependencies.yaml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1f1a3dfd3..d95d62cd2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -7,7 +7,8 @@ files: arch: [x86_64] includes: - build - - cudatoolkit + - cuda + - cuda_version - checks - docs - py_version @@ -16,7 +17,7 @@ files: test_python: output: none includes: - - cudatoolkit + - cuda_version - py_version - test_python checks: @@ -27,7 +28,7 @@ files: docs: output: none includes: - - cudatoolkit + - cuda_version - docs - py_version py_build: @@ -140,7 +141,7 @@ dependencies: - output_types: [conda, requirements] packages: - pre-commit - cudatoolkit: + cuda_version: specific: - output_types: conda matrices: @@ -148,26 +149,33 @@ dependencies: cuda: "11.2" packages: - cuda-version=11.2 - - cudatoolkit - matrix: cuda: "11.4" packages: - cuda-version=11.4 - - cudatoolkit - matrix: cuda: "11.5" packages: - cuda-version=11.5 - - cudatoolkit - matrix: cuda: "11.8" packages: - cuda-version=11.8 - - cudatoolkit - matrix: cuda: "12.0" packages: - cuda-version=12.0 + cuda: + specific: + - output_types: conda + matrices: + - matrix: + cuda: "11.*" + packages: + - cudatoolkit + - matrix: + cuda: "12.*" + packages: - cuda-cudart-dev - libnvjpeg-dev - libcufile-dev