From caaaba464e99536fafc1a37f3de1d0dfee4f012c Mon Sep 17 00:00:00 2001 From: pauleonix Date: Thu, 10 Oct 2024 17:48:20 +0200 Subject: [PATCH] cuda: add v12.6.2 (#46864) * cuda: Add 12.6.2 * Update cuda build system - Remove gcc@6 conflict that was only a deprecation (probably has be added again with cuda@13) - Update cuda_arch support by CUDA version - Kepler support has ended with cuda@12 - Recently added 90a Hopper "experimental" features architecture was missing the dependency on cuda@12: --- lib/spack/spack/build_systems/cuda.py | 6 +++--- var/spack/repos/builtin/packages/cuda/package.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 9dbff8e3fd8..5bfe0cfcadf 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -110,8 +110,8 @@ def compute_capabilities(arch_list: Iterable[str]) -> List[str]: depends_on("cuda@5.0:10.2", when="cuda_arch=30") depends_on("cuda@5.0:10.2", when="cuda_arch=32") - depends_on("cuda@5.0:", when="cuda_arch=35") - depends_on("cuda@6.5:", when="cuda_arch=37") + depends_on("cuda@5.0:11.8", when="cuda_arch=35") + depends_on("cuda@6.5:11.8", when="cuda_arch=37") depends_on("cuda@6.0:", when="cuda_arch=50") depends_on("cuda@6.5:", when="cuda_arch=52") @@ -131,6 +131,7 @@ def compute_capabilities(arch_list: Iterable[str]) -> List[str]: depends_on("cuda@11.8:", when="cuda_arch=89") depends_on("cuda@12.0:", when="cuda_arch=90") + depends_on("cuda@12.0:", when="cuda_arch=90a") # From the NVIDIA install guide we know of conflicts for particular # platforms (linux, darwin), architectures (x86, powerpc) and compilers @@ -149,7 +150,6 @@ def compute_capabilities(arch_list: Iterable[str]) -> List[str]: # minimum supported versions conflicts("%gcc@:4", when="+cuda ^cuda@11.0:") conflicts("%gcc@:5", when="+cuda ^cuda@11.4:") - conflicts("%gcc@:7.2", when="+cuda ^cuda@12.4:") conflicts("%clang@:6", when="+cuda ^cuda@12.2:") # maximum supported version diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index affd8bafa59..bd1ff959f2a 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -24,6 +24,16 @@ # format returned by platform.system() and 'arch' by platform.machine() _versions = { + "12.6.2": { + "Linux-aarch64": ( + "2249408848b705c18b9eadfb5161b52e4e36fcc5753647329cce93db141e5466", + "https://developer.download.nvidia.com/compute/cuda/12.6.2/local_installers/cuda_12.6.2_560.35.03_linux_sbsa.run", + ), + "Linux-x86_64": ( + "3729a89cb58f7ca6a46719cff110d6292aec7577585a8d71340f0dbac54fb237", + "https://developer.download.nvidia.com/compute/cuda/12.6.2/local_installers/cuda_12.6.2_560.35.03_linux.run", + ), + }, "12.6.1": { "Linux-aarch64": ( "b39ac88184798e8c313e6ced23dd128f13ab30c199b96bd9c0bee07dbdd31400",