Skip to content

Commit db864bd

Browse files
format
1 parent 35756aa commit db864bd

File tree

3 files changed

+51
-35
lines changed

3 files changed

+51
-35
lines changed

src/LinearSolve.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,12 @@ end
9595

9696
@static if !isdefined(Base, :get_extension)
9797
function __init__()
98-
@require IterativeSolvers="b77e0a4c-d291-57a0-90e8-8db25a27a240" begin include("../ext/LinearSolveIterativeSolversExt.jl") end
99-
@require KrylovKit="0b1a1467-8014-51b9-945f-bf0ae24f4b77" begin include("../ext/LinearSolveKrylovKitExt.jl") end
98+
@require IterativeSolvers="b77e0a4c-d291-57a0-90e8-8db25a27a240" begin
99+
include("../ext/LinearSolveIterativeSolversExt.jl")
100+
end
101+
@require KrylovKit="0b1a1467-8014-51b9-945f-bf0ae24f4b77" begin
102+
include("../ext/LinearSolveKrylovKitExt.jl")
103+
end
100104
end
101105
end
102106

test/basictests.jl

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -200,27 +200,33 @@ end
200200
end
201201
end
202202

203-
@testset "Concrete Factorizations" begin for alg in (LUFactorization(),
204-
QRFactorization(),
205-
SVDFactorization(),
206-
RFLUFactorization())
207-
@testset "$alg" begin test_interface(alg, prob1, prob2) end
208-
end end
209-
210-
@testset "Generic Factorizations" begin for fact_alg in (lu, lu!,
211-
qr, qr!,
212-
cholesky,
213-
#cholesky!,
214-
#ldlt, ldlt!,
215-
bunchkaufman, bunchkaufman!,
216-
lq, lq!,
217-
svd, svd!,
218-
LinearAlgebra.factorize)
219-
@testset "fact_alg = $fact_alg" begin
220-
alg = GenericFactorization(fact_alg = fact_alg)
221-
test_interface(alg, prob1, prob2)
203+
@testset "Concrete Factorizations" begin
204+
for alg in (LUFactorization(),
205+
QRFactorization(),
206+
SVDFactorization(),
207+
RFLUFactorization())
208+
@testset "$alg" begin
209+
test_interface(alg, prob1, prob2)
210+
end
222211
end
223-
end end
212+
end
213+
214+
@testset "Generic Factorizations" begin
215+
for fact_alg in (lu, lu!,
216+
qr, qr!,
217+
cholesky,
218+
#cholesky!,
219+
#ldlt, ldlt!,
220+
bunchkaufman, bunchkaufman!,
221+
lq, lq!,
222+
svd, svd!,
223+
LinearAlgebra.factorize)
224+
@testset "fact_alg = $fact_alg" begin
225+
alg = GenericFactorization(fact_alg = fact_alg)
226+
test_interface(alg, prob1, prob2)
227+
end
228+
end
229+
end
224230

225231
@testset "KrylovJL" begin
226232
kwargs = (; gmres_restart = 5)
@@ -229,7 +235,9 @@ end
229235
("GMRES", KrylovJL_GMRES(kwargs...)),
230236
# ("BICGSTAB",KrylovJL_BICGSTAB(kwargs...)),
231237
("MINRES", KrylovJL_MINRES(kwargs...)))
232-
@testset "$(alg[1])" begin test_interface(alg[2], prob1, prob2) end
238+
@testset "$(alg[1])" begin
239+
test_interface(alg[2], prob1, prob2)
240+
end
233241
end
234242
end
235243

@@ -242,7 +250,9 @@ end
242250
# ("BICGSTAB",IterativeSolversJL_BICGSTAB(kwargs...)),
243251
# ("MINRES",IterativeSolversJL_MINRES(kwargs...)),
244252
)
245-
@testset "$(alg[1])" begin test_interface(alg[2], prob1, prob2) end
253+
@testset "$(alg[1])" begin
254+
test_interface(alg[2], prob1, prob2)
255+
end
246256
end
247257
end
248258
end
@@ -252,7 +262,9 @@ end
252262
for alg in (("Default", KrylovKitJL(kwargs...)),
253263
("CG", KrylovKitJL_CG(kwargs...)),
254264
("GMRES", KrylovKitJL_GMRES(kwargs...)))
255-
@testset "$(alg[1])" begin test_interface(alg[2], prob1, prob2) end
265+
@testset "$(alg[1])" begin
266+
test_interface(alg[2], prob1, prob2)
267+
end
256268
@test alg[2] isa KrylovKitJL
257269
end
258270
end

test/runtests.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ const GROUP = get(ENV, "GROUP", "All")
77
const HAS_EXTENSIONS = isdefined(Base, :get_extension)
88

99
if GROUP == "All" || GROUP == "Core"
10-
@time @safetestset "Basic Tests" begin include("basictests.jl") end
11-
@time @safetestset "Re-solve" begin include("resolve.jl") end
12-
@time @safetestset "Zero Initialization Tests" begin include("zeroinittests.jl") end
13-
@time @safetestset "Non-Square Tests" begin include("nonsquare.jl") end
14-
@time @safetestset "SparseVector b Tests" begin include("sparse_vector.jl") end
15-
@time @safetestset "Default Alg Tests" begin include("default_algs.jl") end
16-
@time @safetestset "Traits" begin include("traits.jl") end
10+
@time @safetestset "Basic Tests" include("basictests.jl")
11+
@time @safetestset "Re-solve" include("resolve.jl")
12+
@time @safetestset "Zero Initialization Tests" include("zeroinittests.jl")
13+
@time @safetestset "Non-Square Tests" include("nonsquare.jl")
14+
@time @safetestset "SparseVector b Tests" include("sparse_vector.jl")
15+
@time @safetestset "Default Alg Tests" include("default_algs.jl")
16+
@time @safetestset "Traits" include("traits.jl")
1717
end
1818

1919
if GROUP == "LinearSolveCUDA"
2020
Pkg.activate("gpu")
2121
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
2222
Pkg.instantiate()
23-
@time @safetestset "CUDA" begin include("gpu/cuda.jl") end
23+
@time @safetestset "CUDA" include("gpu/cuda.jl")
2424
end
2525

2626
if GROUP == "LinearSolvePardiso"
2727
Pkg.activate("pardiso")
2828
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
2929
Pkg.instantiate()
30-
@time @safetestset "Pardiso" begin include("pardiso/pardiso.jl") end
30+
@time @safetestset "Pardiso" include("pardiso/pardiso.jl")
3131
end
3232

3333
if (GROUP == "All" || GROUP == "LinearSolveHYPRE") && HAS_EXTENSIONS
34-
@time @safetestset "LinearSolveHYPRE" begin include("hypretests.jl") end
34+
@time @safetestset "LinearSolveHYPRE" include("hypretests.jl")
3535
end

0 commit comments

Comments
 (0)