From 06c983d38f599cc00a5888c9b31f6c560f313668 Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Mon, 25 Oct 2021 18:05:21 +0200 Subject: cuda: add 11.4.1, 11.4.2, 11.5.0. (#26892) * cuda: add 11.4.1, 11.4.2, 11.5.0. Note that the curses dependency from cuda-gdb was dropped in 11.4.0. * Update clang/gcc constraints. * Address review, assume clang 12 is OK from 11.4.1 onwards. * superlu-dist@7.1.0 conflicts with cuda@11.5.0. * Update var/spack/repos/builtin/packages/superlu-dist/package.py Co-authored-by: Harmen Stoppels Co-authored-by: Harmen Stoppels --- lib/spack/spack/build_systems/cuda.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 5003387f89..634cfad637 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -104,7 +104,10 @@ class CudaPackage(PackageBase): # This implies that the last one in the list has to be updated at # each release of a new cuda minor version. conflicts('%gcc@10:', when='+cuda ^cuda@:11.0') - conflicts('%gcc@11:', when='+cuda ^cuda@:11.4') + conflicts('%gcc@11:', when='+cuda ^cuda@:11.4.0') + conflicts('%gcc@12:', when='+cuda ^cuda@:11.5.0') + conflicts('%clang@12:', when='+cuda ^cuda@:11.4.0') + conflicts('%clang@13:', when='+cuda ^cuda@:11.5.0') # https://gist.github.com/ax3l/9489132#gistcomment-3860114 conflicts('%gcc@10', when='+cuda ^cuda@:11.4.0') -- cgit v1.2.3-60-g2f50