Skip to content

Depend on Optimisers.jl #1864

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Mar 5, 2022
Merged

Depend on Optimisers.jl #1864

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a58542
depend on Optimisers
mcabbott Feb 5, 2022
38bd757
Merge branch 'master' into optimisers
mcabbott Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
12 changes: 5 additions & 7 deletions src/Flux.jl
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
module Flux

# Zero Flux Given
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd totally forgotten about this line 😆


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)