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

Test MUMPS_seq_jll #107

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
24 changes: 0 additions & 24 deletions .github/workflows/Documentation.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ['1.6', '1']
os: [ubuntu-latest, macOS-latest]
version: ['1']
os: [ubuntu-latest, macOS-latest, windows-latest]
arch: [x64]
allow_failure: [false]
include:
Expand All @@ -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
Expand Down
62 changes: 0 additions & 62 deletions .github/workflows/ci_homebrew.yml

This file was deleted.

11 changes: 6 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
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 = "= 500.500.101"

[extras]
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["LinearAlgebra", "MPI", "SparseArrays", "Test"]
test = ["Random", "LinearAlgebra", "MPI", "SparseArrays", "Test"]
13 changes: 12 additions & 1 deletion src/MUMPS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 3 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using Test

using Random
using LinearAlgebra
using MPI
using MUMPS
using SparseArrays

Random.seed!(666) # Random tests are diabolical

@info("MUMPS_INSTALLATION: $(MUMPS.MUMPS_INSTALLATION)")

function random_matrix(t, σ, nrow, ncol)
Expand Down