Skip to content

Commit f393599

Browse files
committed
Avoid deprecated BLAS.vendor() in MKL conflict check
Patch as suggested by Carsten Bauer in JuliaPy#922. GitHub: Fixes JuliaPy#922.
1 parent e3e3008 commit f393599

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/numpy.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ function npyinitialize()
6464
numpy = pyimport("numpy")
6565

6666
# emit a warning if both Julia and NumPy are linked with MKL (#433)
67-
if LinearAlgebra.BLAS.vendor() === :mkl &&
68-
LinearAlgebra.BLAS.BlasInt === Int64 && hasproperty(numpy, "__config__")
67+
julia_mkl = any(contains("mkl"), getfield.(BLAS.get_config().loaded_libs, :libname))
68+
if julia_mkl && LinearAlgebra.BLAS.BlasInt === Int64 && hasproperty(numpy, "__config__")
6969
config = numpy."__config__"
7070
if hasproperty(config, "blas_opt_info")
7171
blaslibs = get(config."blas_opt_info", Vector{String}, "libraries", String[])

0 commit comments

Comments
 (0)