diff options
| author | Ben Rowland <bennyrowland@mac.com> | 2016-12-31 16:52:47 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-12-31 09:52:47 -0700 |
| commit | b1b67d65503b46f7da04785656b145ee82cc0157 (patch) | |
| tree | 24054cb43aaa34bde12234eb4841dccedd7881d5 | |
| parent | 3add9ed2d7c93215db9bdfd9a3accaa341ce3647 (diff) | |
| download | numpy-b1b67d65503b46f7da04785656b145ee82cc0157.tar.gz | |
BUG: Fix apply_along_axis() for when func1d() returns a non-ndarray (#8426)
* BUG: Closes issue #8419
Fixes issue in apply_along_axis() where func1d() returns a non ndarray
* BUG: Fix apply_along_axis() when func1d() returns a non-ndarray
Closes issue #8419. Fixes issue in apply_along_axis() where
func1d() returns a non ndarray by calling asanyarray() on
result. This commit fixes a too long line in the test case.
| -rw-r--r-- | numpy/lib/shape_base.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_shape_base.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index e580690d1..6e92aa041 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -127,7 +127,7 @@ def apply_along_axis(func1d, axis, arr, *args, **kwargs): ind[n] = 0 n -= 1 i.put(indlist, ind) - res = func1d(arr[tuple(i.tolist())], *args, **kwargs) + res = asanyarray(func1d(arr[tuple(i.tolist())], *args, **kwargs)) outarr[tuple(i.tolist())] = res k += 1 if res.shape == (): diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py index 2eb4a809d..a716d3b38 100644 --- a/numpy/lib/tests/test_shape_base.py +++ b/numpy/lib/tests/test_shape_base.py @@ -58,6 +58,12 @@ class TestApplyAlongAxis(TestCase): assert isinstance(res, MinimalSubclass) assert_array_equal(res, np.array([6, 6, 6]).view(MinimalSubclass)) + def test_tuple_func1d(self): + def sample_1d(x): + return x[1], x[0] + res = np.apply_along_axis(sample_1d, 1, np.array([[1, 2], [3, 4]])) + assert_array_equal(res, np.array([[2, 1], [4, 3]])) + class TestApplyOverAxes(TestCase): def test_simple(self): |