From 2856b2974022ff0a3272d6f9ab6c7ffa868ab7ff Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 28 Mar 2022 18:58:56 +0200 Subject: Removed unneeded conflicts in CudaPackage and RocmPackage (#29699) Since the variant is conditional there's no need to add conflicts too. --- lib/spack/spack/build_systems/cuda.py | 4 ---- lib/spack/spack/build_systems/rocm.py | 4 ---- 2 files changed, 8 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 1b85f82cc4..249ca9c6ed 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -188,7 +188,3 @@ class CudaPackage(PackageBase): # Darwin. # TODO: add missing conflicts for %apple-clang cuda@:10 conflicts('platform=darwin', when='+cuda ^cuda@11.0.2: ') - - # Make sure cuda_arch can not be used without +cuda - for value in cuda_arch_values: - conflicts('~cuda', when='cuda_arch=' + value) diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py index 2d5b245712..65c51ff749 100644 --- a/lib/spack/spack/build_systems/rocm.py +++ b/lib/spack/spack/build_systems/rocm.py @@ -112,10 +112,6 @@ class ROCmPackage(PackageBase): # need amd gpu type for rocm builds conflicts('amdgpu_target=none', when='+rocm') - # Make sure amdgpu_targets cannot be used without +rocm - for value in amdgpu_targets: - conflicts('~rocm', when='amdgpu_target=' + value) - # https://github.com/ROCm-Developer-Tools/HIP/blob/master/bin/hipcc # It seems that hip-clang does not (yet?) accept this flag, in which case # we will still need to set the HCC_AMDGPU_TARGET environment flag in the -- cgit v1.2.3-60-g2f50