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

changes as requested

Browse Source
This commit is contained in:
Dhairya Gandhi 2018-08-21 23:22:20 +05:30
parent 1af7a53e1f
commit ed044e2df7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Flux.jl
View File

@ -21,7 +21,7 @@ include("optimise/Optimise.jl")
using .Optimise using .Optimise
using .Optimise: @epochs using .Optimise: @epochs
export SGD, ADAM, ADAMW, AdaMax, Momentum, Nesterov, export SGD, ADAM, ADAMW, AdaMax, Momentum, Nesterov,
RMSProp, ADAGrad, ADADelta, AMSGrad, NADAM, stop, StopException RMSProp, ADAGrad, ADADelta, AMSGrad, NADAM, stop
include("utils.jl") include("utils.jl")
include("onehot.jl") include("onehot.jl")

2
src/optimise/Optimise.jl
View File

@ -2,7 +2,7 @@ module Optimise
export train!, export train!,
SGD, ADAM, ADAMW, AdaMax, Momentum, Nesterov, SGD, ADAM, ADAMW, AdaMax, Momentum, Nesterov,
RMSProp, ADAGrad, ADADelta, AMSGrad, NADAM, stop, StopException RMSProp, ADAGrad, ADADelta, AMSGrad, NADAM
struct Param{T} struct Param{T}
x::T x::T

9
src/optimise/train.jl
View File

@ -55,14 +55,13 @@ function train!(loss, data, opt; cb = () -> ())
cb = runall(cb) cb = runall(cb)
opt = runall(opt) opt = runall(opt)
@progress for d in data @progress for d in data
l = loss(d...)
@interrupts back!(l)
opt()
try try
cb() l = loss(d...)
@interrupts back!(l)
opt()
cb() == :stop && break
catch ex catch ex
if ex isa StopException if ex isa StopException
@info "Stop condition met"
break break
else else
rethrow(ex) rethrow(ex)