From 619e11d17c45bcc3078fdd752491ab277fafacb7 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Feb 2024 16:37:34 -0600 Subject: [PATCH 1/2] Refactor CUDA libraries in dependencies.yaml --- dependencies.yaml | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4116d3230..bfce58a7d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -115,24 +115,15 @@ dependencies: cuda: "11.8" packages: - nvcc_linux-64=11.8 - - libcufile=1.4.0.31 - - libcufile-dev=1.4.0.31 - - libnvjpeg=11.6.0.55 - - libnvjpeg-dev=11.6.0.55 - matrix: arch: aarch64 cuda: "11.8" packages: - nvcc_linux-aarch64=11.8 - - libnvjpeg=11.6.0.55 - - libnvjpeg-dev=11.6.0.55 - matrix: cuda: "12.*" packages: - cuda-nvcc - - libcufile-dev - - libnvjpeg-dev - - libnvjpeg-static checks: common: - output_types: [conda, requirements] @@ -178,7 +169,40 @@ dependencies: cuda: "12.*" packages: - cuda-cudart-dev + - output_types: conda + matrices: + - matrix: + arch: x86_64 + cuda: "11.8" + packages: + - libnvjpeg=11.6.0.55 + - libnvjpeg-dev=11.6.0.55 + - matrix: + arch: aarch64 + cuda: "11.8" + packages: + - libnvjpeg=11.6.0.55 + - libnvjpeg-dev=11.6.0.55 + - matrix: + cuda: "12.*" + packages: - libnvjpeg-dev + - libnvjpeg-static + - output_types: conda + matrices: + - matrix: + arch: aarch64 + packages: + - matrix: + arch: x86_64 + cuda: "11.8" + packages: + - libcufile=1.4.0.31 + - libcufile-dev=1.4.0.31 + - matrix: + arch: x86_64 + cuda: "12.*" + packages: - libcufile-dev develop: common: From 057200cb57ebbc40433a37c5911ab16a4f52a4f2 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Feb 2024 16:43:48 -0600 Subject: [PATCH 2/2] Consolidate nvjpeg. --- dependencies.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index bfce58a7d..2c9159c50 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -172,13 +172,6 @@ dependencies: - output_types: conda matrices: - matrix: - arch: x86_64 - cuda: "11.8" - packages: - - libnvjpeg=11.6.0.55 - - libnvjpeg-dev=11.6.0.55 - - matrix: - arch: aarch64 cuda: "11.8" packages: - libnvjpeg=11.6.0.55