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

Support repeat at any dimension #29626

Merged
merged 8 commits into from
Oct 23, 2018
Merged

Support repeat at any dimension #29626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
956dff3
Support repeat at any dimension
johnnychen94 Oct 13, 2018
5ee3cb6
Use a more friendly way to do getindex
johnnychen94 Oct 16, 2018
10b9b9d
rollback to original commit
johnnychen94 Oct 16, 2018
77a7621
use `1` instead of `OneTo(1)`
johnnychen94 Oct 16, 2018
c889a1a
Change 1 to OneTo(1)
johnnychen94 Oct 17, 2018
7e8c9c7
Change `length` to `ndims`, add test
johnnychen94 Oct 18, 2018
b4c3b17
Fix a test error
johnnychen94 Oct 18, 2018
dadf4f5
trigger rebuild
johnnychen94 Oct 18, 2018
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
3 changes: 2 additions & 1 deletion base/abstractarraymath.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ _reperr(s, n, N) = throw(ArgumentError("number of " * s * " repetitions " *

# fill the first inner block
if all(x -> x == 1, inner)
R[axes(A)...] = A
idxs = (axes(A)..., ntuple(n->OneTo(1), ndims(R)-ndims(A))...) # keep dimension consistent
R[idxs...] = A
else
inner_indices = [1:n for n in inner]
for c in CartesianIndices(axes(A))
Expand Down
6 changes: 6 additions & 0 deletions test/arrayops.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,12 @@ end
@test_throws MethodError repeat(1, 2, 3)
@test repeat([1, 2], 1, 2, 3) == repeat([1, 2], outer = (1, 2, 3))

# issue 29614
@test repeat(ones(2, 2), 1, 1, 1) == ones(2, 2, 1)
@test repeat(ones(2, 2), 2, 2, 2) == ones(4, 4, 2)
@test repeat(ones(2), 2, 2, 2) == ones(4, 2, 2)
@test repeat(ones(2, 2), inner=(1, 1, 1), outer=(2, 2, 2)) == ones(4, 4, 2)

R = repeat([1, 2])
@test R == [1, 2]
R = repeat([1, 2], inner=1)
Expand Down