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

Merge pull request #104 from baggepinnen/patch-1

Browse Source 
Allow array of optimisers to train!
This commit is contained in:
Mike J Innes 2017-11-21 17:16:35 +01:00 committed by GitHub
commit 9f5c4dd3e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/optimise/train.jl
View File

@ -1,8 +1,8 @@
using Juno using Juno
using Flux.Tracker: back! using Flux.Tracker: back!
tocb(f) = f runall(f) = f
tocb(fs::AbstractVector) = () -> foreach(call, fs) runall(fs::AbstractVector) = () -> foreach(call, fs)
""" """
train!(loss, data, opt; cb = () -> ()) train!(loss, data, opt; cb = () -> ())
@ -11,10 +11,11 @@ For each datapoint `d` in `data` computes the gradient of `loss(d...)` through
backpropagation and calls the optimizer `opt` and the callback `cb` backpropagation and calls the optimizer `opt` and the callback `cb`
(i.e. `opt()` and `cb()`). (i.e. `opt()` and `cb()`).
Multiple callbacks can be passed to `cb` as an array. Multiple optimisers and callbacks can be passed to `opt` and `cb` as arrays.
""" """
function train!(loss, data, opt; cb = () -> ()) function train!(loss, data, opt; cb = () -> ())
cb = tocb(cb) cb = runall(cb)
opt = runall(opt)
@progress for d in data @progress for d in data
l = loss(d...) l = loss(d...)
isinf(l.data[]) && error("Loss is Inf") isinf(l.data[]) && error("Loss is Inf")