diff options
author | Harmen Stoppels <harmenstoppels@gmail.com> | 2020-12-02 15:58:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 15:58:58 +0100 |
commit | b0baf429889ca22eaf8e7028ecb0061918c03dbd (patch) | |
tree | 1180c9c903738d0650409ad3999aaa156df1b876 /var/spack/repos/builtin/packages/chai/package.py | |
parent | e575a38d967cd20c44fa4eb515d543f0a21127ec (diff) | |
download | spack-b0baf429889ca22eaf8e7028ecb0061918c03dbd.tar.gz spack-b0baf429889ca22eaf8e7028ecb0061918c03dbd.tar.bz2 spack-b0baf429889ca22eaf8e7028ecb0061918c03dbd.tar.xz spack-b0baf429889ca22eaf8e7028ecb0061918c03dbd.zip |
Fix hipcc once more (#20095)
Diffstat (limited to 'var/spack/repos/builtin/packages/chai/package.py')
-rw-r--r-- | var/spack/repos/builtin/packages/chai/package.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py index d4fa53071d..6fd33dea8b 100644 --- a/var/spack/repos/builtin/packages/chai/package.py +++ b/var/spack/repos/builtin/packages/chai/package.py @@ -6,7 +6,7 @@ from spack import * -class Chai(CMakePackage, CudaPackage, HipPackage): +class Chai(CMakePackage, CudaPackage, ROCmPackage): """ Copy-hiding array interface for data migration between memory spaces """ @@ -36,12 +36,11 @@ class Chai(CMakePackage, CudaPackage, HipPackage): depends_on('umpire+cuda', when="+cuda") depends_on('raja+cuda', when="+raja+cuda") - # variants +hip and amdgpu_targets are not automatically passed to + # variants +rocm and amdgpu_targets are not automatically passed to # dependencies, so do it manually. - amdgpu_targets = HipPackage.amd_gputargets_list() - depends_on('umpire+hip', when='+hip') - depends_on('raja+hip', when="+raja+hip") - for val in amdgpu_targets: + depends_on('umpire+rocm', when='+rocm') + depends_on('raja+rocm', when="+raja+rocm") + for val in ROCmPackage.amdgpu_targets: depends_on('umpire amdgpu_target=%s' % val, when='amdgpu_target=%s' % val) depends_on('raja amdgpu_target=%s' % val, when='+raja amdgpu_target=%s' % val) @@ -63,12 +62,17 @@ class Chai(CMakePackage, CudaPackage, HipPackage): else: options.append('-DENABLE_CUDA=OFF') - if '+hip' in spec: - arch = self.spec.variants['amdgpu_target'].value + if '+rocm' in spec: options.extend([ '-DENABLE_HIP=ON', - '-DHIP_ROOT_DIR={0}'.format(spec['hip'].prefix), - '-DHIP_HIPCC_FLAGS=--amdgpu-target={0}'.format(arch)]) + '-DHIP_ROOT_DIR={0}'.format(spec['hip'].prefix) + ]) + archs = self.spec.variants['amdgpu_target'].value + if archs != 'none': + arch_str = ",".join(archs) + options.append( + '-DHIP_HIPCC_FLAGS=--amdgpu-target={0}'.format(arch_str) + ) else: options.append('-DENABLE_HIP=OFF') |