8000 BUG: Fix crash on 0d return value in apply_along_axis by eric-wieser · Pull Request #8441 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Fix crash on 0d return value in apply_along_axis #8441

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 8 commits into from
Feb 12, 2017
+165 −68
Merged

BUG: Fix crash on 0d return value in apply_along_axis #8441

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52988ea
BUG: Fix crash on 0d return value in apply_along_axis
eric-wieser Jan 2, 2017
5307aed
MAINT: Use np.ndindex, which seems just as efficient
eric-wieser Jan 2, 2017
b10b6c2
BUG: Call __array_prepare__ before __array_wrap__
eric-wieser Jan 2, 2017
9f362bf
BUG: Work around evil matrix.__array_prepare__
eric-wieser Jan 3, 2017
c8efc57
MAINT: Transpose the result, rather than working with a transposed view
eric-wieser Jan 20, 2017
ff9c363
TST: Verify apply_along_axis now works on masked arrays
eric-wieser Jan 20, 2017
78084ee
MAINT: Improve error-checking of axis argument
eric-wieser Feb 8, 2017
d4bce01
DOC: Update 1.13.0 release notes with apply_along_axis changes
eric-wieser Feb 8, 2017
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
Prev Previous commit
Next Next commit
BUG: Call __array_prepare__ before __array_wrap__
  • Loading branch information
@eric-wieser
eric-wieser committed Feb 11, 2017
commit b10b6c290ded55e410543b9d09686042be3db6ec
5 changes: 4 additions & 1 deletion numpy/lib/shape_base.py
9311
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def apply_along_axis(func1d, axis, arr, *args, **kwargs):
# insert as many axes as necessary to create the output
outshape = arr.shape[:axis] + res.shape + arr.shape[axis+1:]
outarr = zeros(outshape, res.dtype)
outarr = res.__array_wrap__(outarr)
outarr = res.__array_prepare__(outarr)

# outarr, with inserted dimensions at the end
# this means that outarr_view[i] = func1d(inarr_view[i])
Expand All @@ -127,6 +127,9 @@ def apply_along_axis(func1d, axis, arr, *args, **kwargs):
outarr_view[ind0] = res
for ind in inds:
outarr_view[ind] = asanyarray(func1d(inarr_view[ind], *args, **kwargs))

outarr = res.__array_wrap__(outarr)

return outarr


Expand Down
0