Skip to content

Commit e646342

Browse files
authored
Merge pull request #103 from JuliaSparse/jf/MKL2025
Allow for MKL v2025 and remove superfluous loading of libblas and libgomp under linux
2 parents 582c08b + 9eb2fe5 commit e646342

File tree

4 files changed

+46
-24
lines changed

4 files changed

+46
-24
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
version: ${{ matrix.version }}
3232
arch: ${{ matrix.arch }}
33-
- uses: actions/cache@v1
33+
- uses: julia-actions/cache@v2
3434
env:
3535
cache-name: cache-artifacts
3636
with:

CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Changelog
2+
3+
## [1.0.0] - 2025-01-24
4+
5+
### Breaking
6+
7+
- MKL v2025 dropped 32bit support. If 32bit support is needed, pin MKL to v2024.
8+
9+
### Features
10+
11+
- Allow for MKL v2025
12+
- Bump version to 1.0
13+
- Remove superfluous loading of libblas and libgomp under linux
14+
- add Changelog
15+
16+
## [0.5.6] - 2024-03-04
17+
18+
### Features
19+
20+
- Adaptations for Panua Pardiso (#75)
21+
22+
## [0.5.5] - 2024-02-24
23+
24+
### Features
25+
26+
- Bump MKL compat
27+
- Try to pin MKL_jll to 2023 for macOS.
28+
- introduces Pardiso.mkl_is_available()
29+
- adaptations to use MKL Pardiso from locally installes oneAPI
30+
31+
## [0.5.4] - 2022-03-01
32+
33+
### Features
34+
35+
- Update to allow MKL 2022
36+
37+
## [0.5.2] - 2021-07-09
38+
39+
### Features
40+
41+
- Allow StridedVecOrMat for RHS
42+
- Use MKL_jll if MKLROOT is not set
43+
- Drop support for pardiso version 5

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Pardiso"
22
uuid = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
33
repo = "https://github.com/JuliaSparse/Pardiso.jl.git"
4-
version = "0.5.7"
4+
version = "1.0.0"
55

66
[deps]
77
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -10,7 +10,7 @@ MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
1010
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1111

1212
[compat]
13-
MKL_jll = "2021, 2022, 2023, 2024"
13+
MKL_jll = "2021, 2022, 2023, 2024, 2025"
1414
julia = "1.6"
1515

1616
[extras]

src/Pardiso.jl

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -166,27 +166,6 @@ function __init__()
166166
pardiso_chkvec_z[] = Libdl.dlsym(libpardiso, "pardiso_chkvec_z")
167167
pardiso_get_schur_f[] = Libdl.dlsym(libpardiso, "pardiso_get_schur")
168168

169-
if Sys.isunix()
170-
gfortran_v = [8, 9]
171-
for lib in ("libgfortran", "libgomp")
172-
load_lib_fortran(lib, gfortran_v)
173-
end
174-
end
175-
176-
# Windows Pardiso lib comes with BLAS + LAPACK prebaked but not on UNIX so we open them here
177-
# if not MKL is loaded
178-
if Sys.isunix()
179-
ptr = C_NULL
180-
for l in ("libblas", "libblas.so.3")
181-
ptr = Libdl.dlopen_e(l, Libdl.RTLD_GLOBAL)
182-
if ptr !== C_NULL
183-
break
184-
end
185-
end
186-
if ptr == C_NULL
187-
error("could not load blas library")
188-
end
189-
end
190169
PARDISO_LOADED[] = true
191170
catch e
192171
@error("Pardiso did not manage to load, error thrown was: $(sprint(showerror, e))")

0 commit comments

Comments
 (0)