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

Jump to bottom

optimized hcat of onehot vectors and matrices #1595

Merged
merged 9 commits into from
May 13, 2021
Merged

optimized hcat of onehot vectors and matrices #1595

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20ca411
onehot hcat optimizations
racinmat May 11, 2021
2a2834d
Apply suggestions from code review
racinmat May 11, 2021
f725d3d
reverting to original code, which is faster.
racinmat May 12, 2021
1992006
Apply suggestions from code review
racinmat May 13, 2021
22f4398
much faster constructors
racinmat May 13, 2021
3490b3a
Apply suggestions from code review
racinmat May 13, 2021
a6db4fe
removing reductions
racinmat May 13, 2021
1d90eb7
removing tests for reduction
racinmat May 13, 2021
9d2282c
added type test
racinmat May 13, 2021
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
10 changes: 8 additions & 2 deletions src/onehot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ struct OneHotArray{T<:Integer, L, N, var"N+1", I<:Union{T, AbstractArray{T, N}}}
indices::I
end
OneHotArray{T, L, N, I}(indices) where {T, L, N, I} = OneHotArray{T, L, N, N+1, I}(indices)
OneHotArray(indices::T, L::Integer) where {T<:Integer} = OneHotArray{T, L, 0, T}(indices)
OneHotArray(indices::AbstractArray{T, N}, L::Integer) where {T, N} = OneHotArray{T, L, N, typeof(indices)}(indices)
OneHotArray(indices::T, L::Integer) where {T<:Integer} = OneHotArray{T, L, 0, 1, T}(indices)
OneHotArray(indices::I, L::Integer) where {T, N, I<:AbstractArray{T, N}} = OneHotArray{T, L, N, N+1, I}(indices)

_indices(x::OneHotArray) = x.indices
_indices(x::Base.ReshapedArray{<: Any, <: Any, <: OneHotArray}) =
Expand Down Expand Up @@ -75,6 +75,12 @@ end
Base.hcat(x::OneHotLike, xs::OneHotLike...) = cat(x, xs...; dims = 2)
Base.vcat(x::OneHotLike, xs::OneHotLike...) = cat(x, xs...; dims = 1)

# optimized concatenation for matrices and vectors of same parameters
Base.hcat(x::T, xs::T...) where {L, T <: OneHotLike{<:Any, L, <:Any, 2}} = OneHotMatrix(reduce(vcat, _indices.(xs); init = _indices(x)), L)
racinmat marked this conversation as resolved.
Show resolved Hide resolved
Base.reduce(::typeof(hcat), xs::Vector{T}) where T <: OneHotMatrix = T(reduce(vcat, _indices.(xs)))
racinmat marked this conversation as resolved.
Show resolved Hide resolved
Base.hcat(x::T, xs::T...) where {L, T <: OneHotLike{<:Any, L, <:Any, 1}} = OneHotMatrix(reduce(vcat, _indices.(xs); init = _indices(x)), L)
racinmat marked this conversation as resolved.
Show resolved Hide resolved
Base.reduce(::typeof(hcat), xs::Vector{OneHotVector{T,L}}) where {T,L} = OneHotArray{T,L,1,Vector{T}}(reduce(vcat, _indices.(xs)))

batch(xs::AbstractArray{<:OneHotVector{<:Any, L}}) where L = OneHotArray(_indices.(xs), L)

Adapt.adapt_structure(T, x::OneHotArray{<:Any, L}) where L = OneHotArray(adapt(T, _indices(x)), L)
Expand Down
12 changes: 12 additions & 0 deletions test/onehot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ end
using Flux: OneHotArray, OneHotVector, OneHotMatrix, OneHotLike

ov = OneHotVector(rand(1:10), 10)
ov2 = OneHotVector(rand(1:11), 11)
om = OneHotMatrix(rand(1:10, 5), 10)
om2 = OneHotMatrix(rand(1:11, 5), 11)
oa = OneHotArray(rand(1:10, 5, 5), 10)

# sizes
Expand Down Expand Up @@ -74,17 +76,27 @@ end
@testset "Concatenating" begin
# vector cat
@test hcat(ov, ov) == OneHotMatrix(vcat(ov.indices, ov.indices), 10)
@test reduce(hcat, [ov, ov]) == OneHotMatrix(vcat(ov.indices, ov.indices), 10)
@test hcat(ov, ov) isa OneHotMatrix
darsnack marked this conversation as resolved.
Show resolved Hide resolved
@test reduce(hcat, [ov, ov]) isa OneHotMatrix
@test vcat(ov, ov) == vcat(collect(ov), collect(ov))
@test cat(ov, ov; dims = 3) == OneHotArray(cat(ov.indices, ov.indices; dims = 2), 10)

# matrix cat
@test hcat(om, om) == OneHotMatrix(vcat(om.indices, om.indices), 10)
@test reduce(hcat, [om, om]) == OneHotMatrix(vcat(om.indices, om.indices), 10)
@test hcat(om, om) isa OneHotMatrix
darsnack marked this conversation as resolved.
Show resolved Hide resolved
@test reduce(hcat, [om, om]) isa OneHotMatrix
@test vcat(om, om) == vcat(collect(om), collect(om))
@test cat(om, om; dims = 3) == OneHotArray(cat(om.indices, om.indices; dims = 2), 10)

# array cat
@test cat(oa, oa; dims = 3) == OneHotArray(cat(oa.indices, oa.indices; dims = 2), 10)
darsnack marked this conversation as resolved.
Show resolved Hide resolved
@test cat(oa, oa; dims = 1) == cat(collect(oa), collect(oa); dims = 1)

# proper error handling of inconsistent sizes
@test_throws DimensionMismatch hcat(ov, ov2)
@test_throws DimensionMismatch hcat(om, om2)
end

@testset "Base.reshape" begin
Expand Down