Skip to content

Commit 051ec6c

Browse files
Reexport
1 parent bcbc649 commit 051ec6c

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

lib/OptimizationManopt/Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ ManifoldDiff = "af67fdf4-a580-4b9f-bbec-742ef357defd"
88
Manifolds = "1cead3c2-87b3-11e9-0ccd-23c62b72b94e"
99
ManifoldsBase = "3362f125-f0bb-47a3-aa74-596ffd7ef2fb"
1010
Manopt = "0fc0a36d-df90-57f3-8f93-d78a9fc72bb5"
11-
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
11+
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
12+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

lib/OptimizationManopt/src/OptimizationManopt.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module OptimizationManopt
22

3+
using Reexport
4+
@reexport using Manopt
35
using Optimization, Manopt, ManifoldsBase, ManifoldDiff
46

57
"""
@@ -228,9 +230,9 @@ end
228230

229231
## Optimization.jl stuff
230232

231-
function build_loss(f::OptimizationFunction, prob, cur)
233+
function build_loss(f::OptimizationFunction, prob)
232234
function (::AbstractManifold, θ)
233-
x = f.f, prob.p, cur...)
235+
x = f.f(θ)
234236
__x = first(x)
235237
return prob.sense === Optimization.MaxSense ? -__x : __x
236238
end
@@ -287,7 +289,7 @@ function SciMLBase.__solve(prob::OptimizationProblem,
287289

288290
f = Optimization.instantiate_function(prob.f, prob.u0, prob.f.adtype, prob.p)
289291

290-
_loss = build_loss(f, prob, cur)
292+
_loss = build_loss(f, prob)
291293

292294
gradF = build_gradF(f, prob, cur)
293295

lib/OptimizationManopt/test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ end
131131
f(x, p = nothing) = sum(distance(M, x, data2[i])^2 for i in 1:m)
132132

133133
optf = OptimizationFunction(f, Optimization.AutoForwardDiff())
134-
prob = OptimizationProblem(optf, data2[1]; manifold = M)
134+
prob = OptimizationProblem(optf, data2[1]; manifold = M, maxiters = 1000)
135135

136136
opt = OptimizationManopt.GradientDescentOptimizer(M)
137137
@time sol = Optimization.solve(prob, opt)
138138

139-
@test sol.u q
139+
@test sol.u q atol = 1e-2
140140
end

0 commit comments

Comments
 (0)