correct SGD deprecation

This commit is contained in:
Mike J Innes 2018-10-31 15:30:30 +00:00
parent bffaceee02
commit 4a54d30cbf
3 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@ export Tracker, TrackedArray, TrackedVector, TrackedMatrix, param
include("optimise/Optimise.jl") include("optimise/Optimise.jl")
using .Optimise using .Optimise
using .Optimise: @epochs using .Optimise: @epochs
export Descent, ADAM, Momentum, Nesterov, RMSProp, export SGD, Descent, ADAM, Momentum, Nesterov, RMSProp,
ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM,
ADAMW, InvDecay, ExpDecay, WeightDecay ADAMW, InvDecay, ExpDecay, WeightDecay

View File

@ -1,7 +1,7 @@
module Optimise module Optimise
export train!, export train!,
Descent, ADAM, Momentum, Nesterov, RMSProp, SGD, Descent, ADAM, Momentum, Nesterov, RMSProp,
ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW, ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW,
InvDecay, ExpDecay, WeightDecay, stop, Optimiser InvDecay, ExpDecay, WeightDecay, stop, Optimiser

View File

@ -12,8 +12,8 @@ function updaterule(opt, ps)
end end
end end
function Descent(params::AbstractArray, η = 0.1; decay = 0.) function SGD(params::AbstractArray, η = 0.1; decay = 0.)
depwarn("Descent(params) is deprecated; use Descent(η::Float64) instead", :Descent) depwarn("SGD(params) is deprecated; use Descent(η::Float64) instead", :SGD)
ps = params ps = params
opt = Descent(η) opt = Descent(η)