8000 BLD: restore the `scipy-openblas` handling [wheel build] · numpy/numpy@0616e86 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0616e86

Browse files
committed
BLD: restore the scipy-openblas handling [wheel build]
1 parent 6f08934 commit 0616e86

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

numpy/meson.build

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ mkl_may_use_sdl = not use_ilp64 and _threading_opt in ['auto', 'iomp']
8989

9090
# Note that we can only use a BLAS which provides a CBLAS interface. So disable
9191
# BLAS completely if CBLAS is not found.
92+
93+
# First try scipy-openblas, and if found don't look for cblas or lapack, we
94+
# know what's inside the scipy-openblas wheels already.
95+
if blas_name == 'openblas' or blas_name == 'auto'
96+
blas = dependency('scipy-openblas', required: false)
97+
if blas.found()
98+
blas_name = 'scipy-openblas'
99+
endif
100+
endif
92101
if blas_name == 'auto'
93102
foreach _name : get_option('blas-order')
94103
if _name == 'mkl'
@@ -158,7 +167,7 @@ else
158167
endif
159168
endif
160169

161-
if 'mkl' in blas.name() or blas.name() == 'accelerate'
170+
if 'mkl' in blas.name() or blas.name() == 'accelerate' or blas_name == 'scipy-openblas'
162171
# For these libraries we know that they contain LAPACK, and it's desirable to
163172
# use that - no need to run the full detection twice.
164173
lapack = blas

0 commit comments

Comments
 (0)
0