diff options
author | Warren Weckesser <warren.weckesser@gmail.com> | 2013-07-20 08:12:27 -0400 |
---|---|---|
committer | Warren Weckesser <warren.weckesser@gmail.com> | 2013-07-20 08:12:27 -0400 |
commit | 80bc69023baa1974726ba6c259179a5854d84c72 (patch) | |
tree | 15a330dae4051c8d38be33af0b66a5c1ef9d303e /numpy/linalg/linalg.py | |
parent | ffb45c5f107795752a55976b185ed50784aed744 (diff) | |
download | numpy-80bc69023baa1974726ba6c259179a5854d84c72.tar.gz |
MAINT: linalg: some more clean up in norm: 'nd' was defined but not used
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r-- | numpy/linalg/linalg.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index 53b505756..760ca31b0 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -2032,12 +2032,12 @@ def norm(x, ord=None, axis=None): return sqrt(add.reduce((x.conj() * x).real, axis=None)) # Normalize the `axis` argument to a tuple. + nd = x.ndim if axis is None: - axis = tuple(range(x.ndim)) + axis = tuple(range(nd)) elif not isinstance(axis, tuple): axis = (axis,) - nd = x.ndim if len(axis) == 1: if ord == Inf: return abs(x).max(axis=axis) @@ -2066,11 +2066,10 @@ def norm(x, ord=None, axis=None): return add.reduce(absx**ord, axis=axis)**(1.0/ord) elif len(axis) == 2: row_axis, col_axis = axis - if not (-x.ndim <= row_axis < x.ndim and - -x.ndim <= col_axis < x.ndim): + if not (-nd <= row_axis < nd and -nd <= col_axis < nd): raise ValueError('Invalid axis %r for an array with shape %r' % (axis, x.shape)) - if row_axis % x.ndim == col_axis % x.ndim: + if row_axis % nd == col_axis % nd: raise ValueError('Duplicate axes given.') if ord == 2: return _multi_svd_norm(x, row_axis, col_axis, amax) |