From 6b649ccf4fe4f088391ac6a7ee9c056c878b2d39 Mon Sep 17 00:00:00 2001 From: pauleonix Date: Mon, 2 Sep 2024 08:46:03 +0200 Subject: [PATCH] cuda: add v12.6.1 (#46143) Update build system conflict between CUDA 12.6 and Clang 18 --- lib/spack/spack/build_systems/cuda.py | 3 ++- var/spack/repos/builtin/packages/cuda/package.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 6c14e23f1c0..20f7ede1396 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -145,7 +145,8 @@ def cuda_flags(arch_list): conflicts("%clang@15:", when="+cuda ^cuda@:12.0") conflicts("%clang@16:", when="+cuda ^cuda@:12.1") conflicts("%clang@17:", when="+cuda ^cuda@:12.3") - conflicts("%clang@18:", when="+cuda ^cuda@:12.6") + conflicts("%clang@18:", when="+cuda ^cuda@:12.5") + conflicts("%clang@19:", when="+cuda ^cuda@:12.6") # 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 5b905d6c228..affd8bafa59 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.1": { + "Linux-aarch64": ( + "b39ac88184798e8c313e6ced23dd128f13ab30c199b96bd9c0bee07dbdd31400", + "https://developer.download.nvidia.com/compute/cuda/12.6.1/local_installers/cuda_12.6.1_560.35.03_linux_sbsa.run", + ), + "Linux-x86_64": ( + "73acce7243519625f259509f5dcff6dc8fbd23dca53b852aa9ce382009e92e9d", + "https://developer.download.nvidia.com/compute/cuda/12.6.1/local_installers/cuda_12.6.1_560.35.03_linux.run", + ), + }, "12.6.0": { "Linux-aarch64": ( "398db7baca17d51ad5035c606714c96380c965fd1742478c743bc6bbb1d8f63c",