Add tests

SciML · Aug 25, 2023 · e1cd2f6 · e1cd2f6
1 parent 4f50487
commit e1cd2f6
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -94,4 +94,4 @@ SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "MKL_jll"]
+test = ["Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "MKL_jll", "BlockDiagonals"]
diff --git a/src/simplegmres.jl b/src/simplegmres.jl
@@ -169,6 +169,7 @@ function _init_cacheval(::Val{false}, alg::SimpleGMRES, A, b, u, Pl, Pr, maxiter
     q = PlisI ? similar(u, 0) : similar(u, n)
     p = PrisI ? similar(u, 0) : similar(u, n)
     x = u
+    x .= zero(T)
 
     w = similar(u, n)
     V = [similar(u) for _ in 1:memory]
@@ -398,6 +399,7 @@ function _init_cacheval(::Val{true}, alg::SimpleGMRES, A, b, u, Pl, Pr, maxiters
     q = PlisI ? similar(u, 0) : similar(u, n)
     p = PrisI ? similar(u, 0) : similar(u, n)
     x = u
+    x .= zero(T)
 
     w = similar(u, n)
     V = [similar(u) for _ in 1:memory]

diff --git a/test/basictests.jl b/test/basictests.jl
@@ -235,6 +235,10 @@ end
         end
     end
 
+    @testset "Simple GMRES: restart = $restart" for restart in (true, false)
+        test_interface(SimpleGMRES(; restart), prob1, prob2)
+    end
+
     @testset "KrylovJL" begin
         kwargs = (; gmres_restart = 5)
         for alg in (("Default", KrylovJL(kwargs...)),
@@ -412,7 +416,7 @@ end
 
         @testset "DirectLdiv!" begin
             function get_operator(A, u; add_inverse = true)
-                
+
                 function f(u, p, t)
                     println("using FunctionOperator OOP mul")
                     A * u
@@ -470,3 +474,28 @@ lp = LinearProblem(A, b; u0 = view(u0, :));
 truesol = solve(lp, LUFactorization())
 krylovsol = solve(lp, KrylovJL_GMRES())
 @test truesol ≈ krylovsol
+
+# Block Diagonals
+using BlockDiagonals
+
+@testset "Block Diagonal Specialization" begin
+    A = BlockDiagonal([rand(2, 2) for _ in 1:3])
+    b = rand(size(A, 1))
+
+    if VERSION > v"1.9-"
+        x1 = zero(b)
+        x2 = zero(b)
+        prob1 = LinearProblem(A, b, x1)
+        prob2 = LinearProblem(A, b, x2)
+        test_interface(SimpleGMRES(), prob1, prob2)
+    end
+
+    x1 = zero(b)
+    x2 = zero(b)
+    prob1 = LinearProblem(Array(A), b, x1)
+    prob2 = LinearProblem(Array(A), b, x2)
+
+    test_interface(SimpleGMRES(; blocksize=2), prob1, prob2)
+
+    @test solve(prob1, SimpleGMRES(; blocksize=2)).u ≈ solve(prob2, SimpleGMRES()).u
+end
diff --git a/test/gpu/Project.toml b/test/gpu/Project.toml
@@ -1,4 +1,5 @@
 [deps]
+BlockDiagonals = "0a1fb500-61f7-11e9-3c65-f5ef3456f9f0"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"

diff --git a/test/gpu/cuda.jl b/test/gpu/cuda.jl
@@ -42,10 +42,32 @@ function test_interface(alg, prob1, prob2)
     return
 end
 
-test_interface(CudaOffloadFactorization(), prob1, prob2)
+@testset "CudaOffloadFactorization" begin
+    test_interface(CudaOffloadFactorization(), prob1, prob2)
+end
+
+@testset "Simple GMRES: restart = $restart" for restart in (true, false)
+    test_interface(SimpleGMRES(; restart), prob1, prob2)
+end
 
 A1 = prob1.A;
 b1 = prob1.b;
 x1 = prob1.u0;
 y = solve(prob1)
 @test A1 * y ≈ b1
+
+using BlockDiagonals
+
+@testset "Block Diagonal Specialization" begin
+    A = BlockDiagonal([rand(2, 2) for _ in 1:3]) |> cu
+    b = rand(size(A, 1)) |> cu
+
+    x1 = zero(b)
+    x2 = zero(b)
+    prob1 = LinearProblem(A, b, x1)
+    prob2 = LinearProblem(A, b, x2)
+
+    test_interface(SimpleGMRES(; blocksize=2), prob1, prob2)
+
+    @test solve(prob1, SimpleGMRES(; blocksize=2)).u ≈ solve(prob2, SimpleGMRES()).u
+end