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

Removed unneeded conflicts in CudaPackage and RocmPackage (#29699)

Browse source 
Since the variant is conditional there's no need to add
conflicts too.
This commit is contained in:
Massimiliano Culpo 2022-03-28 18:58:56 +02:00 committed by GitHub
parent a7e365536b
commit 2856b29740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,3 @@ def cuda_flags(arch_list):
# Darwin. # Darwin.
# TODO: add missing conflicts for %apple-clang cuda@:10 # TODO: add missing conflicts for %apple-clang cuda@:10
conflicts('platform=darwin', when='+cuda ^cuda@11.0.2: ') 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)

4
lib/spack/spack/build_systems/rocm.py
View file

@ -112,10 +112,6 @@ class ROCmPackage(PackageBase):
# need amd gpu type for rocm builds # need amd gpu type for rocm builds
conflicts('amdgpu_target=none', when='+rocm') 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 # 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 # 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 # we will still need to set the HCC_AMDGPU_TARGET environment flag in the