Merge pull request #3895 from larsmans/norm-dot

ENH: use dot in linalg.norm

1 files changed, 6 insertions, 1 deletions

diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index a7e12aa08..102c6aec2 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -2053,7 +2053,12 @@ def norm(x, ord=None, axis=None):
 
     # Check the default case first and handle it immediately.
     if ord is None and axis is None:
-        return sqrt(add.reduce((x.conj() * x).real, axis=None))
+        x = x.ravel(order='K')
+        if isComplexType(x.dtype.type):
+            sqnorm = dot(x.real, x.real) + dot(x.imag, x.imag)
+        else:
+            sqnorm = dot(x, x)
+        return sqrt(sqnorm)
 
     # Normalize the `axis` argument to a tuple.
     nd = x.ndim