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

replace 'no' with 'none' as possible value of 'threads' variant (#17063)

Browse source
This commit is contained in:
Peter Scheibel 2020-06-12 18:12:35 -07:00 committed by GitHub
parent 416e94be72
commit 2b58b3a1bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/libflame/package.py
View file

@ -30,9 +30,9 @@ class Libflame(AutotoolsPackage):
' to their corresponding native C implementations' ' to their corresponding native C implementations'
' in libflame.') ' in libflame.')
variant('threads', default='no', variant('threads', default='none',
description='Multithreading support', description='Multithreading support',
values=('pthreads', 'openmp', 'no'), values=('pthreads', 'openmp', 'none'),
multi=False) multi=False)
variant('static', default=True, variant('static', default=True,
@ -70,6 +70,12 @@ def flag_handler(self, name, flags):
flags.append('-std=gnu99') flags.append('-std=gnu99')
return (flags, None, None) return (flags, None, None)
def enable_or_disable_threads(self, variant, options):
opt_val = self.spec.variants['threads'].value
if variant_val == 'none':
opt_val = 'no'
return ['--enable-multithreading={0}'.format(opt_val)]
def configure_args(self): def configure_args(self):
# Libflame has a secondary dependency on BLAS, # Libflame has a secondary dependency on BLAS,
# but doesn't know which library name to expect: # but doesn't know which library name to expect:
@ -96,10 +102,9 @@ def configure_args(self):
else: else:
config_args.append("--disable-debug") config_args.append("--disable-debug")
config_args.append('--enable-multithreading=' config_args.extend(self.enable_or_disable('threads'))
+ self.spec.variants['threads'].value)
if 'no' != self.spec.variants['threads'].value: if 'none' != self.spec.variants['threads'].value:
config_args.append("--enable-supermatrix") config_args.append("--enable-supermatrix")
else: else:
config_args.append("--disable-supermatrix") config_args.append("--disable-supermatrix")