krylov.jl wrapper working

Author: vpuri3

src/LinearSolve.jl

@@ -25,7 +25,7 @@ include("wrappers.jl")
 
 export DefaultLinSolve
 export LUFactorization, SVDFactorization, QRFactorization
-export KrylovJL #, KrylovJL_CG, KrylovJL_GMRES, KrylovJL_BICGSTAB
+export KrylovJL, KrylovJL_CG, KrylovJL_GMRES, KrylovJL_BICGSTAB
 export IterativeSolversJL #, IterativeSolversJL_CG, IterativeSolversJL_GMRES,
        #IterativeSolversJL_BICGSTAB
 export KrylovKitJL #, KrylovKitJL_CG, KrylovKitJL_GMRES, KrylovKitJL_BICGSTAB

src/common.jl

@@ -10,29 +10,29 @@ struct LinearCache{TA,Tb,Tu,Tp,Talg,Tc,Tl,Tr}
     Pr::Tr
 end
 
-function set_A(cache, A) # and ! to function name
+function set_A(cache::LinearCache, A) # and ! to function name
     @set! cache.A = A
     @set! cache.isfresh = true
     return cache
 end
 
-function set_b(cache, b)
+function set_b(cache::LinearCache, b)
     @set! cache.b = b
     return cache
 end
 
-function set_u(cache, u)
+function set_u(cache::LinearCache, u)
     @set! cache.u = u
     return cache
 end
 
-function set_p(cache, p)
+function set_p(cache::LinearCache, p)
     @set! cache.p = p
 #   @set! cache.isfresh = true
     return cache
 end
 
-function set_cacheval(cache, alg_cache)
+function set_cacheval(cache::LinearCache, alg_cache)
     if cache.isfresh
         @set! cache.cacheval = alg_cache
         @set! cache.isfresh = false
@@ -53,8 +53,8 @@ function SciMLBase.init(prob::LinearProblem, alg, args...;
     end
 
     cacheval = init_cacheval(alg, A, b, u0)
-    Tc = cacheval == nothing ? Any : typeof(cacheval)
     isfresh = cacheval == nothing
+    Tc = isfresh ? Any : typeof(cacheval)
 
     Pl = LinearAlgebra.I
     Pr = LinearAlgebra.I
@@ -108,8 +108,8 @@ end
 
 function (cache::LinearCache)(prob::LinearProblem, args...; kwargs...)
 
-    if(prob.A  != cache.A) cache = set_A(cache, prob.A) end
-    if(prob.b  != cache.b) cache = set_b(cache, prob.b) end
+    if(prob.A != cache.A) cache = set_A(cache, prob.A) end
+    if(prob.b != cache.b) cache = set_b(cache, prob.b) end
 
     if(prob.u0 == nothing)
         prob.u0 = zero(x)

src/wrappers.jl

@@ -12,27 +12,26 @@ end
 
 function init_cacheval(alg::KrylovJL, A, b, u)
     cacheval = if alg.KrylovAlg === Krylov.cg!
-        CgSolver(A,b)
+        Krylov.CgSolver(A,b)
     elseif alg.KrylovAlg === Krylov.gmres!
-        GmresSolver(A,b,20)
+        Krylov.GmresSolver(A,b,20)
     elseif alg.KrylovAlg === Krylov.bicgstab!
-        BicgstabSolver(A,b)
+        Krylov.BicgstabSolver(A,b)
     else
         nothing
     end
     return cacheval
 end
 
 function SciMLBase.solve(cache::LinearCache, alg::KrylovJL; kwargs...)
-    @unpack A, b, u, Pr, Pl, cacheval = cache
-
     if cache.isfresh
-        solver = init_cacheval(alg.KrylovAlg, A, b, u)
-        solver.x = u
+        solver = init_cacheval(alg, cache.A, cache.b, cache.u)
         cache = set_cacheval(cache, solver)
     end
 
-    alg.solver(cacheval, A, b; M=Pl, N=Pr, alg.kwargs...)
+    cache.cacheval.x = cache.u
+    alg.KrylovAlg(cache.cacheval, cache.A, cache.b;
+                  M=cache.Pl, N=cache.Pr, alg.kwargs...)
 
     return cache.u
 end

test/runtests.jl

@@ -3,13 +3,13 @@ using Test
 
 @testset "LinearSolve.jl" begin
     using LinearAlgebra
-    n = 8
+    n = 2
 
     A = Matrix(I,n,n)
     b = ones(n)
-    A1 = A/1; b1 = rand(n); x1 = zero(b)
-    A2 = A/2; b2 = rand(n); x2 = zero(b)
-    A3 = A/3; b3 = rand(n); x3 = zero(b)
+    A1 = A/1; b1 = ones(n); x1 = zero(b)
+    A2 = A/2; b2 = ones(n); x2 = zero(b)
+    A3 = A/3; b3 = ones(n); x3 = zero(b)
 
     prob1 = LinearProblem(A1, b1; u0=x1)
     prob2 = LinearProblem(A2, b2; u0=x2)
@@ -22,7 +22,7 @@ using Test
 
 #               :DefaultLinSolve,
 
-#               :KrylovJL, KrylovJL_CG, KrylovJL_GMRES, KrylovJL_BICGSTAB,
+                :KrylovJL, :KrylovJL_CG, :KrylovJL_GMRES, :KrylovJL_BICGSTAB,
 #               :IterativeSolversJL
 #               :KrylovKitJL,