From 3eb851803861721bafdc54c2e30ae41209a72998 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 9 Jan 2024 16:53:57 -0600 Subject: [PATCH 1/2] Refactor CUDA versions in dependencies.yaml. --- dependencies.yaml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 99bb73808..b0b94ee26 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -8,7 +8,8 @@ files: includes: - build - checks - - cudatoolkit + - cuda_version + - cuda - develop - docs - py_version @@ -17,13 +18,13 @@ files: test_python: output: none includes: - - cudatoolkit + - cuda_version - py_version - test_python test_cpp: output: none includes: - - cudatoolkit + - cuda_version - test_cpp checks: output: none @@ -33,7 +34,7 @@ files: docs: output: none includes: - - cudatoolkit + - cuda_version - docs - py_version py_build: @@ -102,9 +103,8 @@ dependencies: packages: - nvcc_linux-aarch64=11.8 - matrix: - cuda: "12.0" + cuda: "12.*" packages: - - cuda-version=12.0 - cuda-nvcc - output_types: [conda, requirements, pyproject] matrices: @@ -126,7 +126,7 @@ dependencies: - output_types: conda packages: - &doxygen doxygen=1.9.1 - cudatoolkit: + cuda_version: specific: - output_types: conda matrices: @@ -134,31 +134,37 @@ 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.6" packages: - cuda-version=11.6 - - 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: develop: common: - output_types: [conda, requirements] From 2dae27c830b9ecfda2bccaf342d2cb9c65932797 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 9 Jan 2024 17:06:33 -0600 Subject: [PATCH 2/2] Alphabetize dependency lists. --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index b0b94ee26..4d1a0ec49 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -8,8 +8,8 @@ files: includes: - build - checks - - cuda_version - cuda + - cuda_version - develop - docs - py_version