Skip to content

Commit 5f66327

Browse files
KristofferCKristofferC
authored andcommitted
Revert "Update BLAS.vendor() to return :lbt"
This reverts commit e54b04a.
1 parent c39510e commit 5f66327

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

base/Base.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ end
161161
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "build_h.jl")) # include($BUILDROOT/base/build_h.jl)
162162
include(strcat((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "version_git.jl")) # include($BUILDROOT/base/version_git.jl)
163163

164-
# These used to be in build_h.jl and are retained for backwards compatibility
165-
const libblas_name = "libblastrampoline"
166-
const liblapack_name = "libblastrampoline"
167-
168164
# numeric operations
169165
include("hashing.jl")
170166
include("rounding.jl")

stdlib/LinearAlgebra/src/blas.jl

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ using LinearAlgebra: BlasReal, BlasComplex, BlasFloat, BlasInt, DimensionMismatc
7979

8080
include("lbt.jl")
8181

82-
vendor() = :lbt
83-
8482
"""
8583
get_config()
8684
@@ -91,6 +89,17 @@ Return an object representing the current `libblastrampoline` configuration.
9189
"""
9290
get_config() = lbt_get_config()
9391

92+
# We hard-lock `vendor()` to `openblas(64)` here to satisfy older code, but all new code should use
93+
# `get_config()` since it is now possible to have multiple vendors loaded at once.
94+
function vendor()
95+
Base.depwarn("`vendor()` is deprecated, use `BLAS.get_config()` and inspect the output instead", :vendor; force=true)
96+
if USE_BLAS64
97+
return :openblas64
98+
else
99+
return :openblas
100+
end
101+
end
102+
94103
if USE_BLAS64
95104
macro blasfunc(x)
96105
return Expr(:quote, Symbol(x, "64_"))

0 commit comments

Comments
 (0)