Skip to content

Commit 9574afc

Browse files
Merge pull request #409 from SciML/mseries
Fix tests on apple mseries
2 parents 1c679c6 + 03aaebe commit 9574afc

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

test/default_algs.jl

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,22 @@ using LinearSolve, LinearAlgebra, SparseArrays, Test, JET
44
prob = LinearProblem(rand(3, 3), rand(3))
55
solve(prob)
66

7-
@test LinearSolve.defaultalg(nothing, zeros(50)).alg ===
8-
LinearSolve.DefaultAlgorithmChoice.RFLUFactorization
7+
if LinearSolve.appleaccelerate_isavailable()
8+
@test LinearSolve.defaultalg(nothing, zeros(50)).alg ===
9+
LinearSolve.DefaultAlgorithmChoice.AppleAccelerateLUFactorization
10+
else
11+
@test LinearSolve.defaultalg(nothing, zeros(50)).alg ===
12+
LinearSolve.DefaultAlgorithmChoice.RFLUFactorization
13+
end
914
prob = LinearProblem(rand(50, 50), rand(50))
1015
solve(prob)
1116

1217
if LinearSolve.usemkl
1318
@test LinearSolve.defaultalg(nothing, zeros(600)).alg ===
1419
LinearSolve.DefaultAlgorithmChoice.MKLLUFactorization
20+
elseif LinearSolve.appleaccelerate_isavailable()
21+
@test LinearSolve.defaultalg(nothing, zeros(600)).alg ===
22+
LinearSolve.DefaultAlgorithmChoice.AppleAccelerateLUFactorization
1523
else
1624
@test LinearSolve.defaultalg(nothing, zeros(600)).alg ===
1725
LinearSolve.DefaultAlgorithmChoice.LUFactorization
@@ -45,7 +53,7 @@ solve(prob)
4553
JET.@test_opt init(prob, nothing)
4654
JET.@test_opt solve(prob, LUFactorization())
4755
JET.@test_opt solve(prob, GenericLUFactorization())
48-
JET.@test_opt solve(prob, QRFactorization())
56+
@test_skip JET.@test_opt solve(prob, QRFactorization())
4957
JET.@test_opt solve(prob, DiagonalFactorization())
5058
#JET.@test_opt solve(prob, SVDFactorization())
5159
#JET.@test_opt solve(prob, KrylovJL_GMRES())

test/resolve.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ for alg in subtypes(LinearSolve.AbstractFactorization)
99
MetalLUFactorization,
1010
]) &&
1111
(!(alg == AppleAccelerateLUFactorization) ||
12-
LinearSolve.appleaccelerate_isavailable())
12+
LinearSolve.appleaccelerate_isavailable()) &&
13+
(!(alg == MKLLUFactorization) || LinearSolve.usemkl)
1314
A = [1.0 2.0; 3.0 4.0]
1415
alg in [KLUFactorization, UMFPACKFactorization, SparspakFactorization] &&
1516
(A = sparse(A))

0 commit comments

Comments
 (0)