diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-07-01 08:38:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 08:38:25 -0600 |
| commit | 0e4253526c727f50696f6233fee3d50a419ba9fe (patch) | |
| tree | 7ce74ce6b6b13957d2964fdfc694812ced475230 /numpy/core/fromnumeric.py | |
| parent | 84f987c74209694b9cefe987154db404ad3f42e1 (diff) | |
| parent | 1b3e6f1d8dad0b3b7d8a0891dcb2050cdc023075 (diff) | |
| download | numpy-0e4253526c727f50696f6233fee3d50a419ba9fe.tar.gz | |
Merge pull request #9341 from eric-wieser/resize-empty
BUG: np.resize discards empty shapes
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index a8c2fd2fb..4922fc3e4 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1120,18 +1120,16 @@ def resize(a, new_shape): new_shape = (new_shape,) a = ravel(a) Na = len(a) - if not Na: - return mu.zeros(new_shape, a.dtype) total_size = um.multiply.reduce(new_shape) + if Na == 0 or total_size == 0: + return mu.zeros(new_shape, a.dtype) + n_copies = int(total_size / Na) extra = total_size % Na - if total_size == 0: - return a[:0] - if extra != 0: - n_copies = n_copies+1 - extra = Na-extra + n_copies = n_copies + 1 + extra = Na - extra a = concatenate((a,)*n_copies) if extra > 0: |