zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add auto to swr variant

Browse Source
This commit is contained in:
Omar Padron 2019-03-14 10:09:50 -04:00
parent 737c88c914
commit 2e7cd8a8ac
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/mesa/package.py
View File

@ -34,7 +34,9 @@ class Mesa(MesonPackage):
# Internal options # Internal options
variant('llvm', default=True, description="Enable LLVM.") variant('llvm', default=True, description="Enable LLVM.")
variant('swr', values=any_combination_of('avx', 'avx2', 'knl', 'skx'), variant('swr',
default='auto',
values=auto_or_any_combination_of('avx', 'avx2', 'knl', 'skx'),
description="Enable the SWR driver.") description="Enable the SWR driver.")
# conflicts('~llvm', when='~swr=none') # conflicts('~llvm', when='~swr=none')
@ -128,14 +130,17 @@ def meson_args(self):
else: else:
args.append('-Dllvm=false') args.append('-Dllvm=false')
auto = ('swr=auto' in spec) and (
'x86' in spec.architecture.target.lower())
args_swr_arches = [] args_swr_arches = []
if 'swr=avx' in spec: if 'swr=avx' in spec or auto:
args_swr_arches.append('avx') args_swr_arches.append('avx')
if 'swr=avx2' in spec: if 'swr=avx2' in spec or auto:
args_swr_arches.append('avx2') args_swr_arches.append('avx2')
if 'swr=knl' in spec: if 'swr=knl' in spec or auto:
args_swr_arches.append('knl') args_swr_arches.append('knl')
if 'swr=skx' in spec: if 'swr=skx' in spec or auto:
args_swr_arches.append('skx') args_swr_arches.append('skx')
if args_swr_arches: if args_swr_arches:
if '+llvm' not in spec: if '+llvm' not in spec: