Merge commit '9a7e6e9c'

This commit is contained in:
Mike J Innes 2018-05-01 12:19:05 +01:00
commit 3870027c91
2 changed files with 8 additions and 7 deletions

View File

@ -7,22 +7,23 @@ 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
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
export Tracker
import .Tracker: data
using .Tracker: data
export TrackedArray, TrackedVector, TrackedMatrix, param
include("optimise/Optimise.jl")
using .Optimise
using .Optimise: @epochs
export SGD, ADAM, AdaMax, Momentum, Nesterov,
RMSProp, ADAGrad, ADADelta, AMSGrad
include("utils.jl")
include("onehot.jl")

View File

@ -1,6 +1,6 @@
module Optimise
export update!, params, train!,
export train!,
SGD, ADAM, AdaMax, Momentum, Nesterov, RMSProp, ADAGrad, ADADelta, AMSGrad
struct Param{T}