From ddd2aa0ffc7ad7aecff55b39c7cb23dfc05d0dae Mon Sep 17 00:00:00 2001 From: Andrew W Elble Date: Tue, 3 Nov 2020 13:43:16 -0500 Subject: sirius,spfft: fix defaults for amdgpu_target to be str, not tuple (#19660) --- var/spack/repos/builtin/packages/sirius/package.py | 2 +- var/spack/repos/builtin/packages/spfft/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index dd02e153f4..26163fbcfa 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -57,7 +57,7 @@ class Sirius(CMakePackage, CudaPackage): variant('magma', default=False, description="Enable MAGMA support") variant('nlcglib', default=False, description="enable robust wave function optimization") variant('rocm', default=False, description='Use ROCm GPU support') - variant('amdgpu_target', default=('gfx803', 'gfx900', 'gfx906'), multi=True, values=amdgpu_targets) + variant('amdgpu_target', default='gfx803,gfx900,gfx906', multi=True, values=amdgpu_targets) variant('build_type', default='Release', description='CMake build type', values=('Debug', 'Release', 'RelWithDebInfo')) diff --git a/var/spack/repos/builtin/packages/spfft/package.py b/var/spack/repos/builtin/packages/spfft/package.py index 1c0909fd83..2068f46537 100644 --- a/var/spack/repos/builtin/packages/spfft/package.py +++ b/var/spack/repos/builtin/packages/spfft/package.py @@ -49,7 +49,7 @@ class Spfft(CMakePackage, CudaPackage): depends_on('hip', when='+rocm') depends_on('hsakmt-roct', when='+rocm', type='link') depends_on('hsa-rocr-dev', when='+rocm', type='link') - variant('amdgpu_target', default=('gfx803', 'gfx900', 'gfx906'), multi=True, values=amdgpu_targets) + variant('amdgpu_target', default='gfx803,gfx900,gfx906', multi=True, values=amdgpu_targets) depends_on('cuda@:10', when='@:0.9.11 +cuda') -- cgit v1.2.3-60-g2f50