Merge branch 'dl/reversecholesky' into master

.github/workflows/ci.yml

@@ -20,9 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
-          - '1'
-          - '^1.9.0-0'
+          - '1.9'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,6 +1,6 @@
 name = "MatrixFactorizations"
 uuid = "a3b82374-2e81-5b9e-98ce-41277c0e4c87"
-version = "1.0"
+version = "2.0"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -9,8 +9,8 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
-ArrayLayouts = "0.8.11, 1"
-julia = "1.6"
+ArrayLayouts = "1.0"
+julia = "1.9"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/MatrixFactorizations.jl

@@ -2,13 +2,15 @@ module MatrixFactorizations
 using Base, LinearAlgebra, ArrayLayouts
 import Base: axes, axes1, getproperty, iterate, tail
 import LinearAlgebra: BlasInt, BlasReal, BlasFloat, BlasComplex, axpy!,
-   copy_oftype, checksquare, adjoint, transpose, AdjOrTrans, HermOrSym
+   copy_oftype, checksquare, adjoint, transpose, AdjOrTrans, HermOrSym,
+   det, logdet, logabsdet, isposdef
 import LinearAlgebra.LAPACK: chkuplo, chktrans
 import LinearAlgebra: cholesky, cholesky!, norm, diag, eigvals!, eigvals, eigen!, eigen,
    qr, axpy!, ldiv!, rdiv!, mul!, lu, lu!, ldlt, ldlt!, AbstractTriangular, inv,
    chkstride1, kron, lmul!, rmul!, factorize, StructuredMatrixStyle, det, logabsdet,
    AbstractQ, _zeros, _cut_B, _ret_size, require_one_based_indexing, checksquare,
-   checknonsingular, ipiv2perm, copytri!, issuccess
+   checknonsingular, ipiv2perm, copytri!, issuccess, RealHermSymComplexHerm,
+   cholcopy, checkpositivedefinite, char_uplo
 
 import Base: getindex, setindex!, *, +, -, ==, <, <=, >,
    >=, /, ^, \, transpose, showerror, reindex, checkbounds, @propagate_inbounds
@@ -27,8 +29,8 @@ import ArrayLayouts: reflector!, reflectorApply!, materialize!, @_layoutlmul, @_
    layout_getindex
 
 
+export ul, ul!, ql, ql!, qrunblocked, qrunblocked!, UL, QL, reversecholesky, reversecholesky!, ReverseCholesky
 
-export ul, ul!, ql, ql!, qrunblocked, qrunblocked!, UL, QL
 
 const AdjointQtype = isdefined(LinearAlgebra, :AdjointQ) ? LinearAlgebra.AdjointQ : Adjoint
 const AbstractQtype = AbstractQ <: AbstractMatrix ? AbstractMatrix : AbstractQ
@@ -137,5 +139,6 @@ include("qr.jl")
 include("ql.jl")
 include("rq.jl")
 include("polar.jl")
+include("reversecholesky.jl")
 
 end #module

src/reversecholesky.jl

