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

py-numpy: add support for intel-oneapi-mkl (#27390)

Browse Source
This commit is contained in:
Glenn Johnson 2021-11-12 11:16:09 -06:00 committed by GitHub
parent 77203c940c
commit 8d06abb8ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/py-numpy/package.py
View File

@ -207,7 +207,9 @@ def write_library_dirs(f, dirs):
# Tell numpy where to find BLAS/LAPACK libraries # Tell numpy where to find BLAS/LAPACK libraries
with open('site.cfg', 'w') as f: with open('site.cfg', 'w') as f:
if '^intel-mkl' in spec or '^intel-parallel-studio+mkl' in spec: if '^intel-mkl' in spec or \
'^intel-parallel-studio+mkl' or \
'^intel-oneapi-mkl' in spec:
f.write('[mkl]\n') f.write('[mkl]\n')
# FIXME: as of @1.11.2, numpy does not work with separately # FIXME: as of @1.11.2, numpy does not work with separately
# specified threading and interface layers. A workaround is a # specified threading and interface layers. A workaround is a
@ -300,7 +302,8 @@ def setup_build_environment(self, env):
if 'blas' not in spec: if 'blas' not in spec:
blas = '' blas = ''
elif spec['blas'].name == 'intel-mkl' or \ elif spec['blas'].name == 'intel-mkl' or \
spec['blas'].name == 'intel-parallel-studio': spec['blas'].name == 'intel-parallel-studio' or \
spec['blas'].name == 'intel-oneapi-mkl':
blas = 'mkl' blas = 'mkl'
elif spec['blas'].name == 'blis': elif spec['blas'].name == 'blis':
blas = 'blis' blas = 'blis'
@ -319,7 +322,8 @@ def setup_build_environment(self, env):
if 'lapack' not in spec: if 'lapack' not in spec:
lapack = '' lapack = ''
elif spec['lapack'].name == 'intel-mkl' or \ elif spec['lapack'].name == 'intel-mkl' or \
spec['lapack'].name == 'intel-parallel-studio': spec['lapack'].name == 'intel-parallel-studio' or \
spec['lapack'].name == 'intel-oneapi-mkl':
lapack = 'mkl' lapack = 'mkl'
elif spec['lapack'].name == 'openblas': elif spec['lapack'].name == 'openblas':
lapack = 'openblas' lapack = 'openblas'