From 944d7b3d62214b112b7e642999b8247291bb1bbc Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 30 Oct 2019 17:25:46 +0100 Subject: cuda: fix conflict statements for x86-64 targets (#13472) * cuda: fix conflict statements for x86-64 targets fixes #13462 This build system mixin was not updated after the support for specific targets has been merged. * Updated the version range of cuda that conflicts with gcc@8: * Updated the version range of cuda that conflicts with gcc@8: for ppc64le * Relaxed conflicts for version > 10.1 * Updated versions in conflicts Co-Authored-By: Axel Huebl --- lib/spack/spack/build_systems/cuda.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 436bc30729..b75807fd06 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -56,11 +56,12 @@ class CudaPackage(PackageBase): # Linux x86_64 compiler conflicts from here: # https://gist.github.com/ax3l/9489132 - arch_platform = ' arch=x86_64 platform=linux' + arch_platform = ' target=x86_64: platform=linux' conflicts('%gcc@5:', when='+cuda ^cuda@:7.5' + arch_platform) 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@8:', when='+cuda ^cuda@:10.0.130' + arch_platform) + conflicts('%gcc@9:', when='+cuda ^cuda@:10.1.243' + 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) @@ -82,10 +83,11 @@ class CudaPackage(PackageBase): # https://docs.nvidia.com/cuda/archive/9.0/cuda-installation-guide-linux/index.html # https://docs.nvidia.com/cuda/archive/8.0/cuda-installation-guide-linux/index.html - arch_platform = ' arch=ppc64le platform=linux' + arch_platform = ' target=ppc64le: platform=linux' # information prior to CUDA 9 difficult to find conflicts('%gcc@6:', when='+cuda ^cuda@:9' + arch_platform) - conflicts('%gcc@8:', when='+cuda ^cuda@10.0.130' + 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('%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) -- cgit v1.2.3-70-g09d2