Skip to content

Commit 06d420a

Browse files
A bunch of version bumps
1 parent c5648ec commit 06d420a

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

Project.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ LBFGSB = "5be7bae1-8223-5378-bac3-9e7378a2f6e6"
1111
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1212
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
1313
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
14+
Manifolds = "1cead3c2-87b3-11e9-0ccd-23c62b72b94e"
15+
Manopt = "0fc0a36d-df90-57f3-8f93-d78a9fc72bb5"
1416
OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
17+
OptimizationManopt = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
1518
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1619
ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
1720
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -41,8 +44,11 @@ Logging = "1.10"
4144
LoggingExtras = "0.4, 1"
4245
Lux = "1.12.4"
4346
MLUtils = "0.4"
47+
Manifolds = "0.10.7"
48+
Manopt = "0.5.13"
4449
ModelingToolkit = "9"
45-
Optim = ">= 1.4.1"
50+
Optim = "1"
51+
Optimisers = "0.3, 0.4"
4652
OptimizationBase = "2"
4753
OptimizationMOI = "0.5"
4854
OptimizationOptimJL = "0.4"
@@ -51,7 +57,7 @@ OrdinaryDiffEqTsit5 = "1"
5157
Pkg = "1"
5258
Printf = "1.10"
5359
ProgressLogging = "0.1"
54-
Random = "1.10"
60+
Random = "1.10"
5561
Reexport = "1.2"
5662
ReverseDiff = "1"
5763
SafeTestsets = "0.1"
@@ -63,7 +69,6 @@ Symbolics = "6"
6369
TerminalLoggers = "0.1"
6470
Test = "1.10"
6571
Tracker = "0.2"
66-
Optimisers = ">= 0.2.5"
6772
Zygote = "0.6, 0.7"
6873
julia = "1.10"
6974

@@ -101,7 +106,4 @@ Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
101106
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
102107

103108
[targets]
104-
test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff",
105-
"Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers",
106-
"OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays", "SparseDiffTools",
107-
"Symbolics", "Test", "Tracker", "Zygote"]
109+
test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff", "Ipopt", "IterTools", "Lux", "MLUtils", "ModelingToolkit", "Optim", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers", "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays", "SparseDiffTools", "Symbolics", "Test", "Tracker", "Zygote"]

docs/Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ Ipopt = "1"
5656
IterTools = "1"
5757
Juniper = "0.9"
5858
Lux = "1"
59-
Manifolds = "0.9"
60-
Manopt = "0.4"
59+
Manifolds = "0.10"
60+
Manopt = "0.5"
6161
MLUtils = "0.4.4"
62-
ModelingToolkit = "9"
62+
ModelingToolkit = "10"
6363
NLPModels = "0.21"
6464
NLPModelsTest = "0.10"
6565
NLopt = "0.6, 1"

lib/OptimizationManopt/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1515
[compat]
1616
LinearAlgebra = "1.10"
1717
ManifoldDiff = "0.3.10"
18-
Manifolds = "0.9.18"
18+
Manifolds = "0.10"
1919
ManifoldsBase = "0.15.10"
20-
Manopt = "0.4.63"
20+
Manopt = "0.5"
2121
Optimization = "4"
2222
Reexport = "1.2"
2323
julia = "1.9"

lib/OptimizationManopt/src/OptimizationManopt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function call_manopt_optimizer(
6767
x0;
6868
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
6969
evaluation::AbstractEvaluationType = Manopt.AllocatingEvaluation(),
70-
stepsize::Stepsize = ArmijoLinesearch(M),
70+
stepsize::Manopt.ManifoldDefaultsFactory = ArmijoLinesearch(),
7171
kwargs...)
7272
opts = gradient_descent(M,
7373
loss,
@@ -111,7 +111,7 @@ function call_manopt_optimizer(M::ManifoldsBase.AbstractManifold,
111111
x0;
112112
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
113113
evaluation::AbstractEvaluationType = InplaceEvaluation(),
114-
stepsize::Stepsize = ArmijoLinesearch(M),
114+
stepsize::Manopt.ManifoldDefaultsFactory = ArmijoLinesearch(),
115115
kwargs...)
116116
opts = conjugate_gradient_descent(M,
117117
loss,
@@ -171,7 +171,7 @@ function call_manopt_optimizer(M::Manopt.AbstractManifold,
171171
evaluation::AbstractEvaluationType = InplaceEvaluation(),
172172
retraction_method::AbstractRetractionMethod = default_retraction_method(M),
173173
vector_transport_method::AbstractVectorTransportMethod = default_vector_transport_method(M),
174-
stepsize = WolfePowellLinesearch(M;
174+
stepsize::Manopt.ManifoldDefaultsFactory = WolfePowellLinesearch(;
175175
retraction_method = retraction_method,
176176
vector_transport_method = vector_transport_method,
177177
linesearch_stopsize = 1e-12),
@@ -308,7 +308,7 @@ function call_manopt_optimizer(M::ManifoldsBase.AbstractManifold,
308308
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
309309
evaluation::AbstractEvaluationType = InplaceEvaluation(),
310310
retraction_method::AbstractRetractionMethod = default_retraction_method(M),
311-
stepsize::Stepsize = DecreasingStepsize(; length = 2.0, shift = 2),
311+
stepsize::Manopt.ManifoldDefaultsFactory = DecreasingStepsize(; length = 2.0, shift = 2),
312312
kwargs...)
313313
opt = Frank_Wolfe_method(M,
314314
loss,

lib/OptimizationOptimJL/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1313
[compat]
1414
Optim = "1"
1515
Optimization = "4"
16-
PrecompileTools = "1.2"
16+
PrecompileTools = "1"
1717
Reexport = "1.2"
1818
SparseArrays = "1.6"
1919
julia = "1.6"

0 commit comments

Comments
 (0)