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

fixes to colonful reshape #54261

Merged
merged 3 commits into from
May 13, 2024
Merged

fixes to colonful reshape #54261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77a2463
fixes to colonful `reshape`
nsajko Apr 25, 2024
0dd2390
also add some type assertions for good measure
nsajko Apr 26, 2024
f1fc62f
fix issue pointed out by N5N3
nsajko Apr 29, 2024
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
20 changes: 16 additions & 4 deletions base/reshapedarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,24 @@ reshape(parent::AbstractArray, dims::Tuple{Vararg{Union{Int,Colon}}}) = reshape(
"may have at most one omitted dimension specified by `Colon()`")))
@noinline throw2(A, dims) = throw(DimensionMismatch(string("array size $(length(A)) ",
"must be divisible by the product of the new dimensions $dims")))
pre = _before_colon(dims...)
pre = _before_colon(dims...)::Tuple{Vararg{Int}}
post = _after_colon(dims...)
_any_colon(post...) && throw1(dims)
sz, remainder = divrem(length(A), prod(pre)*prod(post))
remainder == 0 || throw2(A, dims)
(pre..., Int(sz), post...)
post::Tuple{Vararg{Int}}
len = length(A)
sz, is_exact = if iszero(len)
(0, true)
else
let pr = Core.checked_dims(pre..., post...) # safe product
if iszero(pr)
throw2(A, dims)
end
(quo, rem) = divrem(len, pr)
(Int(quo), iszero(rem))
end
end::Tuple{Int,Bool}
is_exact || throw2(A, dims)
(pre..., sz, post...)::Tuple{Int,Vararg{Int}}
end
@inline _any_colon() = false
@inline _any_colon(dim::Colon, tail...) = true
Expand Down
18 changes: 18 additions & 0 deletions test/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,6 +1852,24 @@ function check_pointer_strides(A::AbstractArray)
return true
end

@testset "colonful `reshape`, #54245" begin
@test reshape([], (0, :)) isa Matrix
@test_throws DimensionMismatch reshape([7], (0, :))
let b = prevpow(2, typemax(Int))
@test iszero(b*b)
@test_throws ArgumentError reshape([7], (b, :, b))
@test reshape([], (b, :, b)) isa Array{<:Any, 3}
end
for iterator ∈ (7:6, 7:7, 7:8)
for it ∈ (iterator, map(BigInt, iterator))
@test reshape(it, (:, Int(length(it)))) isa AbstractMatrix
@test reshape(it, (Int(length(it)), :)) isa AbstractMatrix
@test reshape(it, (1, :)) isa AbstractMatrix
@test reshape(it, (:, 1)) isa AbstractMatrix
end
end
end

@testset "strides for ReshapedArray" begin
# Type-based contiguous Check
a = vec(reinterpret(reshape, Int16, reshape(view(reinterpret(Int32, randn(10)), 2:11), 5, :)))
Expand Down