Skip to content

Improve IdentityOperator and ScaledOperator actions #289

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 1 commit into from
Jul 25, 2025
Merged

Improve IdentityOperator and ScaledOperator actions #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 10 additions & 24 deletions src/basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,14 @@ function (ii::IdentityOperator)(v::AbstractVecOrMat, u, p, t; kwargs...)
end

# In-place: w is destination, v is action vector, u is update vector
function (ii::IdentityOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t; kwargs...)
@inline function (ii::IdentityOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t; kwargs...)
@assert size(v, 1) == ii.len
update_coefficients!(ii, u, p, t; kwargs...)
copy!(w, v)
end

# In-place with scaling: w = α*(ii*v) + β*w
function (ii::IdentityOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t, α, β; kwargs...)
@inline function (ii::IdentityOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t, α, β; kwargs...)
@assert size(v, 1) == ii.len
update_coefficients!(ii, u, p, t; kwargs...)
mul!(w, I, v, α, β)
end

Expand Down Expand Up @@ -388,29 +386,17 @@ function (L::ScaledOperator)(v::AbstractVecOrMat, u, p, t; kwargs...)
end

# In-place: w is destination, v is action vector, u is update vector
function (L::ScaledOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t; kwargs...)
update_coefficients!(L, u, p, t; kwargs...)
if iszero(L.λ)
lmul!(false, w)
return w
else
a = convert(Number, L.λ)
mul!(w, L.L, v, a, false)
return w
end
@inline function (L::ScaledOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t; kwargs...)
update_coefficients!(L.λ, u, p, t; kwargs...)
a = convert(Number, L.λ)
return L.L(w, v, u, p, t, a, false; kwargs...)
end

# In-place with scaling: w = α*(L*v) + β*w
function (L::ScaledOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t, α, β; kwargs...)
update_coefficients!(L, u, p, t; kwargs...)
if iszero(L.λ)
lmul!(β, w)
return w
else
a = convert(Number, L.λ * α)
mul!(w, L.L, v, a, β)
return w
end
@inline function (L::ScaledOperator)(w::AbstractVecOrMat, v::AbstractVecOrMat, u, p, t, α, β; kwargs...)
update_coefficients!(L.λ, u, p, t; kwargs...)
a = convert(Number, L.λ * α)
return L.L(w, v, u, p, t, a, β; kwargs...)
end


Expand Down
Loading