diff --git a/src/Flux.jl b/src/Flux.jl index 7c72cbbc..d285b5a9 100644 --- a/src/Flux.jl +++ b/src/Flux.jl @@ -19,9 +19,9 @@ export Tracker, TrackedArray, TrackedVector, TrackedMatrix, param include("optimise/Optimise.jl") using .Optimise using .Optimise: @epochs -export Descent, ADAM, Momentum, Nesterov, RMSProp, - ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, - ADAMW, InvDecay, ExpDecay, WeightDecay +export SGD, Descent, ADAM, Momentum, Nesterov, RMSProp, + ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, + ADAMW, InvDecay, ExpDecay, WeightDecay include("utils.jl") include("onehot.jl") diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl index cf12a3c3..5bb38d1e 100644 --- a/src/optimise/Optimise.jl +++ b/src/optimise/Optimise.jl @@ -1,7 +1,7 @@ module Optimise export train!, - Descent, ADAM, Momentum, Nesterov, RMSProp, + SGD, Descent, ADAM, Momentum, Nesterov, RMSProp, ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW, InvDecay, ExpDecay, WeightDecay, stop, Optimiser diff --git a/src/optimise/deprecations.jl b/src/optimise/deprecations.jl index 8529799f..d04a5447 100644 --- a/src/optimise/deprecations.jl +++ b/src/optimise/deprecations.jl @@ -12,8 +12,8 @@ function updaterule(opt, ps) end end -function Descent(params::AbstractArray, η = 0.1; decay = 0.) - depwarn("Descent(params) is deprecated; use Descent(η::Float64) instead", :Descent) +function SGD(params::AbstractArray, η = 0.1; decay = 0.) + depwarn("SGD(params) is deprecated; use Descent(η::Float64) instead", :SGD) ps = params opt = Descent(η)