resolve conflict

This commit is contained in:
Yao Lu 2020-04-22 01:24:13 +08:00
parent 1dfec7f38b
commit c4f5e83697
1 changed files with 1 additions and 2 deletions

View File

@ -5,8 +5,7 @@ using LinearAlgebra
export train!, update!,
SGD, Descent, ADAM, Momentum, Nesterov, RMSProp,
ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW, RADAM,
InvDecay, ExpDecay, WeightDecay, ClipValue, ClipNorm,
stop, Optimiser
InvDecay, ExpDecay, WeightDecay, stop, Optimiser, ClipValue, ClipNorm
include("optimisers.jl")
include("train.jl")