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

Import CpuId only on x86_64 or i686 #521

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Import CpuId only on x86_64 or i686 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf0e254
CpuId can only be loaded on x86
chriselrod Jul 30, 2024
50a9af1
Bump patch
chriselrod Jul 30, 2024
0a500bf
ignore CpuId for statle deps
chriselrod Jul 30, 2024
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "LinearSolve"
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
authors = ["SciML"]
version = "2.31.0"
version = "2.31.1"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
Expand Down
13 changes: 8 additions & 5 deletions src/LinearSolve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,16 @@ import PrecompileTools
import Krylov
using SciMLBase
import Preferences
import CpuId

const CRC = ChainRulesCore

if Preferences.@load_preference("LoadMKL_JLL", !occursin("EPYC", CpuId.cpubrand()))
using MKL_jll
const usemkl = MKL_jll.is_available()
@static if Sys.ARCH === :x86_64 || Sys.ARCH === :i686
import CpuId
if Preferences.@load_preference("LoadMKL_JLL", !occursin("EPYC", CpuId.cpubrand()))
using MKL_jll
const usemkl = MKL_jll.is_available()
else
const usemkl = false
end
else
const usemkl = false
end
Expand Down
2 changes: 1 addition & 1 deletion test/qa.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using LinearSolve, Aqua
Aqua.test_piracies(LinearSolve,
treat_as_own = [LinearProblem])
Aqua.test_project_extras(LinearSolve)
Aqua.test_stale_deps(LinearSolve, ignore = [:MKL_jll])
Aqua.test_stale_deps(LinearSolve, ignore = [:MKL_jll, :CpuId])
Aqua.test_unbound_args(LinearSolve)
Aqua.test_undefined_exports(LinearSolve)
end
Loading