Skip to content
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

More efficient hvcat of scalars and arrays of numbers #39729

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

More efficient hvcat of scalars and arrays of numbers #39729

Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c7a73a2
Rebased changes
BioTurboNick Jun 5, 2021
bf028bb
Reorganized
BioTurboNick Jun 6, 2021
78146d6
Type stability improvement
BioTurboNick May 19, 2022
b084534
Fix type param
BioTurboNick May 19, 2022
34872cd
Merge issue
BioTurboNick Aug 13, 2023
1a379ab
Merge branch 'master' into array_scalar_hvcat
BioTurboNick Feb 9, 2024
67dc65e
Simplifying for now
BioTurboNick Feb 11, 2024
16e3e80
Remove new cat_similar, rely on type assertions instead
BioTurboNick Feb 12, 2024
b7f6f2d
Switch hvcat fallback to hvncat, allow dims argument form
BioTurboNick Feb 12, 2024
f762724
Merge branch 'master' into array_scalar_hvcat
BioTurboNick Mar 10, 2024
2836f9b
Merge branch 'master' into array_scalar_hvcat
BioTurboNick Mar 20, 2024
874d395
Merge branch 'master' into array_scalar_hvcat
BioTurboNick Jan 8, 2025
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
53 changes: 7 additions & 46 deletions base/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1760,8 +1760,10 @@ cat_similar(A, ::Type{T}, shape::Tuple) where T = Array{T}(undef, shape)
cat_similar(A, ::Type{T}, shape::Vector) where T = Array{T}(undef, shape...)
cat_similar(A::Array, ::Type{T}, shape::Tuple) where T = Array{T}(undef, shape)
cat_similar(A::Array, ::Type{T}, shape::Vector) where T = Array{T}(undef, shape...)
cat_similar(A::Array, ::Type{T}, shape::Vector, ::Val{N}) where {T, N} = Array{T, N}(undef, shape...)
cat_similar(A::AbstractArray, T::Type, shape::Tuple) = similar(A, T, shape)
cat_similar(A::AbstractArray, T::Type, shape::Vector) = similar(A, T, shape...)
cat_similar(A::AbstractArray, T::Type, shape::Vector, ::Val{N}) where N = similar(A, T, shape...)

# These are for backwards compatibility (even though internal)
cat_shape(dims, shape::Tuple{Vararg{Int}}) = shape
Expand Down Expand Up @@ -2086,48 +2088,7 @@ true
hvcat(rows::Tuple{Vararg{Int}}, xs::AbstractArray...) = typed_hvcat(promote_eltype(xs...), rows, xs...)
hvcat(rows::Tuple{Vararg{Int}}, xs::AbstractArray{T}...) where {T} = typed_hvcat(T, rows, xs...)

function typed_hvcat(::Type{T}, rows::Tuple{Vararg{Int}}, as::AbstractVecOrMat...) where T
nbr = length(rows) # number of block rows

nc = 0
for i=1:rows[1]
nc += size(as[i],2)
end

nr = 0
a = 1
for i = 1:nbr
nr += size(as[a],1)
a += rows[i]
end

out = similar(as[1], T, nr, nc)

a = 1
r = 1
for i = 1:nbr
c = 1
szi = size(as[a],1)
for j = 1:rows[i]
Aj = as[a+j-1]
szj = size(Aj,2)
if size(Aj,1) != szi
throw(DimensionMismatch("mismatched height in block row $(i) (expected $szi, got $(size(Aj,1)))"))
end
if c-1+szj > nc
throw(DimensionMismatch("block row $(i) has mismatched number of columns (expected $nc, got $(c-1+szj))"))
end
out[r:r-1+szi, c:c-1+szj] = Aj
c += szj
end
if c != nc+1
throw(DimensionMismatch("block row $(i) has mismatched number of columns (expected $nc, got $(c-1))"))
oscardssmith marked this conversation as resolved.
Show resolved Hide resolved
end
r += szi
a += rows[i]
end
out
end
typed_hvcat(::Type{T}, rows::Tuple{Vararg{Int}}, as::AbstractVecOrMat...) where T = typed_hvncat(T, (rows, (sum(rows),)), true, as...)

hvcat(rows::Tuple{Vararg{Int}}) = []
typed_hvcat(::Type{T}, rows::Tuple{Vararg{Int}}) where {T} = Vector{T}()
Expand Down Expand Up @@ -2322,7 +2283,7 @@ end
function _typed_hvncat(T::Type, ::Val{N}, xs::Number...) where N
N < 0 &&
throw(ArgumentError("concatenation dimension must be non-negative"))
A = cat_similar(xs[1], T, (ntuple(x -> 1, Val(N - 1))..., length(xs)))
A = cat_similar(xs[1], T, (ntuple(x -> 1, Val(N - 1))..., length(xs)), Val(N))
hvncat_fill!(A, false, xs)
return A
end
Expand Down Expand Up @@ -2351,7 +2312,7 @@ function _typed_hvncat(::Type{T}, ::Val{N}, as::AbstractArray...) where {T, N}
end
end

A = cat_similar(as[1], T, (ntuple(d -> size(as[1], d), N - 1)..., Ndim, ntuple(x -> 1, nd - N)...))
A = cat_similar(as[1], T, (ntuple(d -> size(as[1], d), N - 1)..., Ndim, ntuple(x -> 1, nd - N)...), Val(nd))
BioTurboNick marked this conversation as resolved.
Show resolved Hide resolved
k = 1
for a ∈ as
for i ∈ eachindex(a)
Expand Down Expand Up @@ -2542,7 +2503,7 @@ function _typed_hvncat_dims(::Type{T}, dims::NTuple{N, Int}, row_first::Bool, as
throw(DimensionMismatch("mismatched number of elements; expected $(outlen), got $(elementcount)"))

# copy into final array
A = cat_similar(as[1], T, outdims)
A = cat_similar(as[1], T, outdims, Val(N))
BioTurboNick marked this conversation as resolved.
Show resolved Hide resolved
# @assert all(==(0), currentdims)
outdims .= 0
hvncat_fill!(A, currentdims, outdims, d1, d2, as)
Expand Down Expand Up @@ -2636,7 +2597,7 @@ function _typed_hvncat_shape(::Type{T}, shape::NTuple{N, Tuple}, row_first, as::
# @assert all(==(0), blockcounts)

# copy into final array
A = cat_similar(as[1], T, outdims)
A = cat_similar(as[1], T, outdims, Val(nd))
hvncat_fill!(A, currentdims, blockcounts, d1, d2, as)
return A
end
Expand Down