From 2f1a9847fae66519ff903a051115d088e8a5fdf8 Mon Sep 17 00:00:00 2001 From: Dhairya Gandhi Date: Wed, 22 Aug 2018 21:25:26 +0530 Subject: [PATCH] deprecate :stop from optimizers; housekeeping --- src/Flux.jl | 4 +--- src/optimise/Optimise.jl | 2 +- src/optimise/train.jl | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Flux.jl b/src/Flux.jl index 18195901..e0b40941 100644 --- a/src/Flux.jl +++ b/src/Flux.jl @@ -23,7 +23,6 @@ using .Optimise: @epochs export SGD, ADAM, ADAMW, AdaMax, Momentum, Nesterov, RMSProp, ADAGrad, ADADelta, AMSGrad, NADAM - include("utils.jl") include("onehot.jl") include("treelike.jl") @@ -38,5 +37,4 @@ include("data/Data.jl") @init @require CuArrays="3a865a2d-5b23-5a0f-bc46-62713ec82fae" include("cuda/cuda.jl") -end # module - +end # module \ No newline at end of file diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl index c4828c9e..9c7fd605 100644 --- a/src/optimise/Optimise.jl +++ b/src/optimise/Optimise.jl @@ -20,4 +20,4 @@ using Flux.Tracker: TrackedArray Param(x::TrackedArray) = Param(x.data, x.grad) # Base.convert(::Type{Param}, x::TrackedArray) = Param(x.data, x.grad) -end +end \ No newline at end of file diff --git a/src/optimise/train.jl b/src/optimise/train.jl index 007613b6..61eb1258 100644 --- a/src/optimise/train.jl +++ b/src/optimise/train.jl @@ -60,6 +60,7 @@ function train!(loss, data, opt; cb = () -> ()) @interrupts back!(l) opt() cb() == :stop && break + @deprecate :stop Flux.stop() catch ex if ex isa StopException break