Skip to content

Restore uncached version of moi_function #4189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
odow merged 4 commits into from
Jul 7, 2026
+60 −0
Merged

Restore uncached version of moi_function #4189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78650b7
Restore uncached version of moi_function
odow Jul 1, 2026
90014db
Fix formatting
odow Jul 1, 2026
82438a1
Add more test coverage
odow Jul 1, 2026
9e33fcd
Fix coverage
odow Jul 1, 2026
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
27 changes: 27 additions & 0 deletions src/nlp_expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,33 @@ function moi_function(model::GenericModel, f::GenericNonlinearExpr{V}) where {V}
return ret
end

# A backwards-compatible function to preserve behavior prior to #4032. This was
# used by Plasmo.jl
function moi_function(f::GenericNonlinearExpr{V}) where {V}
ret = MOI.ScalarNonlinearFunction(f.head, similar(f.args))
stack = Tuple{MOI.ScalarNonlinearFunction,Int,GenericNonlinearExpr{V}}[]
for i in length(f.args):-1:1
if f.args[i] isa GenericNonlinearExpr{V}
push!(stack, (ret, i, f.args[i]))
else
ret.args[i] = moi_function(f.args[i])
end
end
while !isempty(stack)
parent, i, arg = pop!(stack)
child = MOI.ScalarNonlinearFunction(arg.head, similar(arg.args))
parent.args[i] = child
for j in length(arg.args):-1:1
if arg.args[j] isa GenericNonlinearExpr{V}
push!(stack, (child, j, arg.args[j]))
else
child.args[j] = moi_function(arg.args[j])
end
end
end
return ret
end

jump_function(::GenericModel{T}, x::Number) where {T} = convert(T, x)

function jump_function(model::GenericModel, f::MOI.ScalarNonlinearFunction)
Expand Down
33 changes: 33 additions & 0 deletions test/test_nlp_expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,4 +1381,37 @@ function test_custom_array()
return
end

function test_scalar_nonlinear_moi_function()
model = Model()
@variable(model, x)
y1 = atan(x, 2)
y1_moi = MOI.ScalarNonlinearFunction(:atan, Any[index(x), 2])
y2 = y1 + y1
y2_moi = MOI.ScalarNonlinearFunction(:+, Any[y1_moi, y1_moi])
y3 = exp(y2)
y3_moi = MOI.ScalarNonlinearFunction(:exp, Any[y2_moi])
# Test y1
@test isapprox(moi_function(y1), y1_moi)
@test isempty(model.subexpressions)
@test isapprox(moi_function(model, y1), y1_moi)
@test length(model.subexpressions) == 1
@test isapprox(model.subexpressions[objectid(y1)], y1_moi)
# Test y2
@test isapprox(moi_function(y2), y2_moi)
@test length(model.subexpressions) == 1
@test isapprox(moi_function(model, y2), y2_moi)
@test length(model.subexpressions) == 2
@test isapprox(model.subexpressions[objectid(y1)], y1_moi)
@test isapprox(model.subexpressions[objectid(y2)], y2_moi)
# Test y3
@test isapprox(moi_function(y3), y3_moi)
@test length(model.subexpressions) == 2
@test isapprox(moi_function(model, y3), y3_moi)
@test length(model.subexpressions) == 3
@test isapprox(model.subexpressions[objectid(y1)], y1_moi)
@test isapprox(model.subexpressions[objectid(y2)], y2_moi)
@test isapprox(model.subexpressions[objectid(y3)], y3_moi)
return
end

end # module
Loading