Skip to content

Commit

Permalink
Revert "Update BLAS.vendor() to return :lbt"
Browse files Browse the repository at this point in the history
This reverts commit e54b04a.
  • Loading branch information
KristofferC authored and KristofferC committed Mar 7, 2022
1 parent c39510e commit 5f66327
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
4 changes: 0 additions & 4 deletions base/Base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,6 @@ 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")
Expand Down
13 changes: 11 additions & 2 deletions stdlib/LinearAlgebra/src/blas.jl
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ using LinearAlgebra: BlasReal, BlasComplex, BlasFloat, BlasInt, DimensionMismatc

include("lbt.jl")

vendor() = :lbt

"""
get_config()
Expand All @@ -91,6 +89,17 @@ 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_"))
Expand Down

0 comments on commit 5f66327

Please sign in to comment.