From e186b958ddd01c04512bc6d3bbf7556c2550ba5c Mon Sep 17 00:00:00 2001
From: CarloLucibello <carlo.lucibello@gmail.com>
Date: Thu, 22 Feb 2018 11:25:47 -0500
Subject: [PATCH 1/2] more exports

---
 src/Flux.jl              | 16 +++++++++-------
 src/optimise/Optimise.jl |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Flux.jl b/src/Flux.jl
index 7746ecff..5f7bbdfe 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -7,26 +7,25 @@ module Flux
 using Juno, Requires, Reexport
 using MacroTools: @forward
 
-export Chain, Dense, RNN, LSTM, GRU, Conv, Conv2D,
-  Dropout, LayerNorm, BatchNorm,
-  SGD, ADAM, Momentum, Nesterov, AMSGrad,
-  param, params, mapleaves, cpu, gpu
-
 @reexport using NNlib
 using NNlib: @fix
 
 include("tracker/Tracker.jl")
 using .Tracker
-export Tracker
-import .Tracker: data
+using .Tracker: data
+export TrackedArray, TrackedVector, TrackedMatrix, param, back!
 
 include("optimise/Optimise.jl")
 using .Optimise
 using .Optimise: @epochs
+export train!,
+       SGD, ADAM, Momentum, Nesterov,
+       RMSProp, ADAGrad, ADADelta, AMSGrad
 
 include("utils.jl")
 include("onehot.jl")
 include("treelike.jl")
+export params, mapleaves, cpu, gpu, onehot, batch, glorot_normal, glorot_uniform
 
 include("layers/stateless.jl")
 include("layers/basic.jl")
@@ -34,6 +33,9 @@ include("layers/conv.jl")
 include("layers/recurrent.jl")
 include("layers/normalise.jl")
 
+export Chain, Dense, RNN, LSTM, GRU, Conv2D,
+       Dropout, LayerNorm, BatchNorm
+
 include("data/Data.jl")
 
 @require CuArrays include("cuda/cuda.jl")
diff --git a/src/optimise/Optimise.jl b/src/optimise/Optimise.jl
index c07ba218..5d5d9ea0 100644
--- a/src/optimise/Optimise.jl
+++ b/src/optimise/Optimise.jl
@@ -1,6 +1,6 @@
 module Optimise
 
-export update!, params, train!,
+export train!,
   SGD, ADAM, AdaMax, Momentum, Nesterov, RMSProp, ADAGrad, ADADelta, AMSGrad
 
 struct Param{T}

From 9a7e6e9c5c012f42e5be2e3956af9179971f35fe Mon Sep 17 00:00:00 2001
From: Mike J Innes <mike.j.innes@gmail.com>
Date: Tue, 1 May 2018 12:16:56 +0100
Subject: [PATCH 2/2] hold off on some things

---
 src/Flux.jl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Flux.jl b/src/Flux.jl
index 5f7bbdfe..6cb92c50 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -7,25 +7,27 @@ module Flux
 using Juno, Requires, Reexport
 using MacroTools: @forward
 
+export Chain, Dense, RNN, LSTM, GRU, Conv,
+       Dropout, LayerNorm, BatchNorm,
+       params, mapleaves, cpu, gpu
+
 @reexport using NNlib
 using NNlib: @fix
 
 include("tracker/Tracker.jl")
 using .Tracker
 using .Tracker: data
-export TrackedArray, TrackedVector, TrackedMatrix, param, back!
+export TrackedArray, TrackedVector, TrackedMatrix, param
 
 include("optimise/Optimise.jl")
 using .Optimise
 using .Optimise: @epochs
-export train!,
-       SGD, ADAM, Momentum, Nesterov,
+export SGD, ADAM, AdaMax, Momentum, Nesterov,
        RMSProp, ADAGrad, ADADelta, AMSGrad
 
 include("utils.jl")
 include("onehot.jl")
 include("treelike.jl")
-export params, mapleaves, cpu, gpu, onehot, batch, glorot_normal, glorot_uniform
 
 include("layers/stateless.jl")
 include("layers/basic.jl")
@@ -33,9 +35,6 @@ include("layers/conv.jl")
 include("layers/recurrent.jl")
 include("layers/normalise.jl")
 
-export Chain, Dense, RNN, LSTM, GRU, Conv2D,
-       Dropout, LayerNorm, BatchNorm
-
 include("data/Data.jl")
 
 @require CuArrays include("cuda/cuda.jl")