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

Fix external numpy package support (#13197)

Browse Source
This commit is contained in:
Adam J. Stewart 2019-10-12 20:21:03 -05:00 committed by GitHub
parent 3df6b05c04
commit 41e0b069d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ def setup_environment(self, spack_env, run_env):
spec = self.spec spec = self.spec
# https://numpy.org/devdocs/user/building.html#blas # https://numpy.org/devdocs/user/building.html#blas
if '~blas' 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':
@ -222,7 +222,7 @@ def setup_environment(self, spack_env, run_env):
spack_env.set('NPY_BLAS_ORDER', blas) spack_env.set('NPY_BLAS_ORDER', blas)
# https://numpy.org/devdocs/user/building.html#lapack # https://numpy.org/devdocs/user/building.html#lapack
if '~lapack' 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':