Skip to content
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

Jump to bottom

Remove superfluous methods on Grads #1486

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Remove superfluous methods on Grads #1486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8fe70d
Remove superfluous methods on `Grads`
ToucheSir Dec 31, 2023
2cd611e
Remove broadcast-related ambiguity with `Params`
ToucheSir Dec 31, 2023
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
36 changes: 1 addition & 35 deletions src/compiler/interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ function Base.delete!(ps::Params, x)
return ps
end

Base.Broadcast.broadcasted(f, ps::Params) = broadcasted(f, ps.order)
Base.Broadcast.broadcastable(ps::Params) = ps.order

@adjoint function Broadcast.broadcasted(f::Function, ps::Params)
f.(ps), _ -> throw(ArgumentError("Zygote.Params does not support broadcasting within gradients, try iteration `for p in ps`"))
Expand Down Expand Up @@ -375,40 +375,6 @@ function Base.copy(gs::Grads)
merge!(gs_new, gs)
end

broadcasted(f, gs::Grads, gss::ADictOrGrads...) = map(f, gs, gss...)

broadcasted(f, a::Numeric, gs::Grads) = map(x -> f(a, x), gs)
broadcasted(f, gs::Grads, a::Numeric) = map(x -> f(x, a), gs)

function materialize!(gs1::Grads, gs2::Grads)
issetequal(gs1.params, gs2.params) ||
throw(ArgumentError("Expected Grads objects with the same Params."))
for p in gs1.params
gs1[p] = gs2[p]
end
return gs1
end


function Base.map(f, gs1::Grads, gss::ADictOrGrads...)
gsout = Grads(IdDict{Any,Any}(), Params(gs1.params))
return map!(f, gsout, gs1, gss...)
end

function Base.map!(f, gsout::Grads, gss::ADictOrGrads...)
all(issetequal(gsout.params, keys(gs)) for gs in gss) ||
throw(ArgumentError("map! expects Grads objects with the same Params."))
for p in gsout.params
gsout[p] = f((_getformap(gs, p) for gs in gss)...)
end
return gsout
end

function _getformap(gs, p)
g = gs[p]
isnothing(g) ? fill!(similar(p), 0) : g
end

function pullback(f, ps::Params)
cx = Context{true}(nothing)
y, back = _pullback(cx, f)
Expand Down
Loading