Skip to content

Commit 965deaa

Browse files
committed
Remove methods
1 parent d292932 commit 965deaa

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/Nonlinear/ReverseAD/reverse_mode.jl

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ function _reverse_mode(d::NLPEvaluator, x)
3939
_forward_eval(d.subexpressions[k], d, x)
4040
end
4141
if d.objective !== nothing
42-
_forward_eval(d.objective::_FunctionStorage, d, x)
42+
_forward_eval(something(d.objective).expr, d, x)
4343
end
4444
for con in d.constraints
45-
_forward_eval(con, d, x)
45+
_forward_eval(con.expr, d, x)
4646
end
4747
# Phase II
4848
for k in d.subexpression_order
4949
_reverse_eval(d.subexpressions[k])
5050
end
5151
if d.objective !== nothing
52-
_reverse_eval(d.objective::_FunctionStorage)
52+
_reverse_eval(something(d.objective).expr)
5353
end
5454
for con in d.constraints
55-
_reverse_eval(con)
55+
_reverse_eval(con.expr)
5656
end
5757
# If a JuMP model uses the legacy nonlinear interface, then JuMP constructs
5858
# a NLPEvaluator at the start of a call to `JuMP.optimize!` and it passes in
@@ -81,7 +81,7 @@ end
8181

8282
"""
8383
_forward_eval(
84-
f::Union{_FunctionStorage,_SubexpressionStorage},
84+
f::_SubexpressionStorage,
8585
d::NLPEvaluator,
8686
x::AbstractVector{T},
8787
) where {T}
@@ -286,10 +286,8 @@ function _forward_eval(
286286
return f.forward_storage[1]
287287
end
288288

289-
_forward_eval(f::_FunctionStorage, d, x) = _forward_eval(f.expr, d, x)
290-
291289
"""
292-
_reverse_eval(f::Union{_FunctionStorage,_SubexpressionStorage})
290+
_reverse_eval(f::_SubexpressionStorage)
293291
294292
Reverse-mode evaluation of an expression tree given in `f`.
295293
@@ -322,8 +320,6 @@ function _reverse_eval(f::_SubexpressionStorage)
322320
return
323321
end
324322

325-
_reverse_eval(f::_FunctionStorage) = _reverse_eval(f.expr)
326-
327323
"""
328324
_extract_reverse_pass(
329325
g::AbstractVector{T},

0 commit comments

Comments
 (0)