diff options
| author | John Kirkham <kirkhamj@janelia.hhmi.org> | 2016-01-22 17:31:13 -0500 |
|---|---|---|
| committer | John Kirkham <kirkhamj@janelia.hhmi.org> | 2016-01-22 18:15:44 -0500 |
| commit | 43c6a89128347928c5fe26f67ba2a0a022f00822 (patch) | |
| tree | 66e843ac0d8bd4a3440391006fc2601b7eb46b04 /numpy/linalg/linalg.py | |
| parent | bc4a17ed89004ed63558a3e7f0bd035580777aa7 (diff) | |
| download | numpy-43c6a89128347928c5fe26f67ba2a0a022f00822.tar.gz | |
BUG: Make sure that the `ord=0` case returns a float.
Diffstat (limited to 'numpy/linalg/linalg.py')
| -rw-r--r-- | numpy/linalg/linalg.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index fe2031efb..f333bde47 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -2150,7 +2150,7 @@ def norm(x, ord=None, axis=None, keepdims=False): return abs(x).min(axis=axis, keepdims=keepdims) elif ord == 0: # Zero norm - return (x != 0).sum(axis=axis, keepdims=keepdims) + return (x != 0).astype(float).sum(axis=axis, keepdims=keepdims) elif ord == 1: # special case for speedup return add.reduce(abs(x), axis=axis, keepdims=keepdims) |