diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2020-03-30 14:24:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 16:24:05 -0500 |
| commit | 3f50b9e08dcd16c71946183376cf58414ea9b958 (patch) | |
| tree | 436b91aae87357b68abc289a6c54defec9f602c5 /lib | |
| parent | ccc7c9b86de790dd268b530e1cfa7336b596fd04 (diff) | |
| download | spack-3f50b9e08dcd16c71946183376cf58414ea9b958.tar.gz spack-3f50b9e08dcd16c71946183376cf58414ea9b958.tar.bz2 spack-3f50b9e08dcd16c71946183376cf58414ea9b958.tar.xz spack-3f50b9e08dcd16c71946183376cf58414ea9b958.zip | |
CUDA 10.1+ supports ICC 19.0 (#15764)
Fix the CUDA-ICC conflict check.
Simplify the XL 17 check.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/cuda.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 50a7002dbb..cbee710049 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -140,12 +140,12 @@ class CudaPackage(PackageBase): conflicts('%intel@16.0:', when='+cuda ^cuda@:8.0.43') conflicts('%intel@17.0:', when='+cuda ^cuda@:8.0.60') conflicts('%intel@18.0:', when='+cuda ^cuda@:9.9') - conflicts('%intel@19.0:', when='+cuda ^cuda@:10.2.89') + conflicts('%intel@19.0:', when='+cuda ^cuda@:10.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@17:', when='+cuda ^cuda@10.0.130:10.2.89') + conflicts('%xl@17:', when='+cuda ^cuda@:10.2.89') # Mac OS X # platform = ' platform=darwin' |