Skip to content

Concatenate scalars with layout arrays via typed_vcat/typed_hcat #286

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
dlfivefifty merged 2 commits into from
Oct 11, 2026
Merged

Concatenate scalars with layout arrays via typed_vcat/typed_hcat #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b028cc
Concatenate scalars with layout arrays via ArrayLayouts.typed_vcat/ty…
dlfivefifty Oct 10, 2026
f154ca8
Merge branch 'master' into scalar-layout-cat
dlfivefifty Oct 11, 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
14 changes: 12 additions & 2 deletions src/ArrayLayouts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,27 @@ include("hash.jl")



typed_hcat(::Type{T}, ::Tuple, A...) where T = Base._typed_hcat(T, A)
typed_vcat(::Type{T}, ::Tuple, A...) where T = Base._typed_vcat(T, A)
typed_hcat(::Type{T}, ::Tuple, A...) where T = _default_typed_hcat(T, A)
typed_vcat(::Type{T}, ::Tuple, A...) where T = _default_typed_vcat(T, A)
typed_hcat(::Type{T}, A...) where T = typed_hcat(T, (size(A[1],1), sum(size.(A,2))), A...)
typed_vcat(::Type{T}, A...) where T = typed_vcat(T, (sum(size.(A,1)),size(A[1],2)), A...)

# Base._typed_hcat/_typed_vcat only support arrays so fall back to generic concatenation when scalars are present
_default_typed_hcat(::Type{T}, A::Tuple{Vararg{AbstractVecOrMat}}) where T = Base._typed_hcat(T, A)
_default_typed_vcat(::Type{T}, A::Tuple{Vararg{AbstractVecOrMat}}) where T = Base._typed_vcat(T, A)
_default_typed_hcat(::Type{T}, A::Tuple) where T = Base._cat_t(Val(2), T, A...)
_default_typed_vcat(::Type{T}, A::Tuple) where T = Base._cat_t(Val(1), T, A...)

Base.typed_vcat(::Type{T}, A::LayoutVecOrMats, B::AbstractVecOrMat...) where T = typed_vcat(T, A, B...)
Base.typed_hcat(::Type{T}, A::LayoutVecOrMats, B::AbstractVecOrMat...) where T = typed_hcat(T, A, B...)
Base.typed_vcat(::Type{T}, A::LayoutVecOrMats, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_vcat(T, A, B, C...)
Base.typed_hcat(::Type{T}, A::LayoutVecOrMats, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C...)
Base.typed_vcat(::Type{T}, A::AbstractVecOrMat, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_vcat(T, A, B, C...)
Base.typed_hcat(::Type{T}, A::AbstractVecOrMat, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C...)
Base.typed_vcat(::Type{T}, A::Number, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_vcat(T, A, B, C...)
Base.typed_hcat(::Type{T}, A::Number, B::LayoutVecOrMats, C::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C...)
Base.typed_vcat(::Type{T}, A::Number, B::Number, C::LayoutVecOrMats, D::AbstractVecOrMat...) where T = typed_vcat(T, A, B, C, D...)
Base.typed_hcat(::Type{T}, A::Number, B::Number, C::LayoutVecOrMats, D::AbstractVecOrMat...) where T = typed_hcat(T, A, B, C, D...)

###
# reshapedarray for layoutarrays
Expand Down
8 changes: 8 additions & 0 deletions test/test_layoutarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,14 @@ BroadcastStyle(::Type{<:MyVector2{T}}) where {T} = MyBroadcastStyle{1}()
@test [Array(a) A A] == [Array(a) Array(A) Array(A)]
@test [a A A] == [Array(a) Array(A) Array(A)]
@test [a Array(A) A] == [Array(a) Array(A) Array(A)]

@test [2; a] == [2; Array(a)]
@test [2; 3; a] == [2; 3; Array(a)]
@test [2; a; a] == [2; Array(a); Array(a)]
@test [2.0; view(A,:,1)] == [2.0; A[:,1]]
r = MyMatrix(randn(1,5))
@test [2 r] == [2 Array(r)]
@test [2 3 r] == [2 3 Array(r)]
end

@testset "dot" begin
Expand Down
Loading