From 007586858c4f0451f0be7b65149d497635024884 Mon Sep 17 00:00:00 2001 From: Yao Lu Date: Thu, 14 May 2020 17:13:35 +0800 Subject: [PATCH] fix export merge conflict --- src/optimise/Optimise.jl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl index 4ea5235e..0f5e644f 100644 --- a/src/optimise/Optimise.jl +++ b/src/optimise/Optimise.jl @@ -2,10 +2,11 @@ module Optimise using LinearAlgebra -export train!, update!, stop, Optimiser, - Descent, ADAM, Momentum, Nesterov, RMSProp, - ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW, RADAM, - InvDecay, ExpDecay, WeightDecay, ClipValue, ClipNorm +export train!, update!, + Descent, ADAM, Momentum, Nesterov, RMSProp, + ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW,RADAM, + InvDecay, ExpDecay, WeightDecay, stop, Optimiser, + ClipValue, ClipNorm include("optimisers.jl") include("train.jl")