Skip to content

update Manopt and associated packages #906

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update Manopt and associated packages #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88e06da
update ManOpt and associated packages
oscardssmith Apr 29, 2025
daa0b2e
Update stepsize kwargs to use the default constructor
Vaibhavdixit02 Apr 29, 2025
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
8 changes: 4 additions & 4 deletions lib/OptimizationManopt/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
LinearAlgebra = "1.10"
ManifoldDiff = "0.3.10"
Manifolds = "0.9.18"
ManifoldsBase = "0.15.10"
Manopt = "0.4.63"
ManifoldDiff = "0.3.10, 0.4"
Manifolds = "0.9.18, 0.10"
ManifoldsBase = "0.15.10, 1"
Manopt = "0.5"
Optimization = "4"
Reexport = "1.2"
julia = "1.9"
Expand Down
8 changes: 4 additions & 4 deletions lib/OptimizationManopt/src/OptimizationManopt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function call_manopt_optimizer(
x0;
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
evaluation::AbstractEvaluationType = Manopt.AllocatingEvaluation(),
stepsize::Stepsize = ArmijoLinesearch(M),
stepsize::Stepsize = default_stepsize(M, GradientDescentState),
kwargs...)
opts = gradient_descent(M,
loss,
Expand Down Expand Up @@ -111,7 +111,7 @@ function call_manopt_optimizer(M::ManifoldsBase.AbstractManifold,
x0;
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
evaluation::AbstractEvaluationType = InplaceEvaluation(),
stepsize::Stepsize = ArmijoLinesearch(M),
stepsize::Stepsize = default_stepsize(M, ConjugateGradientDescentState),
kwargs...)
opts = conjugate_gradient_descent(M,
loss,
Expand Down Expand Up @@ -174,7 +174,7 @@ function call_manopt_optimizer(M::Manopt.AbstractManifold,
stepsize = WolfePowellLinesearch(M;
retraction_method = retraction_method,
vector_transport_method = vector_transport_method,
linesearch_stopsize = 1e-12),
stop_when_stepsize_less = 1e-12),
kwargs...
)
opts = quasi_Newton(M,
Expand Down Expand Up @@ -308,7 +308,7 @@ function call_manopt_optimizer(M::ManifoldsBase.AbstractManifold,
stopping_criterion::Union{Manopt.StoppingCriterion, Manopt.StoppingCriterionSet},
evaluation::AbstractEvaluationType = InplaceEvaluation(),
retraction_method::AbstractRetractionMethod = default_retraction_method(M),
stepsize::Stepsize = DecreasingStepsize(; length = 2.0, shift = 2),
stepsize::Stepsize = default_stepsize(M, FrankWolfeState),
kwargs...)
opt = Frank_Wolfe_method(M,
loss,
Expand Down
7 changes: 4 additions & 3 deletions lib/OptimizationManopt/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ end
x0 = zeros(2)
p = [1.0, 100.0]

stepsize = Manopt.ArmijoLinesearch(R2)
stepsize = default_stepsize(
R2, GradientDescentState
)
opt = OptimizationManopt.GradientDescentOptimizer()

optprob_forwarddiff = OptimizationFunction(rosenbrock, Optimization.AutoEnzyme())
Expand Down Expand Up @@ -65,13 +67,12 @@ end
x0 = zeros(2)
p = [1.0, 100.0]

stepsize = Manopt.ArmijoLinesearch(R2)
opt = OptimizationManopt.ConjugateGradientDescentOptimizer()

optprob = OptimizationFunction(rosenbrock, Optimization.AutoForwardDiff())
prob = OptimizationProblem(optprob, x0, p; manifold = R2)

sol = Optimization.solve(prob, opt, stepsize = stepsize)
sol = Optimization.solve(prob, opt)
@test sol.minimum < 0.5
end

Expand Down
Loading