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.

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

add ADAM #3

Merged
merged 7 commits into from
Nov 27, 2020
Merged
Changes from 1 commit
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
29 changes: 22 additions & 7 deletions src/rules.jl
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
abstract type AbstractOptimiser end

(opt::AbstractOptimiser)(x, x̂, state) = update(opt, x, x̂, state)
(opt::AbstractOptimiser)(m, m̂) = update(opt, m, m̂, state(opt, m))[1]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method seems a bit sketchy to me. It makes sense for Descent but for everything else seems like it risks misleading people (eg they think everything's working but they are actually using ADAM without state). So maybe it's better as a special case on Descent.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure


"""
Descent(η)

Classic gradient descent optimiser with learning rate `η`.
For each parameter `p` and its gradient `p̄`, this runs `p -= η*p̄`.
"""
mutable struct Descent
mutable struct Descent <: AbstractOptimiser
eta::Float64
end

init(o::Descent, x) = nothing

function apply(o::Descent, x, x̄, state)
function apply(o::Descent, x, x̄, st)
η = convert(eltype(x̄), o.eta)
x̄ .* η, state
x̄ .* η, st
end

function (o::Descent)(m, m̄)
update(o, m, m̄, state(o, m))[1]
mutable struct ADAM{T,K} <: AbstractOptimiser
eta::T
beta::Tuple{K,K}
end

function (o::Descent)(m, m̄, st)
update(o, m, m̄, st)
const ϵ = 1e-8
init(o::ADAM, x) = IdDict()

function apply(o::ADAM, x, Δ, st)
η, β = o.eta, o.beta
mt, vt, βp = get!(st, x, (zero(x), zero(x), β))
@. mt = β[1] * mt + (1 - β[1]) * Δ
@. vt = β[2] * vt + (1 - β[2]) * Δ^2
@. Δ = mt / (1 - βp[1]) / (√(vt / (1 - βp[2])) + ϵ) * η
st[x] = (mt, vt, βp .* β)
return Δ, st
end