Skip to content

Commit 45887cc

Browse files
authored
Backport #781 to 3.12 (#783)
* Disable use of older MKL_jll versions (#781) * Bump version number to 3.12.1
1 parent 684a483 commit 45887cc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "LinearSolve"
22
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
33
authors = ["SciML"]
4-
version = "3.12.0"
4+
version = "3.12.1"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -93,6 +93,7 @@ KrylovPreconditioners = "0.3"
9393
LazyArrays = "1.8, 2"
9494
Libdl = "1.10"
9595
LinearAlgebra = "1.10"
96+
MKL_jll = "2019, 2020, 2021, 2022, 2023, 2024, 2025"
9697
MPI = "0.20"
9798
Markdown = "1.10"
9899
Metal = "1"

src/LinearSolve.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ const CRC = ChainRulesCore
4242
@static if Sys.ARCH === :x86_64 || Sys.ARCH === :i686
4343
if Preferences.@load_preference("LoadMKL_JLL",
4444
!occursin("EPYC", Sys.cpu_info()[1].model))
45+
# MKL_jll < 2022.2 doesn't support the mixed LP64 and ILP64 interfaces that we make use of in LinearSolve
46+
# In particular, the `_64` APIs do not exist
47+
# https://www.intel.com/content/www/us/en/developer/articles/release-notes/onemkl-release-notes-2022.html
4548
using MKL_jll
46-
const usemkl = MKL_jll.is_available()
49+
const usemkl = MKL_jll.is_available() && pkgversion(MKL_jll) >= v"2022.2"
4750
else
4851
const usemkl = false
4952
end

0 commit comments

Comments
 (0)