Skip to content

Support Krylov.jl v0.10 #595

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.

Sign up for GitHub

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 3 commits into from
Apr 19, 2025
Merged

Support Krylov.jl v0.10 #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa211e9
Support Krylov.jl v0.10
amontoison Apr 18, 2025
3691bfe
Update iterative_wrappers.jl
amontoison Apr 18, 2025
67cfd4e
Use krylov_solve!
amontoison Apr 18, 2025
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ InteractiveUtils = "1.10"
IterativeSolvers = "0.9.3"
JET = "0.8.28, 0.9"
KernelAbstractions = "0.9.27"
Krylov = "0.9"
Krylov = "0.10"
KrylovKit = "0.8, 0.9"
KrylovPreconditioners = "0.3"
LazyArrays = "1.8, 2"
Expand Down
94 changes: 47 additions & 47 deletions src/iterative_wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,73 +109,73 @@ end

function get_KrylovJL_solver(KrylovAlg)
KS = if (KrylovAlg === Krylov.lsmr!)
Krylov.LsmrSolver
Krylov.LsmrWorkspace
elseif (KrylovAlg === Krylov.cgs!)
Krylov.CgsSolver
Krylov.CgsWorkspace
elseif (KrylovAlg === Krylov.usymlq!)
Krylov.UsymlqSolver
Krylov.UsymlqWorkspace
elseif (KrylovAlg === Krylov.lnlq!)
Krylov.LnlqSolver
Krylov.LnlqWorkspace
elseif (KrylovAlg === Krylov.bicgstab!)
Krylov.BicgstabSolver
Krylov.BicgstabWorkspace
elseif (KrylovAlg === Krylov.crls!)
Krylov.CrlsSolver
Krylov.CrlsWorkspace
elseif (KrylovAlg === Krylov.lsqr!)
Krylov.LsqrSolver
Krylov.LsqrWorkspace
elseif (KrylovAlg === Krylov.minres!)
Krylov.MinresSolver
Krylov.MinresWorkspace
elseif (KrylovAlg === Krylov.cgne!)
Krylov.CgneSolver
Krylov.CgneWorkspace
elseif (KrylovAlg === Krylov.dqgmres!)
Krylov.DqgmresSolver
Krylov.DqgmresWorkspace
elseif (KrylovAlg === Krylov.symmlq!)
Krylov.SymmlqSolver
Krylov.SymmlqWorkspace
elseif (KrylovAlg === Krylov.trimr!)
Krylov.TrimrSolver
Krylov.TrimrWorkspace
elseif (KrylovAlg === Krylov.usymqr!)
Krylov.UsymqrSolver
Krylov.UsymqrWorkspace
elseif (KrylovAlg === Krylov.bilqr!)
Krylov.BilqrSolver
Krylov.BilqrWorkspace
elseif (KrylovAlg === Krylov.cr!)
Krylov.CrSolver
Krylov.CrWorkspace
elseif (KrylovAlg === Krylov.craigmr!)
Krylov.CraigmrSolver
Krylov.CraigmrWorkspace
elseif (KrylovAlg === Krylov.tricg!)
Krylov.TricgSolver
Krylov.TricgWorkspace
elseif (KrylovAlg === Krylov.craig!)
Krylov.CraigSolver
Krylov.CraigWorkspace
elseif (KrylovAlg === Krylov.diom!)
Krylov.DiomSolver
Krylov.DiomWorkspace
elseif (KrylovAlg === Krylov.lslq!)
Krylov.LslqSolver
Krylov.LslqWorkspace
elseif (KrylovAlg === Krylov.trilqr!)
Krylov.TrilqrSolver
Krylov.TrilqrWorkspace
elseif (KrylovAlg === Krylov.crmr!)
Krylov.CrmrSolver
Krylov.CrmrWorkspace
elseif (KrylovAlg === Krylov.cg!)
Krylov.CgSolver
Krylov.CgWorkspace
elseif (KrylovAlg === Krylov.cg_lanczos!)
Krylov.CgLanczosShiftSolver
Krylov.CgLanczosShiftWorkspace
elseif (KrylovAlg === Krylov.cgls!)
Krylov.CglsSolver
Krylov.CglsWorkspace
elseif (KrylovAlg === Krylov.cg_lanczos!)
Krylov.CgLanczosSolver
Krylov.CgLanczosWorkspace
elseif (KrylovAlg === Krylov.bilq!)
Krylov.BilqSolver
Krylov.BilqWorkspace
elseif (KrylovAlg === Krylov.minres_qlp!)
Krylov.MinresQlpSolver
Krylov.MinresQlpWorkspace
elseif (KrylovAlg === Krylov.qmr!)
Krylov.QmrSolver
Krylov.QmrWorkspace
elseif (KrylovAlg === Krylov.gmres!)
Krylov.GmresSolver
Krylov.GmresWorkspace
elseif (KrylovAlg === Krylov.fgmres!)
Krylov.FgmresSolver
Krylov.FgmresWorkspace
elseif (KrylovAlg === Krylov.gpmr!)
Krylov.GpmrSolver
Krylov.GpmrWorkspace
elseif (KrylovAlg === Krylov.fom!)
Krylov.FomSolver
Krylov.FomWorkspace
elseif (KrylovAlg === Krylov.minares!)
Krylov.MinaresSolver
Krylov.MinaresWorkspace
else
error("Invalid Krylov method detected")
end
Expand All @@ -196,11 +196,11 @@ function init_cacheval(alg::KrylovJL, A, b, u, Pl, Pr, maxiters::Int, abstol, re
alg.KrylovAlg === Krylov.gpmr! ||
alg.KrylovAlg === Krylov.fom!)
if issparsematrixcsc(A)
KS(makeempty_SparseMatrixCSC(A), eltype(b)[], 1)
KS(makeempty_SparseMatrixCSC(A), eltype(b)[]; memory = 1)
elseif A isa Matrix
KS(Matrix{eltype(A)}(undef, 0, 0), eltype(b)[], 1)
KS(Matrix{eltype(A)}(undef, 0, 0), eltype(b)[]; memory = 1)
else
KS(A, b, 1)
KS(A, b; memory = 1)
end
else
if issparsematrixcsc(A)
Expand All @@ -220,7 +220,7 @@ function init_cacheval(alg::KrylovJL, A, b, u, Pl, Pr, maxiters::Int, abstol, re
alg.KrylovAlg === Krylov.fgmres! ||
alg.KrylovAlg === Krylov.gpmr! ||
alg.KrylovAlg === Krylov.fom!)
KS(A, b, memory)
KS(A, b; memory)
elseif (alg.KrylovAlg === Krylov.minres! ||
alg.KrylovAlg === Krylov.symmlq! ||
alg.KrylovAlg === Krylov.lslq! ||
Expand Down Expand Up @@ -288,20 +288,20 @@ function SciMLBase.solve!(cache::LinearCache, alg::KrylovJL; kwargs...)
kwargs = (atol = atol, rtol, itmax, verbose,
ldiv = true, history = true, alg.kwargs...)

if cache.cacheval isa Krylov.CgSolver
if cache.cacheval isa Krylov.CgWorkspace
N !== I &&
@warn "$(alg.KrylovAlg) doesn't support right preconditioning."
Krylov.solve!(args...; M, kwargs...)
elseif cache.cacheval isa Krylov.GmresSolver
Krylov.solve!(args...; M, N, restart = alg.gmres_restart > 0, kwargs...)
elseif cache.cacheval isa Krylov.BicgstabSolver
Krylov.solve!(args...; M, N, kwargs...)
elseif cache.cacheval isa Krylov.MinresSolver
Krylov.krylov_solve!(args...; M, kwargs...)
elseif cache.cacheval isa Krylov.GmresWorkspace
Krylov.krylov_solve!(args...; M, N, restart = alg.gmres_restart > 0, kwargs...)
elseif cache.cacheval isa Krylov.BicgstabWorkspace
Krylov.krylov_solve!(args...; M, N, kwargs...)
elseif cache.cacheval isa Krylov.MinresWorkspace
N !== I &&
@warn "$(alg.KrylovAlg) doesn't support right preconditioning."
Krylov.solve!(args...; M, kwargs...)
Krylov.krylov_solve!(args...; M, kwargs...)
else
Krylov.solve!(args...; kwargs...)
Krylov.krylov_solve!(args...; kwargs...)
end

stats = @get_cacheval(cache, :KrylovJL_GMRES).stats
Expand Down
Loading