From e70755f69212a49177d4c4ac0e365c989b90c7df Mon Sep 17 00:00:00 2001 From: matteo-chesi Date: Wed, 10 May 2023 15:31:07 +0200 Subject: cuda: add versions 12.0.1, 12.1.0 and 12.1.1 (#37083) --- lib/spack/spack/build_systems/cuda.py | 3 +- var/spack/repos/builtin/packages/cuda/package.py | 42 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index ef2c4c2a7d..6f294983c6 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -137,11 +137,12 @@ class CudaPackage(PackageBase): conflicts("%gcc@11:", when="+cuda ^cuda@:11.4.0") conflicts("%gcc@11.2:", when="+cuda ^cuda@:11.5") conflicts("%gcc@12:", when="+cuda ^cuda@:11.8") - conflicts("%gcc@13:", when="+cuda ^cuda@:12.0") + conflicts("%gcc@13:", when="+cuda ^cuda@:12.1") conflicts("%clang@12:", when="+cuda ^cuda@:11.4.0") conflicts("%clang@13:", when="+cuda ^cuda@:11.5") conflicts("%clang@14:", when="+cuda ^cuda@:11.7") conflicts("%clang@15:", when="+cuda ^cuda@:12.0") + conflicts("%clang@16:", when="+cuda ^cuda@:12.1") # https://gist.github.com/ax3l/9489132#gistcomment-3860114 conflicts("%gcc@10", when="+cuda ^cuda@:11.4.0") diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 4d6762d2a9..93573d4698 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -25,6 +25,48 @@ from spack.package import * preferred_ver = "11.8.0" _versions = { + "12.1.1": { + "Linux-aarch64": ( + "45ea4cd860f0a26d3db8ce032530f2ee0b55abdd587545213d395a73623b4278", + "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux_sbsa.run", + ), + "Linux-x86_64": ( + "d74022d41d80105319dfa21beea39b77a5b9919539c0487a05caaf2446d6a70e", + "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run", + ), + "Linux-ppc64le": ( + "c5950381f2c01fd52692372fc8e51d599e940ada2af2c82c3cc854ecff933eae", + "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux_ppc64le.run", + ), + }, + "12.1.0": { + "Linux-aarch64": ( + "1d0dd884f5257c12471dc455dc1a4aee8d620191737c0b2e40f016d8adc9d009", + "https://developer.download.nvidia.com/compute/cuda/12.1.0/local_installers/cuda_12.1.0_530.30.02_linux_sbsa.run", + ), + "Linux-x86_64": ( + "68699036c12d71adb9ad2799dce2ff070270fab4488b90920b9756ab3f52c41c", + "https://developer.download.nvidia.com/compute/cuda/12.1.0/local_installers/cuda_12.1.0_530.30.02_linux.run", + ), + "Linux-ppc64le": ( + "8d75bd9da953a51062b89b8c752cffcf02b02c85cb461291d354ac2cffb2da48", + "https://developer.download.nvidia.com/compute/cuda/12.1.0/local_installers/cuda_12.1.0_530.30.02_linux_ppc64le.run", + ), + }, + "12.0.1": { + "Linux-aarch64": ( + "835270a8db419b9dbaefc1bab8fe5caf6f2caf381975c4b0d35cc0718c26074a", + "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux_sbsa.run", + ), + "Linux-x86_64": ( + "1b205a06272f1463f477276fdab903f3f666917c068e520738001e69c7a1875b", + "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run", + ), + "Linux-ppc64le": ( + "1e81040223c25fd72895a1348e32463d7d0f5a7e74b5d2ace897220cb6d4d849", + "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux_ppc64le.run", + ), + }, "12.0.0": { "Linux-aarch64": ( "cd13e9c65d4c8f895a968706f46064d536be09f9706bce081cc864b7e4fa4544", -- cgit v1.2.3-60-g2f50