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

Adding support for the Accelerate library on OS X (#7068)

Browse source 
* Adding support for the Accelerate library on OS X

* Fixed guard on variable and added another depends_on statement to make sure that openblas gets selected even when openmp_blas variant is not turned on.
This commit is contained in:
Brian Van Essen 2018-01-31 12:10:42 -07:00 committed by becker33
parent fa65725263
commit c3034b53e3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/elemental/package.py
View file

@ -69,8 +69,8 @@ class Elemental(CMakePackage):
variant('build_type', default='Release', variant('build_type', default='Release',
description='The build type to build', description='The build type to build',
values=('Debug', 'Release')) values=('Debug', 'Release'))
variant('blas', default='openblas', values=('openblas', 'mkl', 'essl'), variant('blas', default='openblas', values=('openblas', 'mkl', 'accelerate', 'essl'),
description='Enable the use of OpenBlas/MKL/ESSL') description='Enable the use of OpenBlas/MKL/Accelerate/ESSL')
variant('mpfr', default=False, variant('mpfr', default=False,
description='Support GNU MPFR\'s' description='Support GNU MPFR\'s'
'arbitrary-precision floating-point arithmetic') 'arbitrary-precision floating-point arithmetic')
@ -78,6 +78,7 @@ class Elemental(CMakePackage):
# Note that #1712 forces us to enumerate the different blas variants # Note that #1712 forces us to enumerate the different blas variants
depends_on('blas', when='~openmp_blas ~int64_blas') depends_on('blas', when='~openmp_blas ~int64_blas')
# Hack to forward variant to openblas package # Hack to forward variant to openblas package
depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas')
# Allow Elemental to build internally when using 8-byte ints # Allow Elemental to build internally when using 8-byte ints
depends_on('openblas threads=openmp', when='blas=openblas +openmp_blas ~int64_blas') depends_on('openblas threads=openmp', when='blas=openblas +openmp_blas ~int64_blas')
@ -85,6 +86,8 @@ class Elemental(CMakePackage):
depends_on('intel-mkl threads=openmp', when='blas=mkl +openmp_blas ~int64_blas') depends_on('intel-mkl threads=openmp', when='blas=mkl +openmp_blas ~int64_blas')
depends_on('intel-mkl@2017.1 +openmp +ilp64', when='blas=mkl +openmp_blas +int64_blas') depends_on('intel-mkl@2017.1 +openmp +ilp64', when='blas=mkl +openmp_blas +int64_blas')
depends_on('veclibfort', when='blas=accelerate')
depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas') depends_on('essl -cuda', when='blas=essl -openmp_blas ~int64_blas')
depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas') depends_on('essl threads=openmp', when='blas=essl +openmp_blas ~int64_blas')
@ -229,6 +232,8 @@ def cmake_args(self):
elif 'blas=mkl' in spec: elif 'blas=mkl' in spec:
args.extend([ args.extend([
'-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)]) '-DHydrogen_USE_MKL:BOOL=%s' % ('blas=mkl' in spec)])
elif 'blas=accelerate' in spec:
args.extend(['-DHydrogen_USE_ACCELERATE:BOOL=TRUE'])
elif 'blas=essl' in spec: elif 'blas=essl' in spec:
args.extend([ args.extend([
'-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)]) '-DHydrogen_USE_ESSL:BOOL=%s' % ('blas=essl' in spec)])