Test MUMPS_seq_jll

JuliaSmoothOptimizers · Aug 28, 2022 · 285e87f · 285e87f
1 parent cce74aa
commit 285e87f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 123 deletions.
diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['1.6', '1']
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
         arch: [x64]
         allow_failure: [false]
         include:
@@ -26,6 +26,10 @@ jobs:
             os: macOS-latest
             arch: x64
             allow_failure: true
+          - version: 'nightly'
+            os: windows-latest
+            arch: x64
+            allow_failure: true
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1

diff --git a/.github/workflows/ci_M1.yml b/.github/workflows/ci_M1.yml
diff --git a/.github/workflows/ci_homebrew.yml b/.github/workflows/ci_homebrew.yml
diff --git a/Project.toml b/Project.toml
@@ -1,20 +1,20 @@
 name = "MUMPS"
 uuid = "55d2b088-9f4e-11e9-26c0-150b02ea6a46"
-authors = ["Dominique Orban <dominique.orban@gmail.com>","William R Sweeney <wrsweeney2@gmail.com>", "Alexis Montoison <alexis.montoison@polymtl.ca >"]
+authors = ["Dominique Orban <dominique.orban@gmail.com>", "William R Sweeney <wrsweeney2@gmail.com>", "Alexis Montoison <alexis.montoison@polymtl.ca >"]
 version = "1.3.0"
 
 [deps]
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
-MUMPS_jll = "ca64183c-ec4f-5579-95d5-17e128c21291"
+MUMPS_seq_jll = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d"
+OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
 MPI = "^0.19"
-MUMPS_jll = "= 5.5.1"
-
 julia = "^1.6"
+MUMPS_seq_jll = "= 5.5.1"
 
 [extras]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

diff --git a/src/MUMPS.jl b/src/MUMPS.jl
@@ -41,10 +41,21 @@ if haskey(ENV, "JULIA_MUMPS_LIBRARY_PATH")
   const libmumps_common = joinpath(ENV["JULIA_MUMPS_LIBRARY_PATH"], "libmumps_common.$dlext")
   const MUMPS_INSTALLATION = "CUSTOM"
 else
-  using MUMPS_jll
+  using MUMPS_seq_jll
   const MUMPS_INSTALLATION = "YGGDRASIL"
 end
 
+using OpenBLAS32_jll
+
+function __init__()
+  if VERSION ≥ v"1.7"
+    config = LinearAlgebra.BLAS.lbt_get_config()
+    if !any(lib -> lib.interface == :lp64, config.loaded_libs)
+      LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path)
+    end
+  end
+end
+
 include("mumps_types.jl")
 include("mumps_struc.jl")
 include("interface.jl")