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

Exclude system mkl installs from numpy (#10383)

Browse Source 
Fixes #10361
Fixes #6634

When mkl isnt in the spec, still write an explicit mkl entry to
prevent numpy from looking in system dirs and using a system install
of mkl. Do the same for openblas and atlas (although mkl was the only
system install reported to interfere with Spack's choice).
This commit is contained in:
Peter Scheibel 2019-01-22 12:18:54 -06:00 committed by GitHub
parent 636d6007ba
commit c0972a3260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,11 @@ def write_library_dirs(f, dirs):
lapackblas_info = lapack_info + blas_info
def write_empty_libs(f, provider):
f.write('[{0}]\n'.format(provider))
f.write('libraries=\n')
write_library_dirs(f, '')
if '+blas' in spec or '+lapack' in spec:
# note that one should not use [blas_opt] and [lapack_opt], see
# https://github.com/numpy/numpy/commit/ffd4332262ee0295cb942c94ed124f043d801eb6
@ -99,13 +104,19 @@ def write_library_dirs(f, dirs):
lapackblas_names = ','.join(lapackblas_info.names)
lapackblas_dirs = ':'.join(lapackblas_info.directories)
handled_blas_and_lapack = False
# Special treatment for some (!) BLAS/LAPACK. Note that
# in this case library_dirs can not be specified within [ALL].
if '^openblas' in spec:
f.write('[openblas]\n')
f.write('libraries=%s\n' % lapackblas_names)
write_library_dirs(f, lapackblas_dirs)
elif '^mkl' in spec:
handled_blas_and_lapack = True
else:
write_empty_libs(f, 'openblas')
if '^mkl' in spec:
# numpy does not expect system libraries needed for MKL
# here.
# names = [x for x in names if x.startswith('mkl')]
@ -124,11 +135,22 @@ def write_library_dirs(f, dirs):
f.write('[mkl]\n')
f.write('mkl_libs=%s\n' % 'mkl_rt')
write_library_dirs(f, lapackblas_dirs)
elif '^atlas' in spec:
handled_blas_and_lapack = True
else:
# Without explicitly setting the search directories to be
# an empty list, numpy may retrieve and use mkl libs from
# the system.
write_empty_libs(f, 'mkl')
if '^atlas' in spec:
f.write('[atlas]\n')
f.write('atlas_libs=%s\n' % lapackblas_names)
write_library_dirs(f, lapackblas_dirs)
elif '^netlib-lapack' in spec:
handled_blas_and_lapack = True
else:
write_empty_libs(f, 'atlas')
if '^netlib-lapack' in spec:
# netlib requires blas and lapack listed
# separately so that scipy can find them
if spec.satisfies('+blas'):
@ -139,7 +161,9 @@ def write_library_dirs(f, dirs):
f.write('[lapack]\n')
f.write('lapack_libs=%s\n' % lapack_names)
write_library_dirs(f, lapack_dirs)
else:
handled_blas_and_lapack = True
if not handled_blas_and_lapack:
# The section title for the defaults changed in @1.10, see
# https://github.com/numpy/numpy/blob/master/site.cfg.example
if spec.satisfies('@:1.9.2'):