From 28de7da0ccf2d768494a7b435d2850a5aff46015 Mon Sep 17 00:00:00 2001 From: Andrew W Elble Date: Thu, 6 Oct 2022 03:46:01 -0400 Subject: cuda: add v11.8.0 (#33027) Co-authored-by: Axel Huebl --- lib/spack/spack/build_systems/cuda.py | 11 ++++++++++- var/spack/repos/builtin/packages/cuda/package.py | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 0b58cfcda2..4ab7547200 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -41,6 +41,9 @@ class CudaPackage(PackageBase): "75", "80", "86", + "87", + "89", + "90", ) # FIXME: keep cuda and cuda_arch separate to make usage easier until @@ -100,6 +103,11 @@ class CudaPackage(PackageBase): depends_on("cuda@11.0:", when="cuda_arch=80") depends_on("cuda@11.1:", when="cuda_arch=86") + depends_on("cuda@11.4:", when="cuda_arch=87") + + depends_on("cuda@11.8:", when="cuda_arch=89") + depends_on("cuda@11.8:", when="cuda_arch=90") + # From the NVIDIA install guide we know of conflicts for particular # platforms (linux, darwin), architectures (x86, powerpc) and compilers # (gcc, clang). We don't restrict %gcc and %clang conflicts to @@ -128,10 +136,11 @@ class CudaPackage(PackageBase): conflicts("%gcc@10:", when="+cuda ^cuda@:11.0") 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.7") + conflicts("%gcc@12:", when="+cuda ^cuda@:11.8") 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@:11.8") # 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 01ff286324..e8157b54ae 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -24,6 +24,20 @@ from spack.package import * # format returned by platform.system() and 'arch' by platform.machine() _versions = { + "11.8.0": { + "Linux-aarch64": ( + "e6e9a8d31163c9776b5e313fd7590877c5684e1ecddee741154f95704d4ed27c", + "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_sbsa.run", + ), + "Linux-x86_64": ( + "9223c4af3aebe4a7bbed9abd9b163b03a1b34b855fbc2b4a0d1b706ac09a5a16", + "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run", + ), + "Linux-ppc64le": ( + "f917fb7617033223938543ad3ae923190d99507acc08a399d752a2868e87349d", + "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_ppc64le.run", + ), + }, "11.7.1": { "Linux-aarch64": ( "1607b98c30cb8efa52b9c8f564ec92d26ee1922cb677740aafacce313e544ecd", -- cgit v1.2.3-60-g2f50