Skip to content

Commit 285e87f

Browse files
committed
Test MUMPS_seq_jll
1 parent cce74aa commit 285e87f

6 files changed

Lines changed: 21 additions & 123 deletions

File tree

.github/workflows/Documentation.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: ['1.6', '1']
17-
os: [ubuntu-latest, macOS-latest]
17+
os: [ubuntu-latest, macOS-latest, windows-latest]
1818
arch: [x64]
1919
allow_failure: [false]
2020
include:
@@ -26,6 +26,10 @@ jobs:
2626
os: macOS-latest
2727
arch: x64
2828
allow_failure: true
29+
- version: 'nightly'
30+
os: windows-latest
31+
arch: x64
32+
allow_failure: true
2933
steps:
3034
- uses: actions/checkout@v2
3135
- uses: julia-actions/setup-julia@v1

.github/workflows/ci_M1.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/ci_homebrew.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
name = "MUMPS"
22
uuid = "55d2b088-9f4e-11e9-26c0-150b02ea6a46"
3-
authors = ["Dominique Orban <dominique.orban@gmail.com>","William R Sweeney <wrsweeney2@gmail.com>", "Alexis Montoison <alexis.montoison@polymtl.ca >"]
3+
authors = ["Dominique Orban <dominique.orban@gmail.com>", "William R Sweeney <wrsweeney2@gmail.com>", "Alexis Montoison <alexis.montoison@polymtl.ca >"]
44
version = "1.3.0"
55

66
[deps]
77
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
88
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
99
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
10-
MUMPS_jll = "ca64183c-ec4f-5579-95d5-17e128c21291"
10+
MUMPS_seq_jll = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d"
11+
OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2"
1112
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1213

1314
[compat]
1415
MPI = "^0.19"
15-
MUMPS_jll = "= 5.5.1"
16-
1716
julia = "^1.6"
17+
MUMPS_seq_jll = "= 5.5.1"
1818

1919
[extras]
2020
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/MUMPS.jl

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,21 @@ if haskey(ENV, "JULIA_MUMPS_LIBRARY_PATH")
4141
const libmumps_common = joinpath(ENV["JULIA_MUMPS_LIBRARY_PATH"], "libmumps_common.$dlext")
4242
const MUMPS_INSTALLATION = "CUSTOM"
4343
else
44-
using MUMPS_jll
44+
using MUMPS_seq_jll
4545
const MUMPS_INSTALLATION = "YGGDRASIL"
4646
end
4747

48+
using OpenBLAS32_jll
49+
50+
function __init__()
51+
if VERSION v"1.7"
52+
config = LinearAlgebra.BLAS.lbt_get_config()
53+
if !any(lib -> lib.interface == :lp64, config.loaded_libs)
54+
LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path)
55+
end
56+
end
57+
end
58+
4859
include("mumps_types.jl")
4960
include("mumps_struc.jl")
5061
include("interface.jl")

0 commit comments

Comments
 (0)