From 1baa7227e3a4f835133e41db51bf51a89ec91a10 Mon Sep 17 00:00:00 2001
From: Mike J Innes <mike.j.innes@gmail.com>
Date: Tue, 13 Feb 2018 15:45:33 +0000
Subject: [PATCH] reorganise batches

---
 src/Flux.jl                   | 1 -
 src/batches/Batches.jl        | 9 ---------
 src/data/Data.jl              | 1 +
 src/data/sentiment.jl         | 2 +-
 src/{batches => data}/tree.jl | 0
 5 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 src/batches/Batches.jl
 rename src/{batches => data}/tree.jl (100%)

diff --git a/src/Flux.jl b/src/Flux.jl
index 159f7325..939d6e2c 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -34,7 +34,6 @@ include("layers/conv.jl")
 include("layers/recurrent.jl")
 include("layers/normalisation.jl")
 
-include("batches/Batches.jl")
 include("data/Data.jl")
 
 include("jit/JIT.jl")
diff --git a/src/batches/Batches.jl b/src/batches/Batches.jl
deleted file mode 100644
index a2424549..00000000
--- a/src/batches/Batches.jl
+++ /dev/null
@@ -1,9 +0,0 @@
-module Batches
-
-import ..Flux
-
-export Tree
-
-include("tree.jl")
-
-end
diff --git a/src/data/Data.jl b/src/data/Data.jl
index e2118029..a4f152c3 100644
--- a/src/data/Data.jl
+++ b/src/data/Data.jl
@@ -14,6 +14,7 @@ include("mnist.jl")
 include("cmudict.jl")
 using .CMUDict
 
+include("tree.jl")
 include("sentiment.jl")
 using .Sentiment
 
diff --git a/src/data/sentiment.jl b/src/data/sentiment.jl
index 8ac7a5a1..f471e628 100644
--- a/src/data/sentiment.jl
+++ b/src/data/sentiment.jl
@@ -19,7 +19,7 @@ function getfile(name)
   return text
 end
 
-using ..Flux.Batches
+using ..Data: Tree
 
 totree_(n, w) = Tree{Any}((parse(Int, n), w))
 totree_(n, a, b) = Tree{Any}((parse(Int, n), nothing), totree(a), totree(b))
diff --git a/src/batches/tree.jl b/src/data/tree.jl
similarity index 100%
rename from src/batches/tree.jl
rename to src/data/tree.jl