summaryrefslogtreecommitdiff
path: root/numpy/linalg/linalg.py
diff options
context:
space:
mode:
authorMatheus Vieira Portela <matheus.v.portela@gmail.com>2018-01-18 06:12:16 -0200
committerEric Wieser <wieser.eric@gmail.com>2018-01-18 00:12:16 -0800
commitf4092e81f45640b6ac13f3e106ee0cb996e3b4f2 (patch)
tree2b8b1e1fa3344169ff6b74c0538e34f818056e6e /numpy/linalg/linalg.py
parent142184914b3de87dc7f49b8787d4f39ce67f7d1e (diff)
downloadnumpy-f4092e81f45640b6ac13f3e106ee0cb996e3b4f2.tar.gz
DOC: Record when axis was added to linalg.norm (#10426)
Fixes #5727 The axis argument was introduced in #3387
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r--numpy/linalg/linalg.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 02508053d..d7d67a91f 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -2121,6 +2121,9 @@ def norm(x, ord=None, axis=None, keepdims=False):
axes that hold 2-D matrices, and the matrix norms of these matrices
are computed. If `axis` is None then either a vector norm (when `x`
is 1-D) or a matrix norm (when `x` is 2-D) is returned.
+
+ .. versionadded:: 1.8.0
+
keepdims : bool, optional
If this is set to True, the axes which are normed over are left in the
result as dimensions with size one. With this option the result will