hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some issues with CUDA-Intel compiler conflicts. (#10924)

Browse source 
* Fixed some issues with CUDA-Intel compiler conflicts.

* Comment about expressing CUDA-compiler conflicts.

* More precise conflicts and also add support for Intel 19.0
This commit is contained in:
Nichols A. Romero 2019-03-26 09:31:57 -05:00 committed by Axel Huebl
parent 31d7df7860
commit 66172f80f3
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/spack/spack/build_systems/cuda.py
View file

@ -51,6 +51,8 @@ def cuda_flags(arch_list):
# 1. Linux x86_64 # 1. Linux x86_64
# 2. Linux ppc64le # 2. Linux ppc64le
# 3. Mac OS X # 3. Mac OS X
# CUDA-compiler conflicts are version-to-version specific and are
# difficult to express with the current Spack conflict syntax
# Linux x86_64 compiler conflicts from here: # Linux x86_64 compiler conflicts from here:
# https://gist.github.com/ax3l/9489132 # https://gist.github.com/ax3l/9489132
@ -93,12 +95,17 @@ def cuda_flags(arch_list):
conflicts('%clang@7:', when='+cuda ^cuda@10.0.130' + arch_platform) conflicts('%clang@7:', when='+cuda ^cuda@10.0.130' + arch_platform)
# Intel is mostly relevant for x86_64 Linux, even though it also # Intel is mostly relevant for x86_64 Linux, even though it also
# exists for Mac OS X. # exists for Mac OS X. No information prior to CUDA 3.2 or Intel 11.1
conflicts('%intel@:14,16:', when='+cuda ^cuda@7.5') conflicts('%intel@:11.0', when='+cuda ^cuda@:3.1')
conflicts('%intel@:14,17:', when='+cuda ^cuda@8.0.44') conflicts('%intel@:12.0', when='+cuda ^cuda@5.5:')
conflicts('%intel@:14,18:', when='+cuda ^cuda@8.0.61:9.1') conflicts('%intel@:13.0', when='+cuda ^cuda@6.0:')
conflicts('%intel@17:18', when='+cuda ^cuda@9.2:') conflicts('%intel@:13.2', when='+cuda ^cuda@6.5:')
conflicts('%intel@19:', when='+cuda') conflicts('%intel@:14.9', when='+cuda ^cuda@7:')
# Intel 15.x is compatible with CUDA 7 thru current CUDA
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')
# XL is mostly relevant for ppc64le Linux # XL is mostly relevant for ppc64le Linux
conflicts('%xl@:12,14:', when='+cuda ^cuda@:9.1') conflicts('%xl@:12,14:', when='+cuda ^cuda@:9.1')