Skip to content

Commit d8d652f

Browse files
amontoisonamontoison
authored
Remove aliases (#995)
* Remove some aliases * Remove Krylov.solve!
1 parent 069e900 commit d8d652f

File tree

1 file changed

+40
-54
lines changed

1 file changed

+40
-54
lines changed

‎src/interface.jl‎

Lines changed: 40 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -50,59 +50,48 @@ The argument `workspace` must be a subtype of [`KrylovWorkspace`](@ref) or [`Blo
5050
"""
5151
function krylov_solve! end
5252

53-
# Aliases to maintain partial backward compatibility (since v0.10).
54-
# `Krylov.solve!` will continue to work, but `krylov_solve!` is now the exported name.
55-
const solve! = krylov_solve!
56-
# `Krylov.KrylovSolver` and `Krylov.BlockKrylovSolver` have been renamed to align with the new naming convention.
57-
# The new names are `KrylovWorkspace` and `BlockKrylovWorkspace`.
58-
const KrylovSolver = KrylovWorkspace
59-
const BlockKrylovSolver = BlockKrylovWorkspace
60-
6153
# Krylov methods
62-
for (workspace, alias, krylov, args, def_args, optargs, def_optargs, kwargs, def_kwargs) in [
63-
(:LsmrWorkspace , :LsmrSolver , :lsmr , args_lsmr , def_args_lsmr , () , () , kwargs_lsmr , def_kwargs_lsmr )
64-
(:CgsWorkspace , :CgsSolver , :cgs , args_cgs , def_args_cgs , optargs_cgs , def_optargs_cgs , kwargs_cgs , def_kwargs_cgs )
65-
(:UsymlqWorkspace , :UsymlqSolver , :usymlq , args_usymlq , def_args_usymlq , optargs_usymlq , def_optargs_usymlq , kwargs_usymlq , def_kwargs_usymlq )
66-
(:LnlqWorkspace , :LnlqSolver , :lnlq , args_lnlq , def_args_lnlq , () , () , kwargs_lnlq , def_kwargs_lnlq )
67-
(:BicgstabWorkspace , :BicgstabSolver , :bicgstab , args_bicgstab , def_args_bicgstab , optargs_bicgstab , def_optargs_bicgstab , kwargs_bicgstab , def_kwargs_bicgstab )
68-
(:CrlsWorkspace , :CrlsSolver , :crls , args_crls , def_args_crls , () , () , kwargs_crls , def_kwargs_crls )
69-
(:LsqrWorkspace , :LsqrSolver , :lsqr , args_lsqr , def_args_lsqr , () , () , kwargs_lsqr , def_kwargs_lsqr )
70-
(:MinresWorkspace , :MinresSolver , :minres , args_minres , def_args_minres , optargs_minres , def_optargs_minres , kwargs_minres , def_kwargs_minres )
71-
(:MinaresWorkspace , :MinaresSolver , :minares , args_minares , def_args_minares , optargs_minares , def_optargs_minares , kwargs_minares , def_kwargs_minares )
72-
(:CgneWorkspace , :CgneSolver , :cgne , args_cgne , def_args_cgne , () , () , kwargs_cgne , def_kwargs_cgne )
73-
(:DqgmresWorkspace , :DqgmresSolver , :dqgmres , args_dqgmres , def_args_dqgmres , optargs_dqgmres , def_optargs_dqgmres , kwargs_dqgmres , def_kwargs_dqgmres )
74-
(:SymmlqWorkspace , :SymmlqSolver , :symmlq , args_symmlq , def_args_symmlq , optargs_symmlq , def_optargs_symmlq , kwargs_symmlq , def_kwargs_symmlq )
75-
(:TrimrWorkspace , :TrimrSolver , :trimr , args_trimr , def_args_trimr , optargs_trimr , def_optargs_trimr , kwargs_trimr , def_kwargs_trimr )
76-
(:UsymqrWorkspace , :UsymqrSolver , :usymqr , args_usymqr , def_args_usymqr , optargs_usymqr , def_optargs_usymqr , kwargs_usymqr , def_kwargs_usymqr )
77-
(:BilqrWorkspace , :BilqrSolver , :bilqr , args_bilqr , def_args_bilqr , optargs_bilqr , def_optargs_bilqr , kwargs_bilqr , def_kwargs_bilqr )
78-
(:CrWorkspace , :CrSolver , :cr , args_cr , def_args_cr , optargs_cr , def_optargs_cr , kwargs_cr , def_kwargs_cr )
79-
(:CarWorkspace , :CarSolver , :car , args_car , def_args_car , optargs_car , def_optargs_car , kwargs_car , def_kwargs_car )
80-
(:CraigmrWorkspace , :CraigmrSolver , :craigmr , args_craigmr , def_args_craigmr , () , () , kwargs_craigmr , def_kwargs_craigmr )
81-
(:TricgWorkspace , :TricgSolver , :tricg , args_tricg , def_args_tricg , optargs_tricg , def_optargs_tricg , kwargs_tricg , def_kwargs_tricg )
82-
(:CraigWorkspace , :CraigSolver , :craig , args_craig , def_args_craig , () , () , kwargs_craig , def_kwargs_craig )
83-
(:DiomWorkspace , :DiomSolver , :diom , args_diom , def_args_diom , optargs_diom , def_optargs_diom , kwargs_diom , def_kwargs_diom )
84-
(:LslqWorkspace , :LslqSolver , :lslq , args_lslq , def_args_lslq , () , () , kwargs_lslq , def_kwargs_lslq )
85-
(:TrilqrWorkspace , :TrilqrSolver , :trilqr , args_trilqr , def_args_trilqr , optargs_trilqr , def_optargs_trilqr , kwargs_trilqr , def_kwargs_trilqr )
86-
(:CrmrWorkspace , :CrmrSolver , :crmr , args_crmr , def_args_crmr , () , () , kwargs_crmr , def_kwargs_crmr )
87-
(:CgWorkspace , :CgSolver , :cg , args_cg , def_args_cg , optargs_cg , def_optargs_cg , kwargs_cg , def_kwargs_cg )
88-
(:CglsWorkspace , :CglsSolver , :cgls , args_cgls , def_args_cgls , () , () , kwargs_cgls , def_kwargs_cgls )
89-
(:CgLanczosWorkspace, :CgLanczosSolver, :cg_lanczos, args_cg_lanczos, def_args_cg_lanczos, optargs_cg_lanczos, def_optargs_cg_lanczos, kwargs_cg_lanczos, def_kwargs_cg_lanczos)
90-
(:BilqWorkspace , :BilqSolver , :bilq , args_bilq , def_args_bilq , optargs_bilq , def_optargs_bilq , kwargs_bilq , def_kwargs_bilq )
91-
(:MinresQlpWorkspace, :MinresQlpSolver, :minres_qlp, args_minres_qlp, def_args_minres_qlp, optargs_minres_qlp, def_optargs_minres_qlp, kwargs_minres_qlp, def_kwargs_minres_qlp)
92-
(:QmrWorkspace , :QmrSolver , :qmr , args_qmr , def_args_qmr , optargs_qmr , def_optargs_qmr , kwargs_qmr , def_kwargs_qmr )
93-
(:GmresWorkspace , :GmresSolver , :gmres , args_gmres , def_args_gmres , optargs_gmres , def_optargs_gmres , kwargs_gmres , def_kwargs_gmres )
94-
(:FgmresWorkspace , :FgmresSolver , :fgmres , args_fgmres , def_args_fgmres , optargs_fgmres , def_optargs_fgmres , kwargs_fgmres , def_kwargs_fgmres )
95-
(:FomWorkspace , :FomSolver , :fom , args_fom , def_args_fom , optargs_fom , def_optargs_fom , kwargs_fom , def_kwargs_fom )
96-
(:GpmrWorkspace , :GpmrSolver , :gpmr , args_gpmr , def_args_gpmr , optargs_gpmr , def_optargs_gpmr , kwargs_gpmr , def_kwargs_gpmr )
97-
(:CgLanczosShiftWorkspace , :CgLanczosShiftSolver , :cg_lanczos_shift , args_cg_lanczos_shift , def_args_cg_lanczos_shift , (), (), kwargs_cg_lanczos_shift , def_kwargs_cg_lanczos_shift )
98-
(:CglsLanczosShiftWorkspace, :CglsLanczosShiftSolver, :cgls_lanczos_shift, args_cgls_lanczos_shift, def_args_cgls_lanczos_shift, (), (), kwargs_cgls_lanczos_shift, def_kwargs_cgls_lanczos_shift)
54+
for (workspace, krylov, args, def_args, optargs, def_optargs, kwargs, def_kwargs) in [
55+
(:LsmrWorkspace , :lsmr , args_lsmr , def_args_lsmr , () , () , kwargs_lsmr , def_kwargs_lsmr )
56+
(:CgsWorkspace , :cgs , args_cgs , def_args_cgs , optargs_cgs , def_optargs_cgs , kwargs_cgs , def_kwargs_cgs )
57+
(:UsymlqWorkspace , :usymlq , args_usymlq , def_args_usymlq , optargs_usymlq , def_optargs_usymlq , kwargs_usymlq , def_kwargs_usymlq )
58+
(:LnlqWorkspace , :lnlq , args_lnlq , def_args_lnlq , () , () , kwargs_lnlq , def_kwargs_lnlq )
59+
(:BicgstabWorkspace , :bicgstab , args_bicgstab , def_args_bicgstab , optargs_bicgstab , def_optargs_bicgstab , kwargs_bicgstab , def_kwargs_bicgstab )
60+
(:CrlsWorkspace , :crls , args_crls , def_args_crls , () , () , kwargs_crls , def_kwargs_crls )
61+
(:LsqrWorkspace , :lsqr , args_lsqr , def_args_lsqr , () , () , kwargs_lsqr , def_kwargs_lsqr )
62+
(:MinresWorkspace , :minres , args_minres , def_args_minres , optargs_minres , def_optargs_minres , kwargs_minres , def_kwargs_minres )
63+
(:MinaresWorkspace , :minares , args_minares , def_args_minares , optargs_minares , def_optargs_minares , kwargs_minares , def_kwargs_minares )
64+
(:CgneWorkspace , :cgne , args_cgne , def_args_cgne , () , () , kwargs_cgne , def_kwargs_cgne )
65+
(:DqgmresWorkspace , :dqgmres , args_dqgmres , def_args_dqgmres , optargs_dqgmres , def_optargs_dqgmres , kwargs_dqgmres , def_kwargs_dqgmres )
66+
(:SymmlqWorkspace , :symmlq , args_symmlq , def_args_symmlq , optargs_symmlq , def_optargs_symmlq , kwargs_symmlq , def_kwargs_symmlq )
67+
(:TrimrWorkspace , :trimr , args_trimr , def_args_trimr , optargs_trimr , def_optargs_trimr , kwargs_trimr , def_kwargs_trimr )
68+
(:UsymqrWorkspace , :usymqr , args_usymqr , def_args_usymqr , optargs_usymqr , def_optargs_usymqr , kwargs_usymqr , def_kwargs_usymqr )
69+
(:BilqrWorkspace , :bilqr , args_bilqr , def_args_bilqr , optargs_bilqr , def_optargs_bilqr , kwargs_bilqr , def_kwargs_bilqr )
70+
(:CrWorkspace , :cr , args_cr , def_args_cr , optargs_cr , def_optargs_cr , kwargs_cr , def_kwargs_cr )
71+
(:CarWorkspace , :car , args_car , def_args_car , optargs_car , def_optargs_car , kwargs_car , def_kwargs_car )
72+
(:CraigmrWorkspace , :craigmr , args_craigmr , def_args_craigmr , () , () , kwargs_craigmr , def_kwargs_craigmr )
73+
(:TricgWorkspace , :tricg , args_tricg , def_args_tricg , optargs_tricg , def_optargs_tricg , kwargs_tricg , def_kwargs_tricg )
74+
(:CraigWorkspace , :craig , args_craig , def_args_craig , () , () , kwargs_craig , def_kwargs_craig )
75+
(:DiomWorkspace , :diom , args_diom , def_args_diom , optargs_diom , def_optargs_diom , kwargs_diom , def_kwargs_diom )
76+
(:LslqWorkspace , :lslq , args_lslq , def_args_lslq , () , () , kwargs_lslq , def_kwargs_lslq )
77+
(:TrilqrWorkspace , :trilqr , args_trilqr , def_args_trilqr , optargs_trilqr , def_optargs_trilqr , kwargs_trilqr , def_kwargs_trilqr )
78+
(:CrmrWorkspace , :crmr , args_crmr , def_args_crmr , () , () , kwargs_crmr , def_kwargs_crmr )
79+
(:CgWorkspace , :cg , args_cg , def_args_cg , optargs_cg , def_optargs_cg , kwargs_cg , def_kwargs_cg )
80+
(:CglsWorkspace , :cgls , args_cgls , def_args_cgls , () , () , kwargs_cgls , def_kwargs_cgls )
81+
(:CgLanczosWorkspace, :cg_lanczos, args_cg_lanczos, def_args_cg_lanczos, optargs_cg_lanczos, def_optargs_cg_lanczos, kwargs_cg_lanczos, def_kwargs_cg_lanczos)
82+
(:BilqWorkspace , :bilq , args_bilq , def_args_bilq , optargs_bilq , def_optargs_bilq , kwargs_bilq , def_kwargs_bilq )
83+
(:MinresQlpWorkspace, :minres_qlp, args_minres_qlp, def_args_minres_qlp, optargs_minres_qlp, def_optargs_minres_qlp, kwargs_minres_qlp, def_kwargs_minres_qlp)
84+
(:QmrWorkspace , :qmr , args_qmr , def_args_qmr , optargs_qmr , def_optargs_qmr , kwargs_qmr , def_kwargs_qmr )
85+
(:GmresWorkspace , :gmres , args_gmres , def_args_gmres , optargs_gmres , def_optargs_gmres , kwargs_gmres , def_kwargs_gmres )
86+
(:FgmresWorkspace , :fgmres , args_fgmres , def_args_fgmres , optargs_fgmres , def_optargs_fgmres , kwargs_fgmres , def_kwargs_fgmres )
87+
(:FomWorkspace , :fom , args_fom , def_args_fom , optargs_fom , def_optargs_fom , kwargs_fom , def_kwargs_fom )
88+
(:GpmrWorkspace , :gpmr , args_gpmr , def_args_gpmr , optargs_gpmr , def_optargs_gpmr , kwargs_gpmr , def_kwargs_gpmr )
89+
(:CgLanczosShiftWorkspace , :cg_lanczos_shift , args_cg_lanczos_shift , def_args_cg_lanczos_shift , (), (), kwargs_cg_lanczos_shift , def_kwargs_cg_lanczos_shift )
90+
(:CglsLanczosShiftWorkspace, :cgls_lanczos_shift, args_cgls_lanczos_shift, def_args_cgls_lanczos_shift, (), (), kwargs_cgls_lanczos_shift, def_kwargs_cgls_lanczos_shift)
9991
]
10092
# Create the symbol for the in-place method
10193
krylov! = Symbol(krylov, :!)
10294

103-
# Alias for backward compatibility
104-
@eval const $alias = $workspace
105-
10695
## Generic constructors for each subtype of KrylovWorkspace
10796
if krylov in (:cg_lanczos_shift, :cgls_lanczos_shift)
10897
@eval krylov_workspace(::Val{Symbol($krylov)}, kc::KrylovConstructor, nshifts::Integer) = $workspace(kc, nshifts)
@@ -248,16 +237,13 @@ for (workspace, alias, krylov, args, def_args, optargs, def_optargs, kwargs, def
248237
end
249238

250239
# Block-Krylov methods
251-
for (workspace, alias, krylov, args, def_args, optargs, def_optargs, kwargs, def_kwargs) in [
252-
(:BlockMinresWorkspace, :BlockMinresSolver, :block_minres, args_block_minres, def_args_block_minres, optargs_block_minres, def_optargs_block_minres, kwargs_block_minres, def_kwargs_block_minres)
253-
(:BlockGmresWorkspace , :BlockGmresSolver , :block_gmres , args_block_gmres , def_args_block_gmres , optargs_block_gmres , def_optargs_block_gmres , kwargs_block_gmres , def_kwargs_block_gmres )
240+
for (workspace, krylov, args, def_args, optargs, def_optargs, kwargs, def_kwargs) in [
241+
(:BlockMinresWorkspace, :block_minres, args_block_minres, def_args_block_minres, optargs_block_minres, def_optargs_block_minres, kwargs_block_minres, def_kwargs_block_minres)
242+
(:BlockGmresWorkspace , :block_gmres , args_block_gmres , def_args_block_gmres , optargs_block_gmres , def_optargs_block_gmres , kwargs_block_gmres , def_kwargs_block_gmres )
254243
]
255244
# Create the symbol for the in-place method
256245
krylov! = Symbol(krylov, :!)
257246

258-
# Alias for backward compatibility
259-
@eval const $alias = $workspace
260-
261247
## Generic constructors for each subtype of BlockKrylovWorkspace
262248
if krylov == :block_gmres
263249
@eval krylov_workspace(::Val{Symbol($krylov)}, m::Integer, n::Integer, p::Integer, SV::Type, SM::Type; memory::Integer = 5) = $workspace(m, n, p, SV, SM; memory)

0 commit comments

Comments
 (0)