Performance improvements in linear_terms and quad_terms #1604
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mlubin
changed the title
Codecov Report
@@ Coverage Diff @@
## master #1604 +/- ##
==========================================
+ Coverage 90.8% 90.96% +0.16%
==========================================
Files 28 28
Lines 3708 4062 +354
==========================================
+ Hits 3367 3695 +328
- Misses 341 367 +26
Continue to review full report at Codecov.
|
blegat
reviewed
Nov 12, 2018
src/quad_expr.jl
Outdated
| @@ -112,15 +112,31 @@ if VERSION < v"0.7-" | |||
| Base.done(qti::QuadTermIterator, state::Int) = done(qti.quad.terms, state) | |||
| Base.next(qti::QuadTermIterator, state::Int) = reorder_iterator(next(qti.quad.terms, state)...) | |||
| else | |||
| function reorder_iterator(t::Tuple{Pair{<:UnorderedPair,<:Any},Int}) | |||
| ((first(t).second, first(t).first.a, first(t).first.b), last(t)) | |||
| function reorder_and_flatten(p::Pair{<:UnorderedPair,<:Any}) | |||
There was a problem hiding this comment.
Pair{<:UnorderedPair,<:Any} is equivalent to Pair{<:UnorderedPair} which is arguably simpler/more readable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref https://discourse.julialang.org/t/allocations-when-manipulating-an-iterator/17405 and #1403 (comment).
I see a 5x speedup in
JuMP.moi_function(::AffExpr)and a 3.3x speedup inJuMP.moi_function(::QuadExpr). This removes 4 of 10 allocations per term in the minipmed example (#1403 (comment)).Before:
After:
There are still 6 more allocations per term to track down before we can (hopefully) get back to 0.18's performance.