TastyPancakes
/
Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/optimise/Optimise.jl
View File

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