Merge pull request #537 from halentin/main

Remove CpuId-Dependency in favor of builtin function
SciML · Aug 28, 2024 · f43aaf2 · f43aaf2
2 parents 1c30db0 + ecdf424
commit f43aaf2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -7,7 +7,6 @@ version = "2.33.0"
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
 FastLapackInterface = "29a986be-02c6-4525-aec4-84b980013641"
@@ -73,7 +72,6 @@ CUDA = "5"
 CUDSS = "0.1, 0.2, 0.3"
 ChainRulesCore = "1.22"
 ConcreteStructs = "0.2.3"
-CpuId = "0.3.1"
 DocStringExtensions = "0.9.3"
 EnumX = "1.0.4"
 Enzyme = "0.11.15, 0.12"

diff --git a/src/LinearSolve.jl b/src/LinearSolve.jl
@@ -45,8 +45,7 @@ import PrecompileTools
 const CRC = ChainRulesCore
 
 @static if Sys.ARCH === :x86_64 || Sys.ARCH === :i686
-    import CpuId
-    if Preferences.@load_preference("LoadMKL_JLL", !occursin("EPYC", CpuId.cpubrand()))
+    if Preferences.@load_preference("LoadMKL_JLL", !occursin("EPYC", Sys.cpu_info()[1].model))
         using MKL_jll
         const usemkl = MKL_jll.is_available()
     else

diff --git a/test/qa.jl b/test/qa.jl
@@ -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, :CpuId])
+    Aqua.test_stale_deps(LinearSolve, ignore = [:MKL_jll])
     Aqua.test_unbound_args(LinearSolve)
     Aqua.test_undefined_exports(LinearSolve)
 end