From 1e7cbe7e3e51e2bb34ab3178fbd520e26a087b6c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 14:27:48 -0600 Subject: [PATCH] refactor CUDA versions in dependencies.yaml (#517) 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) - Jake Awe (https://github.com/AyodeAwe) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/rapids-cmake/pull/517 --- dependencies.yaml | 60 ++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index bd32080e..b8ae43d9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -4,7 +4,8 @@ files: output: none includes: - build - - cudatoolkit + - cuda + - cuda_version - docs - py_version - test @@ -17,7 +18,7 @@ files: docs: output: none includes: - - cudatoolkit + - cuda_version - docs channels: - rapidsai @@ -35,6 +36,30 @@ dependencies: - cxx-compiler - make specific: + - output_types: conda + matrices: + - matrix: + cuda: "11.[245]" + packages: + - gcc<11.0.0 + - matrix: + cuda: "11.[68]" + packages: + - gcc<12.0.0 + - matrix: + cuda: "12.*" + packages: + - gcc<13.0.0 + - output_types: conda + matrices: + - matrix: + arch: x86_64 + packages: + - sysroot_linux-64==2.17 + - matrix: + arch: aarch64 + packages: + - sysroot_linux-aarch64==2.17 - output_types: conda matrices: - matrix: @@ -80,9 +105,8 @@ dependencies: - matrix: cuda: "12.0" packages: - - cuda-version=12.0 - cuda-nvcc - cudatoolkit: + cuda_version: specific: - output_types: conda matrices: @@ -90,44 +114,38 @@ dependencies: cuda: "11.2" packages: - cuda-version=11.2 - - cudatoolkit - - gcc<11.0.0 - - sysroot_linux-64==2.17 - matrix: cuda: "11.4" packages: - cuda-version=11.4 - - cudatoolkit - - gcc<11.0.0 - - sysroot_linux-64==2.17 - matrix: cuda: "11.5" packages: - cuda-version=11.5 - - cudatoolkit - - gcc<11.0.0 - - sysroot_linux-64==2.17 - matrix: cuda: "11.6" packages: - cuda-version=11.6 - - cudatoolkit - - gcc<12.0.0 - - sysroot_linux-64==2.17 - matrix: cuda: "11.8" packages: - cuda-version=11.8 - - cudatoolkit - - gcc<12.0.0 - - sysroot_linux-64==2.17 - 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-cupti-dev - - gcc<13.0.0 - - sysroot_linux-64==2.17 docs: common: - output_types: [conda]