Skip to content
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

Move to Optimisers.jl and add schedules #1487

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions Manifest.toml
Original file line number Diff line number Diff line change
@@ -256,11 +256,26 @@ git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3"
uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
version = "0.5.3+4"

[[Optimisers]]
deps = ["Functors", "Random", "Requires", "Statistics"]
git-tree-sha1 = "87cb22d07ba9b96bab0b74f135b5a8aa127381f1"
repo-rev = "darsnack/initial-impl"
repo-url = "https://github.com/darsnack/Optimisers.jl"
uuid = "3bd65402-5787-11e9-1adc-39752487f4e2"
version = "0.1.0"

[[OrderedCollections]]
git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db"
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
version = "1.3.2"

[[ParameterSchedulers]]
git-tree-sha1 = "ab80539e1061e586a49300813039f5c11d3ba8e8"
repo-rev = "darsnack/rm-optim"
repo-url = "https://github.com/darsnack/ParameterSchedulers.jl"
uuid = "d7d3b36b-41b8-4d0d-a2bf-768c6151755e"
version = "0.2.0"

[[Pkg]]
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
2 changes: 2 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
ParameterSchedulers = "d7d3b36b-41b8-4d0d-a2bf-768c6151755e"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2 changes: 1 addition & 1 deletion src/Flux.jl
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ using .Optimise: skip
export Descent, ADAM, Momentum, Nesterov, RMSProp,
ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, OADAM,
ADAMW, RADAM, AdaBelief, InvDecay, ExpDecay,
WeightDecay, ClipValue, ClipNorm
WeightDecay#, ClipValue, ClipNorm


using CUDA
18 changes: 13 additions & 5 deletions src/optimise/Optimise.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
module Optimise

using LinearAlgebra
using Reexport

export train!, update!,
Descent, ADAM, Momentum, Nesterov, RMSProp,
ADAGrad, AdaMax, ADADelta, AMSGrad, NADAM, ADAMW,RADAM, OADAM, AdaBelief,
InvDecay, ExpDecay, WeightDecay, stop, skip, Optimiser,
ClipValue, ClipNorm
@reexport using Optimisers

export train!, stop, skip, Schedule
# ClipValue, ClipNorm,

module Schedule
using ..Optimise
using ParameterSchedulers
import ParameterSchedulers: AbstractSchedule

include("schedulers.jl")
end

include("optimisers.jl")
include("train.jl")
Loading