Fix #388, hcat allocations with Julia master #461
Merged
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
Give vcat the same treatment.
|
Note that tests only pass on nightly because of JuliaLang/julia#27398, but I think we were running into a different limit before this change, since even on nightly inference gives up after 5 arguments before this PR. |
andyferris
approved these changes
Jul 5, 2018
src/linalg.jl
Outdated
| @inline vcat(a::Union{StaticVector, StaticMatrix}, b::Union{StaticVector,StaticMatrix}) = _vcat(Size(a), Size(b), a, b) | ||
| @generated function _vcat(::Size{Sa}, ::Size{Sb}, a::Union{StaticVector, StaticMatrix}, b::Union{StaticVector,StaticMatrix}) where {Sa, Sb} | ||
| @inline vcat(a::StaticVecOrMat) = a | ||
| @inline vcat(a::Union{StaticVector, StaticMatrix}, b::StaticVecOrMat) = _vcat(Size(a), Size(b), a, b) |
There was a problem hiding this comment.
Missed one Union minification here
|
I'm ok with merging this - but the METATDATA people mightn't be happy about the failing tests if we want to tag. |
|
Made the number of arguments in the test version-dependent (v"0.7.0-beta.47" is the first version to include JuliaLang/julia#27398). Femtocleaner can clean that up later. |
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.
Apparently this is a bit easier on the compiler.
(also just use
StaticVecOrMatinstead ofUnion{StaticVector,StaticMatrix})