Skip to content

Commit a1b85aa

Browse files
format
1 parent 024d97d commit a1b85aa

File tree

3 files changed

+29
-15
lines changed

3 files changed

+29
-15
lines changed

src/adtypes.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ end
234234

235235
function spadtype_to_spsoadtype(adtype)
236236
if !(adtype.dense_ad isa SciMLBase.NoAD ||
237-
adtype.dense_ad isa DifferentiationInterface.SecondOrder)
237+
adtype.dense_ad isa DifferentiationInterface.SecondOrder)
238238
soadtype = AutoSparse(
239-
DifferentiationInterface.SecondOrder(adtype.dense_ad, adtype.dense_ad),
240-
sparsity_detector = adtype.sparsity_detector,
241-
coloring_algorithm = adtype.coloring_algorithm)
239+
DifferentiationInterface.SecondOrder(adtype.dense_ad, adtype.dense_ad),
240+
sparsity_detector = adtype.sparsity_detector,
241+
coloring_algorithm = adtype.coloring_algorithm)
242242
else
243243
soadtype = adtype
244244
end
@@ -247,7 +247,7 @@ end
247247

248248
function filled_spad(adtype)
249249
if adtype.sparsity_detector isa ADTypes.NoSparsityDetector &&
250-
adtype.coloring_algorithm isa ADTypes.NoColoringAlgorithm
250+
adtype.coloring_algorithm isa ADTypes.NoColoringAlgorithm
251251
adtype = AutoSparse(adtype.dense_ad; sparsity_detector = TracerSparsityDetector(),
252252
coloring_algorithm = GreedyColoringAlgorithm())
253253
elseif adtype.sparsity_detector isa ADTypes.NoSparsityDetector &&
@@ -262,7 +262,6 @@ function filled_spad(adtype)
262262
end
263263

264264
function generate_sparse_adtype(adtype)
265-
266265
if !(adtype.dense_ad isa DifferentiationInterface.SecondOrder)
267266
adtype = filled_spad(adtype)
268267
soadtype = spadtype_to_spsoadtype(adtype)

test/adtests.jl

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,14 @@ optprob.cons_h(H3, x0)
260260
G2 = Array{Float64}(undef, 2)
261261
H2 = Array{Float64}(undef, 2, 2)
262262

263-
optf = OptimizationFunction(rosenbrock, DifferentiationInterface.SecondOrder(ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()), cons = cons)
263+
optf = OptimizationFunction(rosenbrock,
264+
DifferentiationInterface.SecondOrder(
265+
ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
266+
cons = cons)
264267
optprob = OptimizationBase.instantiate_function(
265-
optf, x0, DifferentiationInterface.SecondOrder(ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
268+
optf, x0,
269+
DifferentiationInterface.SecondOrder(
270+
ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
266271
nothing, 1, g = true, h = true, hv = true,
267272
cons_j = true, cons_h = true, cons_vjp = true,
268273
cons_jvp = true, lag_h = true)
@@ -489,9 +494,13 @@ end
489494
H2 = Array{Float64}(undef, 2, 2)
490495

491496
optf = OptimizationFunction(
492-
rosenbrock, DifferentiationInterface.SecondOrder(ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()), cons = con2_c)
497+
rosenbrock, DifferentiationInterface.SecondOrder(
498+
ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
499+
cons = con2_c)
493500
optprob = OptimizationBase.instantiate_function(
494-
optf, x0, DifferentiationInterface.SecondOrder(ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
501+
optf, x0,
502+
DifferentiationInterface.SecondOrder(
503+
ADTypes.AutoFiniteDiff(), ADTypes.AutoReverseDiff()),
495504
nothing, 2, g = true, h = true, hv = true,
496505
cons_j = true, cons_h = true, cons_vjp = true,
497506
cons_jvp = true, lag_h = true)
@@ -737,12 +746,15 @@ end
737746
@test lag_H lag_H_expected
738747
@test nnz(lag_H) == 5
739748

740-
optf = OptimizationFunction(sparse_objective, AutoSparse(DifferentiationInterface.SecondOrder(ADTypes.AutoForwardDiff(), ADTypes.AutoZygote())),
749+
optf = OptimizationFunction(sparse_objective,
750+
AutoSparse(DifferentiationInterface.SecondOrder(
751+
ADTypes.AutoForwardDiff(), ADTypes.AutoZygote())),
741752
cons = sparse_constraints)
742753

743754
# Instantiate the optimization problem
744755
optprob = OptimizationBase.instantiate_function(optf, x0,
745-
AutoSparse(DifferentiationInterface.SecondOrder(ADTypes.AutoForwardDiff(), ADTypes.AutoZygote())),
756+
AutoSparse(DifferentiationInterface.SecondOrder(
757+
ADTypes.AutoForwardDiff(), ADTypes.AutoZygote())),
746758
nothing, 2, g = true, h = true, cons_j = true, cons_h = true, lag_h = true)
747759
# Test gradient
748760
G = zeros(3)

test/matrixvalued.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ using OptimizationBase, LinearAlgebra, ForwardDiff, Zygote, FiniteDiff,
33
using Test, ReverseDiff
44

55
@testset "Matrix Valued" begin
6-
for adtype in [AutoForwardDiff(), SecondOrder(AutoForwardDiff(), AutoZygote()), SecondOrder(AutoForwardDiff(), AutoFiniteDiff()),
6+
for adtype in [AutoForwardDiff(), SecondOrder(AutoForwardDiff(), AutoZygote()),
7+
SecondOrder(AutoForwardDiff(), AutoFiniteDiff()),
78
AutoSparse(AutoForwardDiff(), sparsity_detector = TracerLocalSparsityDetector()),
8-
AutoSparse(SecondOrder(AutoForwardDiff(), AutoZygote()), sparsity_detector = TracerLocalSparsityDetector()),
9-
AutoSparse(SecondOrder(AutoForwardDiff(), AutoFiniteDiff()), sparsity_detector = TracerLocalSparsityDetector())]
9+
AutoSparse(SecondOrder(AutoForwardDiff(), AutoZygote()),
10+
sparsity_detector = TracerLocalSparsityDetector()),
11+
AutoSparse(SecondOrder(AutoForwardDiff(), AutoFiniteDiff()),
12+
sparsity_detector = TracerLocalSparsityDetector())]
1013
# 1. Matrix Factorization
1114
@show adtype
1215
function matrix_factorization_objective(X, A)

0 commit comments

Comments
 (0)