hotfix matrix operator and stats

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "LinearSolve"
 uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
 authors = ["SciML"]
-version = "2.1.4"
+version = "2.1.5"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/factorization.jl

@@ -103,10 +103,16 @@ function init_cacheval(alg::Union{LUFactorization, GenericLUFactorization}, A, b
     ArrayInterface.lu_instance(convert(AbstractMatrix, A))
 end
 
+function init_cacheval(alg::Union{LUFactorization, GenericLUFactorization}, A::MatrixOperator, b, u, Pl, Pr,
+    maxiters::Int, abstol, reltol, verbose::Bool,
+    assumptions::OperatorAssumptions)
+    ArrayInterface.lu_instance(convert(AbstractMatrix, A))
+end
+
 const PREALLOCATED_LU = ArrayInterface.lu_instance(rand(1, 1))
 
 function init_cacheval(alg::Union{LUFactorization, GenericLUFactorization},
-                       A::Matrix{Float64}, b, u, Pl, Pr,
+                       A::Union{Matrix{Float64},MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl, Pr,
                        maxiters::Int, abstol, reltol, verbose::Bool,
                        assumptions::OperatorAssumptions)
     PREALLOCATED_LU
@@ -175,7 +181,7 @@ end
 
 const PREALLOCATED_QR = ArrayInterface.qr_instance(rand(1, 1))
 
-function init_cacheval(alg::QRFactorization, A::Matrix{Float64}, b, u, Pl, Pr,
+function init_cacheval(alg::QRFactorization, A::Union{Matrix{Float64}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl, Pr,
                        maxiters::Int, abstol, reltol, verbose::Bool,
                        assumptions::OperatorAssumptions)
     PREALLOCATED_QR
@@ -254,7 +260,7 @@ end
 
 const PREALLOCATED_CHOLESKY = ArrayInterface.cholesky_instance(rand(1, 1), cholpivot)
 
-function init_cacheval(alg::CholeskyFactorization, A::Matrix{Float64}, b, u, Pl, Pr,
+function init_cacheval(alg::CholeskyFactorization, A::Union{Matrix{Float64}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl, Pr,
                        maxiters::Int, abstol, reltol, verbose::Bool,
                        assumptions::OperatorAssumptions)
     PREALLOCATED_CHOLESKY
@@ -346,7 +352,7 @@ end
 
 const PREALLOCATED_SVD = ArrayInterface.svd_instance(rand(1, 1))
 
-function init_cacheval(alg::SVDFactorization, A::Matrix{Float64}, b, u, Pl, Pr,
+function init_cacheval(alg::SVDFactorization, A::Union{Matrix{Float64}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl, Pr,
                        maxiters::Int, abstol, reltol, verbose::Bool,
                        assumptions::OperatorAssumptions)
     PREALLOCATED_SVD
@@ -671,7 +677,7 @@ function init_cacheval(alg::UMFPACKFactorization,
     nothing
 end
 
-function init_cacheval(alg::UMFPACKFactorization, A::SparseMatrixCSC{Float64, Int}, b, u,
+function init_cacheval(alg::UMFPACKFactorization, A::Union{SparseMatrixCSC{Float64, Int}, MatrixOperator{Float64, Matrix{Float64}}}, b, u,
                        Pl, Pr,
                        maxiters::Int, abstol, reltol,
                        verbose::Bool, assumptions::OperatorAssumptions)
@@ -768,7 +774,7 @@ function init_cacheval(alg::KLUFactorization,
     nothing
 end
 
-function init_cacheval(alg::KLUFactorization, A::SparseMatrixCSC{Float64, Int}, b, u, Pl,
+function init_cacheval(alg::KLUFactorization, A::Union{SparseMatrixCSC{Float64, Int}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl,
                        Pr,
                        maxiters::Int, abstol, reltol,
                        verbose::Bool, assumptions::OperatorAssumptions)
@@ -855,7 +861,7 @@ function init_cacheval(alg::CHOLMODFactorization,
     nothing
 end
 
-function init_cacheval(alg::CHOLMODFactorization, A::SparseMatrixCSC{Float64, Int}, b, u,
+function init_cacheval(alg::CHOLMODFactorization, A::Union{SparseMatrixCSC{Float64, Int}, MatrixOperator{Float64, Matrix{Float64}}}, b, u,
                        Pl, Pr,
                        maxiters::Int, abstol, reltol,
                        verbose::Bool, assumptions::OperatorAssumptions)
@@ -911,7 +917,13 @@ function init_cacheval(alg::RFLUFactorization, A, b, u, Pl, Pr, maxiters::Int,
     ArrayInterface.lu_instance(convert(AbstractMatrix, A)), ipiv
 end
 
-function init_cacheval(alg::RFLUFactorization, A::Matrix{Float64}, b, u, Pl, Pr,
+function init_cacheval(alg::RFLUFactorization, A::MatrixOperator, b, u, Pl, Pr, maxiters::Int,
+                       abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
+    ipiv = Vector{LinearAlgebra.BlasInt}(undef, min(size(A)...))
+    ArrayInterface.lu_instance(convert(AbstractMatrix, A)), ipiv
+end
+
+function init_cacheval(alg::RFLUFactorization, A::Union{Matrix{Float64}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl, Pr,
                        maxiters::Int,
                        abstol, reltol, verbose::Bool, assumptions::OperatorAssumptions)
     ipiv = Vector{LinearAlgebra.BlasInt}(undef, 0)
@@ -1266,7 +1278,7 @@ function init_cacheval(alg::SparspakFactorization,
     nothing
 end
 
-function init_cacheval(::SparspakFactorization, A::SparseMatrixCSC{Float64, Int}, b, u, Pl,
+function init_cacheval(::SparspakFactorization, A::Union{SparseMatrixCSC{Float64, Int}, MatrixOperator{Float64, Matrix{Float64}}}, b, u, Pl,
                        Pr, maxiters::Int, abstol,
                        reltol,
                        verbose::Bool, assumptions::OperatorAssumptions)

src/iterative_wrappers.jl

@@ -267,8 +267,9 @@ function SciMLBase.solve!(cache::LinearCache, alg::KrylovJL; kwargs...)
         Krylov.solve!(args...; kwargs...)
     end
 
-    resid = @get_cacheval(cache, :KrylovJL_GMRES).stats.residuals |> last
+    stats = @get_cacheval(cache, :KrylovJL_GMRES).stats
+    resid = stats.residuals |> last
 
     return SciMLBase.build_linear_solution(alg, cache.u, resid, cache;
-                                           iters = cache.cacheval.stats.niter)
+                                           iters = stats.niter)
 end