Skip to content

Commit 52c2812

Browse files
Merge pull request #785 from SciML/optbase1.3
Bump OptimizationBase to 1.3.3
2 parents 38b2556 + 0794532 commit 52c2812

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Optimization"
22
uuid = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
3-
version = "3.26.3"
3+
version = "3.27.0"
44

55
[deps]
66
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -29,7 +29,7 @@ LBFGSB = "0.4.1"
2929
LinearAlgebra = "1.10"
3030
Logging = "1.10"
3131
LoggingExtras = "0.4, 1"
32-
OptimizationBase = "1"
32+
OptimizationBase = "1.3.3"
3333
Pkg = "1"
3434
Printf = "1.10"
3535
ProgressLogging = "0.1"

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ OptimizationEvolutionary = "0.1, 0.2, 0.3"
6060
OptimizationFlux = "0.2.1"
6161
OptimizationGCMAES = "0.1, 0.2"
6262
OptimizationMOI = "0.1, 0.2, 0.3, 0.4"
63-
OptimizationManopt = "0.0.2"
63+
OptimizationManopt = "0.0.2, 0.0.3"
6464
OptimizationMetaheuristics = "0.1, 0.2"
6565
OptimizationMultistartOptimization = "0.1, 0.2"
6666
OptimizationNLopt = "0.1, 0.2"

lib/OptimizationManopt/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OptimizationManopt"
22
uuid = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6"
33
authors = ["Mateusz Baran <[email protected]>"]
4-
version = "0.0.2"
4+
version = "0.0.3"
55

66
[deps]
77
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -18,7 +18,7 @@ ManifoldDiff = "0.3.10"
1818
Manifolds = "0.9.18"
1919
ManifoldsBase = "0.15.10"
2020
Manopt = "0.4.63"
21-
Optimization = "3.25.1"
21+
Optimization = "3.27"
2222
Reexport = "1.2"
2323
julia = "1.9"
2424

lib/OptimizationManopt/src/OptimizationManopt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
393393
}
394394
local x, cur, state
395395

396-
manifold = haskey(cache.solver_args, :manifold) ? cache.solver_args[:manifold] : nothing
396+
manifold = cache.manifold
397397
gradF = haskey(cache.solver_args, :riemannian_grad) ?
398398
cache.solver_args[:riemannian_grad] : nothing
399399
hessF = haskey(cache.solver_args, :riemannian_hess) ?

lib/OptimizationManopt/test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ end
215215
opt = OptimizationManopt.GradientDescentOptimizer()
216216
@time sol = Optimization.solve(prob, opt)
217217

218-
@test sol.uq atol=1e-2
218+
@test sol.uq rtol=1e-2
219219

220220
function closed_form_solution!(M::SymmetricPositiveDefinite, q, L, U, p, X)
221221
# extract p^1/2 and p^{-1/2}
@@ -243,5 +243,5 @@ end
243243
@time sol = Optimization.solve(
244244
prob, opt, sub_problem = (M, q, p, X) -> closed_form_solution!(M, q, L, U, p, X),
245245
maxiters = 1000)
246-
@test sol.uq atol=1e-2
246+
@test sol.uq rtol=1e-2
247247
end

lib/OptimizationPRIMA/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OptimizationPRIMA"
22
uuid = "72f8369c-a2ea-4298-9126-56167ce9cbc2"
33
authors = ["Vaibhav Dixit <[email protected]> and contributors"]
4-
version = "0.1.0"
4+
version = "0.2.0"
55

66
[deps]
77
Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
@@ -11,7 +11,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1111

1212
[compat]
1313
julia = "1"
14-
Optimization = "3.21"
14+
Optimization = "3.27"
1515
PRIMA = "0.2.0"
1616
Reexport = "1"
1717

lib/OptimizationPRIMA/src/OptimizationPRIMA.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ function Optimization.OptimizationCache(prob::SciMLBase.OptimizationProblem,
3939

4040
return Optimization.OptimizationCache(f, reinit_cache, prob.lb, prob.ub, prob.lcons,
4141
prob.ucons, prob.sense,
42-
opt, data, progress, callback,
42+
opt, data, progress, callback, nothing,
43+
Optimization.OptimizationBase.AnalysisResults(nothing, nothing),
4344
merge((; maxiters, maxtime, abstol, reltol),
4445
NamedTuple(kwargs)))
4546
end

0 commit comments

Comments
 (0)