Skip to content

Improve constructor. #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ext/LinearSolveCliqueTreesExt.jl
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
module LinearSolveCliqueTreesExt

using CliqueTrees: EliminationAlgorithm, SupernodeType, DEFAULT_ELIMINATION_ALGORITHM,
DEFAULT_SUPERNODE_TYPE, symbolic, cholinit, lininit, cholesky!, linsolve!
using CliqueTrees: symbolic, cholinit, lininit, cholesky!, linsolve!
using LinearSolve
using SparseArrays

function LinearSolve.CliqueTreesFactorization(;
alg::A=DEFAULT_ELIMINATION_ALGORITHM,
snd::S=DEFAULT_SUPERNODE_TYPE,
reuse_symbolic::Bool=true,
) where {A <: EliminationAlgorithm, S <: SupernodeType}
return CliqueTreesFactorization{A, S}(alg, snd, reuse_symbolic)
function _symbolic(A::AbstractMatrix, alg::CliqueTreesFactorization)
return symbolic(A; alg=alg.alg, snd=alg.snd)
end

function _symbolic(A::AbstractMatrix, alg::CliqueTreesFactorization{Nothing})
return symbolic(A; snd=alg.snd)
end

function _symbolic(A::AbstractMatrix, alg::CliqueTreesFactorization{<:Any, Nothing})
return symbolic(A; alg=alg.alg)
end

function _symbolic(A::AbstractMatrix, alg::CliqueTreesFactorization{Nothing, Nothing})
return symbolic(A)
end

function LinearSolve.init_cacheval(
alg::CliqueTreesFactorization, A::AbstractMatrix, b, u, Pl, Pr, maxiters::Int, abstol,
reltol, verbose::Bool, assumptions::OperatorAssumptions)
symbfact = symbolic(A; alg=alg.alg, snd=alg.snd)
symbfact = _symbolic(A, alg)
cholfact, cholwork = cholinit(A, symbfact)
linwork = lininit(1, cholfact)
return (cholfact, cholwork, linwork)
Expand All @@ -29,7 +36,7 @@ function SciMLBase.solve!(cache::LinearSolve.LinearCache, alg::CliqueTreesFactor

if cache.isfresh
if isnothing(cache.cacheval) || !alg.reuse_symbolic
symbfact = symbolic(A; alg=alg.alg, snd=alg.snd)
symbfact = _symbolic(A, alg)
cholfact, cholwork = cholinit(A, symbfact)
linwork = lininit(1, cholfact)
cache.cacheval = (cholfact, cholwork, linwork)
Expand Down
20 changes: 18 additions & 2 deletions src/factorization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1162,8 +1162,8 @@ end

"""
CliqueTreesFactorization(
alg = CliqueTrees.DEFAULT_ELIMINATION_ALGORITHM,
snd = CliqueTrees.DEFAULT_SUPERNODE_TYPE,
alg = nothing,
snd = nothing,
reuse_symbolic = true,
)

Expand All @@ -1175,6 +1175,22 @@ struct CliqueTreesFactorization{A, S} <: AbstractSparseFactorization
alg::A
snd::S
reuse_symbolic::Bool

function CliqueTreesFactorization(;
alg::A = nothing,
snd::S = nothing,
reuse_symbolic = true,
throwerror = true,
) where {A, S}

ext = Base.get_extension(@__MODULE__, :LinearSolveCliqueTreesExt)

if throwerror && isnothing(ext)
error("CliqueTreesFactorization requires that CliqueTrees is loaded, i.e. `using CliqueTrees`")
else
new{A, S}(alg, snd, reuse_symbolic)
end
end
end

function init_cacheval(::CliqueTreesFactorization, ::Union{AbstractMatrix, Nothing, AbstractSciMLOperator}, b, u, Pl, Pr,
Expand Down
Loading