depend on Optimisers (#1864)

Author: mcabbott

Project.toml

@@ -13,6 +13,7 @@ MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
 NNlibCUDA = "a00861dc-f156-4864-bf3c-e6376f28a68d"
+Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
 ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -33,6 +34,7 @@ MLUtils = "0.2"
 MacroTools = "0.5"
 NNlib = "0.8.2"
 NNlibCUDA = "0.2"
+Optimisers = "0.2"
 ProgressLogging = "0.1"
 Reexport = "0.2, 1.0"
 SpecialFunctions = "1.8.2, 2.1.2"

src/Flux.jl

@@ -1,18 +1,17 @@
 module Flux
 
-# Zero Flux Given
-
 using Base: tail
-using Statistics, Random, LinearAlgebra, SpecialFunctions
-using Zygote, MacroTools, ProgressLogging, Reexport
+using LinearAlgebra, Statistics, Random  # standard lib
+using MacroTools, Reexport, ProgressLogging, SpecialFunctions
 using MacroTools: @forward
-@reexport using NNlib
 
+@reexport using NNlib
 using MLUtils
+import Optimisers: trainable  # before v0.13, Flux owned this function
 
+using Zygote, ChainRulesCore
 using Zygote: Params, @adjoint, gradient, pullback, @nograd
 export gradient
-using ChainRulesCore
 
 export Chain, Dense, Maxout, SkipConnection, Parallel,
        RNN, LSTM, GRU, GRUv3,
@@ -32,7 +31,6 @@ export Descent, ADAM, Momentum, Nesterov, RMSProp,
   ADAMW, RADAM, AdaBelief, InvDecay, ExpDecay,
   WeightDecay, ClipValue, ClipNorm
 
-
 using CUDA
 const use_cuda = Ref{Union{Nothing,Bool}}(nothing)