Skip to content

Commit d09cf00

Browse files
more fixes
1 parent d2a6b81 commit d09cf00

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

lib/OptimizationManopt/src/OptimizationManopt.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ end
328328
## Optimization.jl stuff
329329
function SciMLBase.requiresgradient(opt::Union{
330330
GradientDescentOptimizer, ConjugateGradientDescentOptimizer,
331-
QuasiNewtonOptimizer, ConvexBundleOptimizer, FrankWolfeOptimizer})
331+
QuasiNewtonOptimizer, ConvexBundleOptimizer, FrankWolfeOptimizer,
332+
AdaptiveRegularizationCubicOptimizer, TrustRegionsOptimizer})
332333
true
333334
end
334335
function SciMLBase.requireshessian(opt::Union{

lib/OptimizationNLPModels/Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ julia = "1.9"
1919
[extras]
2020
NLPModelsTest = "7998695d-6960-4d3a-85c4-e1bceb8cd856"
2121
OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
22+
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
2223
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2324
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
2425
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
2526
OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
2627

2728
[targets]
28-
test = ["Test", "NLPModelsTest", "OptimizationOptimJL", "Zygote", "Ipopt", "OptimizationMOI"]
29+
test = ["Test", "NLPModelsTest", "OptimizationOptimJL", "ReverseDiff", "Zygote", "Ipopt", "OptimizationMOI"]

lib/OptimizationNLPModels/test/runtests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using OptimizationNLPModels, Optimization, NLPModelsTest, Ipopt, OptimizationMOI, Zygote,
2+
ReverseDiff,
23
OptimizationOptimJL
34
using Test
45

lib/OptimizationOptimJL/test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using OptimizationOptimJL,
2-
OptimizationOptimJL.Optim, Optimization, ForwardDiff, Zygote, ReverseDiff.
3-
Random, ModelingToolkit, Optimization.OptimizationBase.DifferentiationInterface
2+
OptimizationOptimJL.Optim, Optimization, ForwardDiff, Zygote, ReverseDiff,
3+
Random, ModelingToolkit, Optimization.OptimizationBase.DifferentiationInterface
44
using Test
55

66
struct CallbackTester

lib/OptimizationPRIMA/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OptimizationPRIMA, Optimization, ForwardDiff, ModelingToolkit
1+
using OptimizationPRIMA, Optimization, ForwardDiff, ModelingToolkit, ReverseDiff
22
using Test
33

44
@testset "OptimizationPRIMA.jl" begin

test/minibatch.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ optfun = OptimizationFunction(loss_adjoint,
5858
Optimization.AutoZygote())
5959
optprob = OptimizationProblem(optfun, pp, train_loader)
6060

61-
sol = Optimization.solve(optprob,
61+
res1 = Optimization.solve(optprob,
6262
Optimization.Sophia(; η = 0.5,
63-
λ = 0.0),
63+
λ = 0.0), callback = callback,
6464
maxiters = 1000)
6565
@test 10res1.objective < l1
6666

0 commit comments

Comments
 (0)