summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorTyler Reddy <tyler.je.reddy@gmail.com>2018-12-04 13:41:51 -0800
committerTyler Reddy <tyler.je.reddy@gmail.com>2018-12-14 10:14:05 -0800
commit528b0e157ade5ead2e806257e21f8d9562ba3b9d (patch)
tree47e8fb553d935f8fd945491989ed778686312b90 /numpy
parent19784177a61de75927a4934fd4cdd91afbb5b35c (diff)
downloadnumpy-528b0e157ade5ead2e806257e21f8d9562ba3b9d.tar.gz
MAINT: matmul docstring marked with SKIP in some places until fixed
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index 528a03733..236c35f9b 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -2605,9 +2605,9 @@ add_newdoc('numpy.core.umath', 'matmul',
>>> a = a = np.full([9,5,7,3], True, dtype=bool)
>>> c = np.full([9, 5, 4,3], True, dtype=bool)
- >>> np.dot(a, c).shape
+ >>> np.dot(a, c).shape # doctest: +SKIP
(9, 5, 7, 9, 5, 4)
- >>> np.matmul(a, c).shape # n is 5, k is 3, m is 4
+ >>> np.matmul(a, c).shape # doctest: +SKIP
(9, 5, 7, 4)
The matmul function implements the semantics of the `@` operator introduced
@@ -2620,7 +2620,7 @@ add_newdoc('numpy.core.umath', 'matmul',
>>> a = np.array([[1, 0],
... [0, 1]])
>>> b = np.array([[4, 1],
- ... [2, 2]]
+ ... [2, 2]])
>>> np.matmul(a, b)
array([[4, 1],
[2, 2]])
@@ -2628,7 +2628,7 @@ add_newdoc('numpy.core.umath', 'matmul',
For 2-D mixed with 1-D, the result is the usual.
>>> a = np.array([[1, 0],
- ... [0, 1]]
+ ... [0, 1]])
>>> b = np.array([1, 2])
>>> np.matmul(a, b)
array([1, 2])