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.

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

Allow for MKL v2025 and remove superfluous loading of libblas and libgomp under linux #103

Merged
merged 6 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
- uses: julia-actions/cache@v2
env:
cache-name: cache-artifacts
with:
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Changelog

## [1.0.0] - 2025-01-24

### Breaking

- MKL v2025 dropped 32bit support. If 32bit support is needed, pin MKL to v2024.

### Features

- Allow for MKL v2025
- Bump version to 1.0
- Remove superfluous loading of libblas and libgomp under linux
- add Changelog

## [0.5.6] - 2024-03-04

### Features

- Adaptations for Panua Pardiso (#75)

## [0.5.5] - 2024-02-24

### Features

- Bump MKL compat
- Try to pin MKL_jll to 2023 for macOS.
- introduces Pardiso.mkl_is_available()
- adaptations to use MKL Pardiso from locally installes oneAPI

## [0.5.4] - 2022-03-01

### Features

- Update to allow MKL 2022

## [0.5.2] - 2021-07-09

### Features

- Allow StridedVecOrMat for RHS
- Use MKL_jll if MKLROOT is not set
- Drop support for pardiso version 5
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Pardiso"
uuid = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
repo = "https://github.com/JuliaSparse/Pardiso.jl.git"
version = "0.5.7"
version = "1.0.0"

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

[compat]
MKL_jll = "2021, 2022, 2023, 2024"
MKL_jll = "2021, 2022, 2023, 2024, 2025"
julia = "1.6"

[extras]
Expand Down
21 changes: 0 additions & 21 deletions src/Pardiso.jl
Original file line number Diff line number Diff line change
Expand Up @@ -166,27 +166,6 @@ function __init__()
pardiso_chkvec_z[] = Libdl.dlsym(libpardiso, "pardiso_chkvec_z")
pardiso_get_schur_f[] = Libdl.dlsym(libpardiso, "pardiso_get_schur")

if Sys.isunix()
gfortran_v = [8, 9]
for lib in ("libgfortran", "libgomp")
load_lib_fortran(lib, gfortran_v)
end
end

# Windows Pardiso lib comes with BLAS + LAPACK prebaked but not on UNIX so we open them here
# if not MKL is loaded
if Sys.isunix()
ptr = C_NULL
for l in ("libblas", "libblas.so.3")
ptr = Libdl.dlopen_e(l, Libdl.RTLD_GLOBAL)
if ptr !== C_NULL
break
end
end
if ptr == C_NULL
error("could not load blas library")
end
end
PARDISO_LOADED[] = true
catch e
@error("Pardiso did not manage to load, error thrown was: $(sprint(showerror, e))")
Expand Down
Loading