@@ -0,0 +1,262 @@
+# This file was modified from
+# a part of Julia. License is MIT: https://julialang.org/license
+
+##########################
+# Reverse Cholesky Factorization #
+##########################
+
+"""
+    ReverseCholesky <: Factorization
+
+Matrix factorization type of the reverse Cholesky factorization of a dense symmetric/Hermitian
+positive definite matrix `A`. This is the return type of [`reversecholesky`](@ref),
+the corresponding matrix factorization function.
+
+The triangular reverse Cholesky factor can be obtained from the factorization `F::ReverseCholesky`
+via `F.L` and `F.U`, where `A ≈ F.U * F.U' ≈ F.L' * F.L`.
+```
+"""
+struct ReverseCholesky{T,S<:AbstractMatrix} <: Factorization{T}
+    factors::S
+    uplo::Char
+    info::BlasInt
+
+    function ReverseCholesky{T,S}(factors, uplo, info) where {T,S<:AbstractMatrix}
+        require_one_based_indexing(factors)
+        new(factors, uplo, info)
+    end
+end
+ReverseCholesky(A::AbstractMatrix{T}, uplo::Symbol, info::Integer) where {T} =
+    ReverseCholesky{T,typeof(A)}(A, char_uplo(uplo), info)
+ReverseCholesky(A::AbstractMatrix{T}, uplo::AbstractChar, info::Integer) where {T} =
+    ReverseCholesky{T,typeof(A)}(A, uplo, info)
+ReverseCholesky(U::UpperTriangular{T}) where {T} = ReverseCholesky{T,typeof(U.data)}(U.data, 'U', 0)
+ReverseCholesky(L::LowerTriangular{T}) where {T} = ReverseCholesky{T,typeof(L.data)}(L.data, 'L', 0)
+
+# iteration for destructuring into components
+Base.iterate(C::ReverseCholesky) = (C.L, Val(:U))
+Base.iterate(C::ReverseCholesky, ::Val{:U}) = (C.U, Val(:done))
+Base.iterate(C::ReverseCholesky, ::Val{:done}) = nothing
+
+## Non BLAS/LAPACK element types (generic)
+function _reverse_chol!(A::AbstractMatrix, ::Type{UpperTriangular})
+    require_one_based_indexing(A)
+    n = checksquare(A)
+    realdiag = eltype(A) <: Complex
+    @inbounds begin
+        for k = n:-1:1
+            Akk = realdiag ? real(A[k,k]) : A[k,k]
+            for j = k+1:n
+                Akk -= realdiag ? abs2(A[k,j]) : A[k,j]'A[k,j]
+            end
+            A[k,k] = Akk
+            Akk, info = _reverse_chol!(Akk, UpperTriangular)
+            if info != 0
+                return UpperTriangular(A), info
+            end
+            A[k,k] = Akk
+            AkkInv = inv(Akk)
+            for j = k+1:n
+                @simd for i = 1:k-1
+                    A[i,k] -= A[i,j]*A[k,j]'
+                end
+            end
+            for i = 1:k-1
+                A[i,k] *= AkkInv'
+            end
+        end
+    end
+    return UpperTriangular(A), convert(BlasInt, 0)
+end
+
+function _reverse_chol!(A::AbstractMatrix, ::Type{LowerTriangular})
+    require_one_based_indexing(A)
+    n = checksquare(A)
+    realdiag = eltype(A) <: Complex
+    @inbounds begin
+        for k = n:-1:1
+            Akk = realdiag ? real(A[k,k]) : A[k,k]
+            for i = k+1:n
+                Akk -= realdiag ? abs2(A[i,k]) : A[i,k]'A[i,k]
+            end
+            A[k,k] = Akk
+            Akk, info = _reverse_chol!(Akk, LowerTriangular)
+            if info != 0
+                return LowerTriangular(A), info
+            end
+            A[k,k] = Akk
+            AkkInv = inv(copy(Akk'))
+            for j = 1:k-1
+                for i = k+1:n
+                    A[k,j] -= A[i,k]'*A[i,j]
+                end
+                A[k,j] = AkkInv*A[k,j]
+            end
+        end
+    end
+    return UpperTriangular(A), convert(BlasInt, 0)
+end
+
+## Numbers
+_reverse_chol!(x::Number, uplo) = LinearAlgebra._chol!(x, uplo)
+
+## for StridedMatrices, check that matrix is symmetric/Hermitian
+
+# cholesky!. Destructive methods for computing Cholesky factorization of real symmetric
+# or Hermitian matrix
+## No pivoting (default)
+function reversecholesky!(A::RealHermSymComplexHerm, ::NoPivot = NoPivot(); check::Bool = true)
+    C, info = _reverse_chol!(A.data, A.uplo == 'U' ? UpperTriangular : LowerTriangular)
+    check && checkpositivedefinite(info)
+    return ReverseCholesky(C.data, A.uplo, info)
+end
+
+### for AbstractMatrix, check that matrix is symmetric/Hermitian
+"""
+    reversecholesky!(A::AbstractMatrix, NoPivot(); check = true) -> ReverseCholesky
+
+The same as [`reversecholesky`](@ref), but saves space by overwriting the input `A`,
+instead of creating a copy. An [`InexactError`](@ref) exception is thrown if
+the factorization produces a number not representable by the element type of
+`A`, e.g. for integer types.
+```
+"""
+function reversecholesky!(A::AbstractMatrix, ::NoPivot = NoPivot(); check::Bool = true)
+    checksquare(A)
+    if !ishermitian(A) # return with info = -1 if not Hermitian
+        check && checkpositivedefinite(-1)
+        return ReverseCholesky(A, 'U', convert(BlasInt, -1))
+    else
+        return reversecholesky!(Hermitian(A), NoPivot(); check = check)
+    end
+end
+
+# reversecholesky. Non-destructive methods for computing ReverseCholesky factorization of real symmetric
+# or Hermitian matrix
+## No pivoting (default)
+"""
+    reversecholesky(A, NoPivot(); check = true) -> ReverseCholesky
+
+Compute the ReverseCholesky factorization of a dense symmetric positive definite matrix `A`
+and return a [`ReverseCholesky`](@ref) factorization. The matrix `A` can either be a [`Symmetric`](@ref) or [`Hermitian`](@ref)
+[`AbstractMatrix`](@ref) or a *perfectly* symmetric or Hermitian `AbstractMatrix`.
+
+The triangular ReverseCholesky factor can be obtained from the factorization `F` via `F.L` and `F.U`,
+where `A ≈ F.U * F.U' ≈ F.L' * F.L`.
+"""
+reversecholesky(A::AbstractMatrix, ::NoPivot=NoPivot(); check::Bool = true) =
+    reversecholesky!(cholcopy(A); check)
+
+function reversecholesky(A::AbstractMatrix{Float16}, ::NoPivot=NoPivot(); check::Bool = true)
+    X = reversecholesky!(cholcopy(A); check = check)
+    return ReverseCholesky{Float16}(X)
+end
+
+
+## Number
+function reversecholesky(x::Number, uplo::Symbol=:U)
+    C, info = _reverse_chol!(x, uplo)
+    xf = fill(C, 1, 1)
+    ReverseCholesky(xf, uplo, info)
+end
+
+
+function ReverseCholesky{T}(C::ReverseCholesky) where T
+    Cnew = convert(AbstractMatrix{T}, C.factors)
+    ReverseCholesky{T, typeof(Cnew)}(Cnew, C.uplo, C.info)
+end
+Factorization{T}(C::ReverseCholesky{T}) where {T} = C
+Factorization{T}(C::ReverseCholesky) where {T} = ReverseCholesky{T}(C)
+
+AbstractMatrix(C::ReverseCholesky) = C.uplo == 'U' ? C.U*C.U' : C.L'*C.L
+AbstractArray(C::ReverseCholesky) = AbstractMatrix(C)
+Matrix(C::ReverseCholesky) = Array(AbstractArray(C))
+Array(C::ReverseCholesky) = Matrix(C)
+
+copy(C::ReverseCholesky) = ReverseCholesky(copy(C.factors), C.uplo, C.info)
+
+
+size(C::ReverseCholesky) = size(C.factors)
+size(C::ReverseCholesky, d::Integer) = size(C.factors, d)
+
+function getproperty(C::ReverseCholesky, d::Symbol)
+    Cfactors = getfield(C, :factors)
+    Cuplo    = getfield(C, :uplo)
+    if d === :U
+        return UpperTriangular(Cuplo === char_uplo(d) ? Cfactors : copy(Cfactors'))
+    elseif d === :L
+        return LowerTriangular(Cuplo === char_uplo(d) ? Cfactors : copy(Cfactors'))
+    elseif d === :UL
+        return (Cuplo === 'U' ? UpperTriangular(Cfactors) : LowerTriangular(Cfactors))
+    else
+        return getfield(C, d)
+    end
+end
+Base.propertynames(F::ReverseCholesky, private::Bool=false) =
+    (:U, :L, :UL, (private ? fieldnames(typeof(F)) : ())...)
+
+
+
+issuccess(C::ReverseCholesky) = C.info == 0
+
+adjoint(C::ReverseCholesky) = C
+
+function show(io::IO, mime::MIME{Symbol("text/plain")}, C::ReverseCholesky)
+    if issuccess(C)
+        summary(io, C); println(io)
+        println(io, "$(C.uplo) factor:")
+        show(io, mime, C.UL)
+    else
+        print(io, "Failed factorization of type $(typeof(C))")
+    end
+end
+
+function ldiv!(C::ReverseCholesky, B::AbstractVecOrMat)
+    if C.uplo == 'L'
+        return ldiv!(LowerTriangular(C.factors), ldiv!(adjoint(LowerTriangular(C.factors)), B))
+    else
+        return ldiv!(adjoint(UpperTriangular(C.factors)), ldiv!(UpperTriangular(C.factors), B))
+    end
+end
+
+function rdiv!(B::AbstractMatrix, C::ReverseCholesky)
+    if C.uplo == 'L'
+        return rdiv!(rdiv!(B, LowerTriangular(C.factors)), adjoint(LowerTriangular(C.factors)))
+    else
+        return rdiv!(rdiv!(B, adjoint(UpperTriangular(C.factors))), UpperTriangular(C.factors))
+    end
+end
+
+isposdef(C::ReverseCholesky) = C.info == 0
+
+function det(C::ReverseCholesky)
+    dd = one(real(eltype(C)))
+    @inbounds for i in 1:size(C.factors,1)
+        dd *= real(C.factors[i,i])^2
+    end
+    return dd
+end
+
+function logdet(C::ReverseCholesky)
+    dd = zero(real(eltype(C)))
+    @inbounds for i in 1:size(C.factors,1)
+        dd += log(real(C.factors[i,i]))
+    end
+    dd + dd # instead of 2.0dd which can change the type
+end
+
+
+
+logabsdet(C::ReverseCholesky) = logdet(C), one(eltype(C)) # since C is p.s.d.
+
+
+function getproperty(C::ReverseCholesky{<:Any,<:Diagonal}, d::Symbol)
+    Cfactors = getfield(C, :factors)
+    if d in (:U, :L, :UL)
+        return Cfactors
+    else
+        return getfield(C, d)
+    end
+end
+
+inv(C::ReverseCholesky{<:Any,<:Diagonal}) = Diagonal(map(inv∘abs2, C.factors.diag))

test/runtests.jl

@@ -440,3 +440,4 @@ end
 
 include("test_rq.jl")
 include("test_polar.jl")
+include("test_reversecholesky.jl")