diff options
| author | René Widera <r.widera@hzdr.de> | 2019-11-25 20:23:48 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-25 13:23:48 -0600 |
| commit | 9c10b80591fec2cf391c97f8f53040c3429dbdec (patch) | |
| tree | 4174702d42cd6daeb0aa7e5083bf1dda4d613d61 /lib | |
| parent | 552ffed171e694519d30ed5c770231578f8225d4 (diff) | |
| download | spack-9c10b80591fec2cf391c97f8f53040c3429dbdec.tar.gz spack-9c10b80591fec2cf391c97f8f53040c3429dbdec.tar.bz2 spack-9c10b80591fec2cf391c97f8f53040c3429dbdec.tar.xz spack-9c10b80591fec2cf391c97f8f53040c3429dbdec.zip | |
add package cuda@10.2.89 (#13819)
* add package cuda@10.2.89
add CUDA 10.2 support
* CudaPackage: Add 10.2 Conflicts
* CUDA: Modernize Run Environment
See #11115
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/cuda.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index b75807fd06..79c16114f9 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -61,12 +61,13 @@ class CudaPackage(PackageBase): conflicts('%gcc@6:', when='+cuda ^cuda@:8' + arch_platform) 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.1.243' + arch_platform) + conflicts('%gcc@9:', when='+cuda ^cuda@:10.2.89' + 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) conflicts('%pgi@:15,18:', when='+cuda ^cuda@9.0:9.1' + arch_platform) conflicts('%pgi@:16', when='+cuda ^cuda@9.2.88:10' + arch_platform) + conflicts('%pgi@:17', when='+cuda ^cuda@10.2.89' + arch_platform) conflicts('%clang@:3.4', when='+cuda ^cuda@:7.5' + arch_platform) conflicts('%clang@:3.7,4:', when='+cuda ^cuda@8.0:9.0' + arch_platform) @@ -74,6 +75,10 @@ class CudaPackage(PackageBase): when='+cuda ^cuda@9.1' + arch_platform) conflicts('%clang@:3.7,5.1:', when='+cuda ^cuda@9.2' + arch_platform) conflicts('%clang@:3.7,6.1:', when='+cuda ^cuda@10.0.130' + arch_platform) + conflicts('%clang@:3.7,7.1:', when='+cuda ^cuda@10.1.105' + arch_platform) + conflicts('%clang@:3.7,8.1:', + when='+cuda ^cuda@10.1.105:10.1.243' + arch_platform) + conflicts('%clang@:3.2,9.0:', when='+cuda ^cuda@10.2.89' + arch_platform) # x86_64 vs. ppc64le differ according to NVidia docs # Linux ppc64le compiler conflicts from Table from the docs below: @@ -95,6 +100,8 @@ class CudaPackage(PackageBase): conflicts('%clang@5:', when='+cuda ^cuda@:9.1' + arch_platform) conflicts('%clang@6:', when='+cuda ^cuda@:9.2' + arch_platform) conflicts('%clang@7:', when='+cuda ^cuda@10.0.130' + arch_platform) + conflicts('%clang@7.1:', when='+cuda ^cuda@:10.1.105' + arch_platform) + conflicts('%clang@8.1:', when='+cuda ^cuda@:10.2.89' + arch_platform) # Intel is mostly relevant for x86_64 Linux, even though it also # exists for Mac OS X. No information prior to CUDA 3.2 or Intel 11.1 @@ -107,12 +114,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.0') + conflicts('%intel@19.0:', when='+cuda ^cuda@:10.2.89') # 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') + conflicts('%xl@17:', when='+cuda ^cuda@10.0.130:10.2.89') # Mac OS X # platform = ' platform=darwin' |