changes as requested

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

View File

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

View File

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

View File

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