Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[LinearAlgebra] Improve resilience to unknown libblastrampoline flags #54781

Merged
merged 1 commit into from
Jun 13, 2024
Merged

[LinearAlgebra] Improve resilience to unknown libblastrampoline flags #54781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions stdlib/LinearAlgebra/src/lbt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@ struct lbt_library_info_t
f2c::Int32
cblas::Int32
end

macro get_warn(map, key)
return quote
if !haskey($(esc(map)), $(esc(key)))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor style nitpicking: I personally prefer reading positive conditions if there's an else branch anyway, but it's a matter of taste probably.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, I like having the "exceptional" circumstance as explicit as possible, as that's the whole point of this method.

@warn(string("[LBT] Unknown key into ", $(string(map)), ": ", $(esc(key)), ", defaulting to :unknown"))
# All the unknown values share a common value: `-1`
$(esc(map))[$(esc(LBT_INTERFACE_UNKNOWN))]
else
$(esc(map))[$(esc(key))]
end
end
end

const LBT_INTERFACE_LP64 = 32
const LBT_INTERFACE_ILP64 = 64
const LBT_INTERFACE_UNKNOWN = -1
Expand All @@ -35,10 +48,12 @@ const LBT_INV_F2C_MAP = Dict(v => k for (k, v) in LBT_F2C_MAP)

const LBT_COMPLEX_RETSTYLE_NORMAL = 0
const LBT_COMPLEX_RETSTYLE_ARGUMENT = 1
const LBT_COMPLEX_RETSTYLE_FNDA = 2
const LBT_COMPLEX_RETSTYLE_UNKNOWN = -1
const LBT_COMPLEX_RETSTYLE_MAP = Dict(
LBT_COMPLEX_RETSTYLE_NORMAL => :normal,
LBT_COMPLEX_RETSTYLE_ARGUMENT => :argument,
LBT_COMPLEX_RETSTYLE_FNDA => :float_normal_double_argument,
LBT_COMPLEX_RETSTYLE_UNKNOWN => :unknown,
)
const LBT_INV_COMPLEX_RETSTYLE_MAP = Dict(v => k for (k, v) in LBT_COMPLEX_RETSTYLE_MAP)
Expand Down Expand Up @@ -69,10 +84,10 @@ struct LBTLibraryInfo
lib_info.handle,
unsafe_string(lib_info.suffix),
unsafe_wrap(Vector{UInt8}, lib_info.active_forwards, div(num_exported_symbols,8)+1),
LBT_INTERFACE_MAP[lib_info.interface],
LBT_COMPLEX_RETSTYLE_MAP[lib_info.complex_retstyle],
LBT_F2C_MAP[lib_info.f2c],
LBT_CBLAS_MAP[lib_info.cblas],
@get_warn(LBT_INTERFACE_MAP, lib_info.interface),
@get_warn(LBT_COMPLEX_RETSTYLE_MAP, lib_info.complex_retstyle),
@get_warn(LBT_F2C_MAP, lib_info.f2c),
@get_warn(LBT_CBLAS_MAP, lib_info.cblas),
)
end
end
Expand Down