Skip to content

Add dims keywords to some tests #1906

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
merged 1 commit into from
Mar 8, 2022
Merged

Add dims keywords to some tests #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion test/outputsize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
m = flatten
@test outputsize(m, (5, 5, 3, 10)) == (75, 10)

m = Flux.unsqueeze(3)
m = Flux.unsqueeze(dims=3)
@test outputsize(m, (5, 7, 13)) == (5, 7, 1, 13)

m = Flux.Bilinear(10, 10, 7)
Expand Down
33 changes: 15 additions & 18 deletions test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ using Statistics, LinearAlgebra
using Random
using Test

@testset "unsqueeze" begin
x = randn(2, 3, 2)
@test @inferred(unsqueeze(x, 1)) == reshape(x, 1, 2, 3, 2)
@test @inferred(unsqueeze(x, 2)) == reshape(x, 2, 1, 3, 2)
@test @inferred(unsqueeze(x, 3)) == reshape(x, 2, 3, 1, 2)
@test @inferred(unsqueeze(x, 4)) == reshape(x, 2, 3, 2, 1)
end

@testset "Throttle" begin
@testset "default behaviour" begin
a = []
Expand Down Expand Up @@ -244,12 +236,6 @@ end
@test size.(params(r)) == [(5, 10), (5, 5), (5,), (5, 1)]
end

@testset "Basic Stacking" begin
x = randn(3,3)
stacked = stack([x, x], 2)
@test size(stacked) == (3,2,3)
end

@testset "Precision" begin
m = Chain(Dense(10, 5, relu), Dense(5, 2))
x64 = rand(Float64, 10)
Expand Down Expand Up @@ -297,15 +283,26 @@ end
end
end

@testset "unsqueeze" begin
x = randn(2, 3, 2)
@test @inferred(unsqueeze(x, dims=1)) == reshape(x, 1, 2, 3, 2)
@test @inferred(unsqueeze(x, dims=2)) == reshape(x, 2, 1, 3, 2)
@test @inferred(unsqueeze(x, dims=3)) == reshape(x, 2, 3, 1, 2)
@test @inferred(unsqueeze(x, dims=4)) == reshape(x, 2, 3, 2, 1)
end

@testset "Stacking" begin
x = randn(3,3)
stacked = stack([x, x], dims=2)
@test size(stacked) == (3,2,3)

stacked_array=[ 8 9 3 5; 9 6 6 9; 9 1 7 2; 7 4 10 6 ]
unstacked_array=[[8, 9, 9, 7], [9, 6, 1, 4], [3, 6, 7, 10], [5, 9, 2, 6]]
@test unstack(stacked_array, 2) == unstacked_array
@test stack(unstacked_array, 2) == stacked_array
@test stack(unstack(stacked_array, 1), 1) == stacked_array
@test unstack(stacked_array, dims=2) == unstacked_array
@test stack(unstacked_array, dims=2) == stacked_array
@test stack(unstack(stacked_array, dims=1), dims=1) == stacked_array
end


@testset "Batching" begin
stacked_array=[ 8 9 3 5
9 6 6 9
Expand Down