summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/linalg/linalg.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 4c4e51748..53b505756 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -2029,8 +2029,7 @@ def norm(x, ord=None, axis=None):
# Check the default case first and handle it immediately.
if ord is None and axis is None:
- s = (x.conj() * x).real
- return sqrt(add.reduce((x.conj() * x).ravel().real))
+ return sqrt(add.reduce((x.conj() * x).real, axis=None))
# Normalize the `axis` argument to a tuple.
if axis is None: