hold off on some things

This commit is contained in:
Mike J Innes 2018-05-01 12:16:56 +01:00
parent e186b958dd
commit 9a7e6e9c5c

View File

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