diff --git a/Project.toml b/Project.toml index e33db9c3..5ae5428b 100644 --- a/Project.toml +++ b/Project.toml @@ -20,9 +20,7 @@ MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d" MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba" -OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1" OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" @@ -48,9 +46,7 @@ MLJBase = "1" MLJModelInterface = "1" MLUtils = "0.4" NNlib = "0.9" -Optimisers = "0.4" Optimization = "4" -OptimizationOptimisers = "0.3" OrdinaryDiffEqDefault = "1" Random = "1" SciMLBase = "2" diff --git a/examples/usage.jl b/examples/usage.jl index c6838e0f..f719bc47 100644 --- a/examples/usage.jl +++ b/examples/usage.jl @@ -53,11 +53,11 @@ r = rand(data_dist, nvars, n) r = convert.(Float32, r) # Fit It -using DataFrames, MLJBase, Zygote, ADTypes, OptimizationOptimisers +using DataFrames, MLJBase, Zygote, ADTypes, Optimization df = DataFrame(transpose(r), :auto) model = ICNFModel( icnf; - optimizers = (Lion(),), + optimizers = (Sophia(),), n_epochs = 300, adtype = AutoZygote(), batch_size = 512, diff --git a/src/ContinuousNormalizingFlows.jl b/src/ContinuousNormalizingFlows.jl index 19df19b4..c748e29f 100644 --- a/src/ContinuousNormalizingFlows.jl +++ b/src/ContinuousNormalizingFlows.jl @@ -16,9 +16,7 @@ import ADTypes, MLJModelInterface, MLUtils, NNlib, - Optimisers, Optimization, - OptimizationOptimisers, OrdinaryDiffEqDefault, Random, SciMLBase, diff --git a/src/exts/mlj_ext/core_cond_icnf.jl b/src/exts/mlj_ext/core_cond_icnf.jl index 223c2a03..c1e44d19 100644 --- a/src/exts/mlj_ext/core_cond_icnf.jl +++ b/src/exts/mlj_ext/core_cond_icnf.jl @@ -13,7 +13,7 @@ end function CondICNFModel( m::AbstractICNF, loss::Function = loss; - optimizers::Tuple = (Optimisers.Lion(),), + optimizers::Tuple = (Optimization.Sophia(),), n_epochs::Int = 300, adtype::ADTypes.AbstractADType = ADTypes.AutoZygote(), batch_size::Int = 32, diff --git a/src/exts/mlj_ext/core_icnf.jl b/src/exts/mlj_ext/core_icnf.jl index 7b31b0b1..5b78d1ca 100644 --- a/src/exts/mlj_ext/core_icnf.jl +++ b/src/exts/mlj_ext/core_icnf.jl @@ -13,7 +13,7 @@ end function ICNFModel( m::AbstractICNF, loss::Function = loss; - optimizers::Tuple = (Optimisers.Lion(),), + optimizers::Tuple = (Optimization.Sophia(),), n_epochs::Int = 300, adtype::ADTypes.AbstractADType = ADTypes.AutoZygote(), batch_size::Int = 32,