diff --git a/base/Base.jl b/base/Base.jl index ddd1f6c9c2770..5a5fa684474e2 100644 --- a/base/Base.jl +++ b/base/Base.jl @@ -161,6 +161,10 @@ end include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "build_h.jl")) # include($BUILDROOT/base/build_h.jl) include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "version_git.jl")) # include($BUILDROOT/base/version_git.jl) +# These used to be in build_h.jl and are retained for backwards compatibility +const libblas_name = "libblastrampoline" +const liblapack_name = "libblastrampoline" + # numeric operations include("hashing.jl") include("rounding.jl") diff --git a/stdlib/LinearAlgebra/src/blas.jl b/stdlib/LinearAlgebra/src/blas.jl index e8d44c1ae1533..9a85f770db8b9 100644 --- a/stdlib/LinearAlgebra/src/blas.jl +++ b/stdlib/LinearAlgebra/src/blas.jl @@ -79,6 +79,8 @@ using LinearAlgebra: BlasReal, BlasComplex, BlasFloat, BlasInt, DimensionMismatc include("lbt.jl") +vendor() = :lbt + """ get_config() @@ -89,17 +91,6 @@ Return an object representing the current `libblastrampoline` configuration. """ get_config() = lbt_get_config() -# We hard-lock `vendor()` to `openblas(64)` here to satisfy older code, but all new code should use -# `get_config()` since it is now possible to have multiple vendors loaded at once. -function vendor() - Base.depwarn("`vendor()` is deprecated, use `BLAS.get_config()` and inspect the output instead", :vendor; force=true) - if USE_BLAS64 - return :openblas64 - else - return :openblas - end -end - if USE_BLAS64 macro blasfunc(x) return Expr(:quote, Symbol(x, "64_"))