InvComposePreconditioner done

Author: vpuri3

src/wrappers.jl

@@ -50,9 +50,9 @@ end
 
 InvComposePreconditioner(inner, outer) = InvComposePreconditioner(ComposePreconditioner(inner, outer))
 
-Base.eltype(A::InvComposePreconditioner) = Float64 #eltype(A.inner)
-#Base.adjoint(A::InvComposePreconditioner) = ComposePreconditioner(A.outer', A.inner')
-Base.inv(A::InvComposePreconditioner) = ComposePreconditioner(A.P)
+Base.eltype(A::InvComposePreconditioner) = Base.eltype(A.P)
+Base.adjoint(A::InvComposePreconditioner) = InvComposePreconditioner(A.P')
+Base.inv(A::InvComposePreconditioner) = deepcopy(A.P)
 
 function LinearAlgebra.mul!(y, A::InvComposePreconditioner, x)
     @unpack P = A
@@ -61,10 +61,15 @@ end
 
 function LinearAlgebra.mul!(C, A::InvComposePreconditioner, B, α, β)
     @unpack P = A
+    tmp = copy(B)
+    ldiv!(tmp, P, B)
+    mul!(C, I, tmp, α, β)
 end
 
 function LinearAlgebra.ldiv!(A::InvComposePreconditioner, x)
     @unpack P = A
+    y = copy(x)
+    mul!(x, P, y)
 end
 
 function LinearAlgebra.ldiv!(y, A::InvComposePreconditioner, x)
@@ -175,15 +180,8 @@ function SciMLBase.solve(cache::LinearCache, alg::KrylovJL; kwargs...)
         cache = set_cacheval(cache, solver)
     end
 
-    M = alg.Pl
-    N = alg.Pr
-
-    """
-    TODO - pass in inv(Pl), inv(Pr) to Krylov.jl
-    """
-
-#   M = InvComposePreconditioner(alg.Pl, cache.Pl) # left precond
-#   N = InvComposePreconditioner(alg.Pr, cache.Pr) # right 
+    M = InvComposePreconditioner(alg.Pl, cache.Pl) # left precond
+    N = InvComposePreconditioner(alg.Pr, cache.Pr) # right 
 
     atol    = cache.abstol
     rtol    = cache.reltol

test/runtests.jl

@@ -172,6 +172,38 @@ end
         ldiv!(y, P, x)
 
     end
+
+    @testset "InvComposePreconditioenr" begin
+        s = rand()
+        α = rand()
+        β = rand()
+
+        x = rand(n,n)
+        y = rand(n,n)
+
+        P1 = LinearSolve.default_preconditioner(s, true)
+        P2 = LinearSolve.default_preconditioner(s, false)
+
+        P  = LinearSolve.ComposePreconditioner(P1,P2)
+        Pi = LinearSolve.InvComposePreconditioner(P)
+
+        @test Pi == LinearSolve.InvComposePreconditioner(P1,P2)
+        @test Pi == inv(P)
+        @test P  == inv(Pi)
+
+        mul!(y, P, x)
+        mul!(y, P, x, α, β)
+
+        ldiv!(P, x)
+        ldiv!(y, P, x)
+
+        mul!(y, Pi, x)
+        mul!(y, Pi, x, α, β)
+
+        ldiv!(Pi, x)
+        ldiv!(y, Pi, x)
+
+    end
 end
 
 end # testset