Skip to content

Cache common subexpressions in IndexMap #2802

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Cache common subexpressions in IndexMap #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/Utilities/copy/index_map.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ struct IndexMap <: AbstractDict{MOI.Index,MOI.Index}
typeof(CleverDicts.index_to_key),
}
con_map::DoubleDicts.IndexDoubleDict
nl_cache::Dict{MOI.ScalarNonlinearFunction,MOI.ScalarNonlinearFunction}
end

"""
Expand All @@ -30,7 +31,8 @@ The dictionary-like object returned by [`MOI.copy_to`](@ref).
function IndexMap()
var_map = CleverDicts.CleverDict{MOI.VariableIndex,MOI.VariableIndex}()
con_map = DoubleDicts.IndexDoubleDict()
return IndexMap(var_map, con_map)
nl_cache = Dict{MOI.ScalarNonlinearFunction,MOI.ScalarNonlinearFunction}()
return IndexMap(var_map, con_map, nl_cache)
end

function _identity_constraints_map(
Expand Down Expand Up @@ -104,3 +106,7 @@ Base.length(map::IndexMap) = length(map.var_map) + length(map.con_map)
function Base.iterate(map::IndexMap, args...)
return iterate(Base.Iterators.flatten((map.var_map, map.con_map)), args...)
end

function map_indices(index_map::IndexMap, f::MOI.ScalarNonlinearFunction)
return map_indices(Base.Fix1(getindex, index_map), f, index_map.nl_cache)
end
14 changes: 14 additions & 0 deletions src/Utilities/functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,11 @@ end
function map_indices(
index_map::F,
f::MOI.ScalarNonlinearFunction,
nl_cache = nothing,
) where {F<:Function}
if !isnothing(nl_cache) && haskey(nl_cache, f)
return nl_cache[f]
end
root = MOI.ScalarNonlinearFunction(f.head, similar(f.args))
stack = Tuple{MOI.ScalarNonlinearFunction,Int,MOI.ScalarNonlinearFunction}[]
for (i, fi) in enumerate(f.args)
Expand All @@ -359,6 +363,10 @@ function map_indices(
while !isempty(stack)
parent, i, arg = pop!(stack)
if arg isa MOI.ScalarNonlinearFunction
if !isnothing(nl_cache) && haskey(nl_cache, arg)
parent.args[i] = nl_cache[arg]
continue
end
child = MOI.ScalarNonlinearFunction(arg.head, similar(arg.args))
for (j, argj) in enumerate(arg.args)
if argj isa MOI.ScalarNonlinearFunction
Expand All @@ -368,10 +376,16 @@ function map_indices(
end
end
parent.args[i] = child
if !isnothing(nl_cache)
nl_cache[arg] = child
end
else
parent.args[i] = MOI.Utilities.map_indices(index_map, arg)
end
end
if !isnothing(nl_cache)
nl_cache[f] = root
end
return root
end

Expand Down
Loading