From 2e7cd8a8aca07767c00657d0d09985ddd6306883 Mon Sep 17 00:00:00 2001 From: Omar Padron Date: Thu, 14 Mar 2019 10:09:50 -0400 Subject: [PATCH] add auto to swr variant --- var/spack/repos/builtin/packages/mesa/package.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 375b8b632e0..0dea021a1a1 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -34,7 +34,9 @@ class Mesa(MesonPackage): # Internal options 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.") # conflicts('~llvm', when='~swr=none') @@ -128,14 +130,17 @@ def meson_args(self): else: args.append('-Dllvm=false') + auto = ('swr=auto' in spec) and ( + 'x86' in spec.architecture.target.lower()) + args_swr_arches = [] - if 'swr=avx' in spec: + if 'swr=avx' in spec or auto: args_swr_arches.append('avx') - if 'swr=avx2' in spec: + if 'swr=avx2' in spec or auto: args_swr_arches.append('avx2') - if 'swr=knl' in spec: + if 'swr=knl' in spec or auto: args_swr_arches.append('knl') - if 'swr=skx' in spec: + if 'swr=skx' in spec or auto: args_swr_arches.append('skx') if args_swr_arches: if '+llvm' not in spec: