summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorThomas A Caswell <tcaswell@gmail.com>2014-12-09 17:34:45 -0500
committerThomas A Caswell <tcaswell@bnl.gov>2014-12-12 14:00:38 -0500
commitad38608c125df357f7136e111f36955b6fab5d33 (patch)
tree95d11ffadb5a99b4b1e8a42f69c5f437879b82e8 /numpy/core/numeric.py
parent629735bf25589d5551f9e5c1c5c3194d25511260 (diff)
downloadnumpy-ad38608c125df357f7136e111f36955b6fab5d33.tar.gz
DOC : list type option in tensordot axes arg
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 30cba28f2..85d3751cc 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -1150,7 +1150,7 @@ def tensordot(a, b, axes=2):
----------
a, b : array_like, len(shape) >= 1
Tensors to "dot".
- axes : {integer_like, array_like}
+ axes : integer or (2,) array_like
* integer_like
If an int N, sum over the last N axes of `a` and the first N axes
of `b` in order. The sizes of the corresponding axes must match.
@@ -1168,11 +1168,11 @@ def tensordot(a, b, axes=2):
``axes = 0`` : tensor product $a\otimes b$
``axes = 1`` : tensor dot product $a\cdot b$
``axes = 2`` : (default) tensor double contraction $a:b$
-
- When `axes` is integer_like, the sequence for evaluation will be: first
- the -Nth axis in `a` and 0th axis in `b`, and the -1th axis in `a` and
+
+ When `axes` is integer_like, the sequence for evaluation will be: first
+ the -Nth axis in `a` and 0th axis in `b`, and the -1th axis in `a` and
Nth axis in `b` last.
-
+
When there is more than one axis to sum over - and they are not the last
(first) axes of `a` (`b`) - the argument `axes` should consist of
two sequences of the same length, with the first axis to sum over given