From c4f5e83697a2b6163c29c8ba2e45a394c00d9bdb Mon Sep 17 00:00:00 2001 From: Yao Lu Date: Wed, 22 Apr 2020 01:24:13 +0800 Subject: [PATCH] resolve conflict --- src/optimise/Optimise.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl index 184d472c..66be6dce 100644 --- a/src/optimise/Optimise.jl +++ b/src/optimise/Optimise.jl @@ -5,8 +5,7 @@ using LinearAlgebra export train!, update!, SGD, Descent, ADAM, Momentum, Nesterov, RMSProp, ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW, RADAM, - InvDecay, ExpDecay, WeightDecay, ClipValue, ClipNorm, - stop, Optimiser + InvDecay, ExpDecay, WeightDecay, stop, Optimiser, ClipValue, ClipNorm include("optimisers.jl") include("train.jl")