Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/forward_over_reverse.jl
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,12 @@ function _forward_eval_ϵ(
d.user_output_buffer,
n_children,
)
has_hessian = eval_multivariate_hessian(
eval_multivariate_hessian(
d.data.operators,
d.data.operators.multivariate_operators[node.index],
H,
f_input,
)
# This might be `false` if we extend this code to all
# multivariate functions.
@assert has_hessian
for col in 1:n_children
dual = zero(P)
for row in 1:n_children
Expand Down
8 changes: 1 addition & 7 deletions src/operators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function eval_multivariate_hessian(
H,
x::AbstractVector{T},
) where {T}
if op in (:+, :-, :ifelse)
if op in (:+, :-, :ifelse, :min, :max)
return false
end
if op == :*
Expand Down Expand Up @@ -340,12 +340,6 @@ function eval_multivariate_hessian(
H[1, 1] = -2 * x[2] * x[1] / base
H[2, 1] = (x[1]^2 - x[2]^2) / base
H[2, 2] = 2 * x[2] * x[1] / base
elseif op == :min
_, i = findmin(x)
H[i, i] = one(T)
elseif op == :max
_, i = findmax(x)
H[i, i] = one(T)
else
id = registry.multivariate_operator_to_id[op]
offset = id - registry.multivariate_user_operator_start
Expand Down
45 changes: 45 additions & 0 deletions test/test_ReverseAD.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,51 @@ function test_hessian_reinterpret_unsafe()
return
end

function test_hessian_min()
x, y = MOI.VariableIndex.(1:2)
model = ArrayDiff.Model()
ArrayDiff.set_objective(model, :(min($x^2, $y^2)))
evaluator = ArrayDiff.Evaluator(model, ArrayDiff.Mode(), [x, y])
MOI.initialize(evaluator, [:Grad, :Hess])
@test MOI.hessian_lagrangian_structure(evaluator) == [(1, 1), (2, 2)]
H = zeros(2)
MOI.eval_hessian_lagrangian(evaluator, H, [1.1, 2.3], 1.5, Float64[])
@test isapprox(H, [3.0, 0.0])
MOI.eval_hessian_lagrangian(evaluator, H, [2.3, 1.5], 1.2, Float64[])
@test isapprox(H, [0.0, 2.4])
return
end

function test_hessian_max()
x, y = MOI.VariableIndex.(1:2)
model = ArrayDiff.Model()
ArrayDiff.set_objective(model, :(max($x^2, $y^2)))
evaluator = ArrayDiff.Evaluator(model, ArrayDiff.Mode(), [x, y])
MOI.initialize(evaluator, [:Grad, :Hess])
@test MOI.hessian_lagrangian_structure(evaluator) == [(1, 1), (2, 2)]
H = zeros(2)
MOI.eval_hessian_lagrangian(evaluator, H, [1.1, 2.3], 1.5, Float64[])
@test isapprox(H, [0.0, 3.0])
MOI.eval_hessian_lagrangian(evaluator, H, [2.3, 1.5], 1.2, Float64[])
@test isapprox(H, [2.4, 0.0])
return
end

function test_hessian_ifelse()
x, y = MOI.VariableIndex.(1:2)
model = ArrayDiff.Model()
ArrayDiff.set_objective(model, :(ifelse($x < $y, $x^2, $y^2)))
evaluator = ArrayDiff.Evaluator(model, ArrayDiff.Mode(), [x, y])
MOI.initialize(evaluator, [:Grad, :Hess])
@test MOI.hessian_lagrangian_structure(evaluator) == [(1, 1), (2, 2)]
H = zeros(2)
MOI.eval_hessian_lagrangian(evaluator, H, [1.1, 2.3], 1.5, Float64[])
@test isapprox(H, [3.0, 0.0])
MOI.eval_hessian_lagrangian(evaluator, H, [2.3, 1.5], 1.2, Float64[])
@test isapprox(H, [0.0, 2.4])
return
end

end # module

TestReverseAD.runtests()
Loading