summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpauleonix <paul.grosse-bley@ziti.uni-heidelberg.de>2024-07-15 20:04:47 +0200
committerGitHub <noreply@github.com>2024-07-15 20:04:47 +0200
commita26ac1dbcce120e460e24bbb605e1cf764615a0f (patch)
treef95eb2527963c00e216978d53111994fb99ac711
parent2afaeba292bc2298cc7754d2ad2d7601be1d8306 (diff)
downloadspack-a26ac1dbcce120e460e24bbb605e1cf764615a0f.tar.gz
spack-a26ac1dbcce120e460e24bbb605e1cf764615a0f.tar.bz2
spack-a26ac1dbcce120e460e24bbb605e1cf764615a0f.tar.xz
spack-a26ac1dbcce120e460e24bbb605e1cf764615a0f.zip
cuda: add v12.5.1 (#44342)
- Add explicit conflict on ppc64le for 12.5 and newer. - Update/fix intel compiler conflict to reflect that intel@2021 is compatible only since 11.4.1 and not since 11.1.1. - Add intel compiler conflicts to reflect strict support matrix since 12.2.0.
-rw-r--r--lib/spack/spack/build_systems/cuda.py8
-rw-r--r--var/spack/repos/builtin/packages/cuda/package.py10
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py
index 07f30514bf..f20677df33 100644
--- a/lib/spack/spack/build_systems/cuda.py
+++ b/lib/spack/spack/build_systems/cuda.py
@@ -124,6 +124,8 @@ class CudaPackage(PackageBase):
# 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
# NOTE:
@@ -211,12 +213,16 @@ class CudaPackage(PackageBase):
conflicts("%intel@19.0:", when="+cuda ^cuda@:10.0")
conflicts("%intel@19.1:", when="+cuda ^cuda@:10.1")
conflicts("%intel@19.2:", when="+cuda ^cuda@:11.1.0")
+ conflicts("%intel@2021:", when="+cuda ^cuda@:11.4.0")
# XL is mostly relevant for ppc64le Linux
conflicts("%xl@:12,14:", when="+cuda ^cuda@:9.1")
conflicts("%xl@:12,14:15,17:", when="+cuda ^cuda@9.2")
conflicts("%xl@:12,17:", when="+cuda ^cuda@:11.1.0")
+ # PowerPC.
+ conflicts("target=ppc64le", when="+cuda ^cuda@12.5:")
+
# Darwin.
# TODO: add missing conflicts for %apple-clang cuda@:10
- conflicts("platform=darwin", when="+cuda ^cuda@11.0.2: ")
+ conflicts("platform=darwin", when="+cuda ^cuda@11.0.2:")
diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py
index df6a3a7c03..dce84006cf 100644
--- a/var/spack/repos/builtin/packages/cuda/package.py
+++ b/var/spack/repos/builtin/packages/cuda/package.py
@@ -25,6 +25,16 @@ from spack.package import *
preferred_ver = "11.8.0"
_versions = {
+ "12.5.1": {
+ "Linux-aarch64": (
+ "353e8abc52ca80adf05002b775c7b3a2d2feefcf1c25ae13f8757f9a11efba3e",
+ "https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda_12.5.1_555.42.06_linux_sbsa.run",
+ ),
+ "Linux-x86_64": (
+ "b5e0a779e089c86610051141c4cf498beef431858ec63398107391727ecbdb04",
+ "https://developer.download.nvidia.com/compute/cuda/12.5.1/local_installers/cuda_12.5.1_555.42.06_linux.run",
+ ),
+ },
"12.5.0": {
"Linux-aarch64": (
"e7b864c9ae27cef77cafc78614ec33cbb0a27606af9375deffa09c4269a07f04",