diff options
| author | David Beckingsale <davidbeckingsale@gmail.com> | 2020-09-28 18:01:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 18:01:20 -0700 |
| commit | 04771ad9f85a0896c453b0f241191034539c59d4 (patch) | |
| tree | 234a00efc1e612da297a3a40c8aa3e274027b75e | |
| parent | d183d16abb99f641a00c78415cb175587fe4b74e (diff) | |
| download | spack-04771ad9f85a0896c453b0f241191034539c59d4.tar.gz spack-04771ad9f85a0896c453b0f241191034539c59d4.tar.bz2 spack-04771ad9f85a0896c453b0f241191034539c59d4.tar.xz spack-04771ad9f85a0896c453b0f241191034539c59d4.zip | |
Fixup conflicts for CUDA 11.0.2 and GCC (#19035)
* Fixup conflicts for CUDA 11.0.2 and GCC
* Updates for ppc64le
* Fix missing "or newer"
Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
| -rw-r--r-- | lib/spack/spack/build_systems/cuda.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index ef1b0266f8..ef57a983c7 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -93,7 +93,8 @@ class CudaPackage(PackageBase): conflicts('%gcc@7:', when='+cuda ^cuda@:9.1' + arch_platform) conflicts('%gcc@8:', when='+cuda ^cuda@:10.0.130' + arch_platform) conflicts('%gcc@9:', when='+cuda ^cuda@:10.2.89' + arch_platform) - conflicts('%gcc@:4,10:', when='+cuda ^cuda@:11.0.2' + arch_platform) + conflicts('%gcc@:4', when='+cuda ^cuda@11.0.2:' + arch_platform) + conflicts('%gcc@10:', when='+cuda ^cuda@:11.0.2' + arch_platform) conflicts('%pgi@:14.8', when='+cuda ^cuda@:7.0.27' + arch_platform) conflicts('%pgi@:15.3,15.5:', when='+cuda ^cuda@7.5' + arch_platform) conflicts('%pgi@:16.2,16.0:16.3', when='+cuda ^cuda@8' + arch_platform) @@ -129,7 +130,8 @@ class CudaPackage(PackageBase): conflicts('%gcc@8:', when='+cuda ^cuda@:10.0.130' + arch_platform) conflicts('%gcc@9:', when='+cuda ^cuda@:10.1.243' + arch_platform) # officially, CUDA 11.0.2 only supports the system GCC 8.3 on ppc64le - conflicts('%gcc@:4,10:', when='+cuda ^cuda@:11.0.2' + arch_platform) + conflicts('%gcc@:4', when='+cuda ^cuda@11.0.2:' + arch_platform) + conflicts('%gcc@10:', when='+cuda ^cuda@:11.0.2' + arch_platform) conflicts('%pgi', when='+cuda ^cuda@:8' + arch_platform) conflicts('%pgi@:16', when='+cuda ^cuda@:9.1.185' + arch_platform) conflicts('%pgi@:17', when='+cuda ^cuda@:10' + arch_platform) |