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

merged 3 commits into from
May 13, 2024

Conversation

nsajko
Copy link
Contributor

@nsajko nsajko commented Apr 26, 2024

Fixes #54245

@nsajko nsajko added arrays [a, r, r, a, y, s] bugfix This change fixes an existing bug labels Apr 26, 2024
nhz2
nhz2 approved these changes Apr 28, 2024
View reviewed changes
Copy link
Contributor

@nhz2 nhz2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

N5N3
N5N3 reviewed Apr 29, 2024
View reviewed changes
base/reshapedarray.jl Outdated Show resolved Hide resolved
nsajko added 2 commits April 29, 2024 17:58
@nsajko
fixes to colonful reshape
77a2463 
In several different situations `reshape` had thrown `DivideError`
instead of returning a correct result or throwing.

Fixes JuliaLang#54245
@nsajko
also add some type assertions for good measure
0dd2390
@nsajko nsajko force-pushed the zerolength_colon_reshape branch from 8a9ebaf to 30823c9 Compare April 29, 2024 16:33
@nsajko nsajko force-pushed the zerolength_colon_reshape branch from 30823c9 to f1fc62f Compare April 29, 2024 16:57
@nsajko
Copy link
Contributor Author

nsajko commented May 6, 2024

ping

1 similar comment
@nsajko
Copy link
Contributor Author

nsajko commented May 13, 2024

ping

@oscardssmith oscardssmith merged commit b9f68ac into JuliaLang:master May 13, 2024
5 of 7 checks passed
@nsajko nsajko deleted the zerolength_colon_reshape branch May 13, 2024 14:34
@jishnub
Copy link
Contributor

jishnub commented Jun 17, 2024 •
edited
Loading

The type assertions added here appear to have broken reshape using BigInts. Are these essential for type-inference?
E.g. the following works on Julia v1.10, but is broken on nightly:

julia> using FillArrays

julia> reshape(Fill(1, 2), big(2), :)
2×1 Fill{Int64}, with entries equal to 1

Edit: FillArrays appears to directly call this internal function, which it probably shouldn't. However, is reshape necessarily expected to convert indices to Int?

@nsajko
Copy link
Contributor Author

nsajko commented Jun 17, 2024

_reshape_uncolon is only ever (legally) called from that one reshape method, which itself only accepts Union{Int,Colon} dims.

julia/base/reshapedarray.jl

Lines 129 to 130 in b0b7a85

reshape(parent::AbstractArray, dims::Tuple{Vararg{Union{Int,Colon}}}) = reshape(parent, _reshape_uncolon(parent, dims))
@inline function _reshape_uncolon(A, dims)

lazarusA pushed a commit to lazarusA/julia that referenced this pull request Jul 12, 2024
@nsajko @lazarusA
fixes to colonful reshape (JuliaLang#54261)
3c5eb86 
Fixes JuliaLang#54245
This was referenced Aug 15, 2024
Open
Open
@matthias314 matthias314 mentioned this pull request Aug 16, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@N5N3 N5N3 N5N3 left review comments

@nhz2 nhz2 nhz2 approved these changes

@oscardssmith oscardssmith oscardssmith approved these changes

Assignees
No one assigned
Labels
arrays [a, r, r, a, y, s] bugfix This change fixes an existing bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

colonful reshape may spuriously throw DivideError
5 participants
@nsajko @jishnub @oscardssmith @N5N3 @nhz2