Skip to content

Commit d99edb2

Browse files
committed
Roll back ManOpt and Manifold related changes
- Revert OptimizationManopt compat entries (Manifolds 0.10→0.9.18, Manopt 0.5→0.4.63) - Revert OptimizationManopt source code API changes - Remove Manifolds, Manopt, and OptimizationManopt from main Project.toml - Keep other version bumps: Optim, Optimisers, PrecompileTools This allows the other compat helper PRs to proceed while ManOpt needs more work.
1 parent 5070cab commit d99edb2

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

Project.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,11 @@ LinearAlgebra = "1.10"
4040
Logging = "1.10"
4141
LoggingExtras = "0.4, 1"
4242
Lux = "1.12.4"
43-
Manifolds = "0.10"
44-
Manopt = "0.5"
4543
MLUtils = "0.4"
4644
ModelingToolkit = "9"
4745
Optim = "1"
4846
Optimisers = "0.3, 0.4"
4947
OptimizationBase = "2"
50-
OptimizationManopt = "0.1"
5148
OptimizationMOI = "0.5"
5249
OptimizationOptimJL = "0.4"
5350
OptimizationOptimisers = "0.3"
@@ -83,11 +80,8 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
8380
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
8481
IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
8582
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
86-
Manifolds = "1cead3c2-87b3-11e9-0ccd-23c62b72b94e"
87-
Manopt = "0fc0a36d-df90-57f3-8f93-d78a9fc72bb5"
8883
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
8984
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
90-
OptimizationManopt = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
9185
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
9286
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
9387
OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
@@ -107,4 +101,4 @@ Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
107101
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
108102

109103
[targets]
110-
test = ["Aqua", "BenchmarkTools", "Boltz", "ComponentArrays", "DiffEqFlux", "Enzyme", "FiniteDiff", "Flux", "ForwardDiff", "Ipopt", "IterTools", "Lux", "Manifolds", "Manopt", "MLUtils", "ModelingToolkit", "Optim", "OptimizationManopt", "OptimizationMOI", "OptimizationOptimJL", "OptimizationOptimisers", "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReverseDiff", "SafeTestsets", "SciMLSensitivity", "SparseArrays", "SparseDiffTools", "Symbolics", "Test", "Tracker", "Zygote"]
104+
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.10"
60-
Manopt = "0.5"
59+
Manifolds = "0.9"
60+
Manopt = "0.4"
6161
MLUtils = "0.4.4"
62-
ModelingToolkit = "10"
62+
ModelingToolkit = "9"
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.10"
18+
Manifolds = "0.9.18"
1919
ManifoldsBase = "0.15.10"
20-
Manopt = "0.5"
20+
Manopt = "0.4.63"
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::Manopt.ManifoldDefaultsFactory = ArmijoLinesearch(),
70+
stepsize::Stepsize = ArmijoLinesearch(M),
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::Manopt.ManifoldDefaultsFactory = ArmijoLinesearch(),
114+
stepsize::Stepsize = ArmijoLinesearch(M),
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::Manopt.ManifoldDefaultsFactory = WolfePowellLinesearch(;
174+
stepsize = WolfePowellLinesearch(M;
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::Manopt.ManifoldDefaultsFactory = DecreasingStepsize(; length = 2.0, shift = 2),
311+
stepsize::Stepsize = DecreasingStepsize(; length = 2.0, shift = 2),
312312
kwargs...)
313313
opt = Frank_Wolfe_method(M,
314314
loss,

0 commit comments

Comments
 (0)