From 8615d5e57c7f07c41f5f5c87d3b8ab6da4bfb4ec Mon Sep 17 00:00:00 2001 From: Toon Verstraelen Date: Sat, 4 Oct 2014 15:54:09 -0400 Subject: BUG: fixed #5147 collapsingbug in einsum --- numpy/core/src/multiarray/einsum.c.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/core/src') diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src index b3148f573..3f47ec1f4 100644 --- a/numpy/core/src/multiarray/einsum.c.src +++ b/numpy/core/src/multiarray/einsum.c.src @@ -2234,7 +2234,7 @@ get_combined_dims_view(PyArrayObject *op, int iop, char *labels) else { /* Update the combined axis dimensions and strides */ i = idim + combineoffset; - if (combineoffset < 0 && + if (combineoffset < 0 && new_dims[i] != 0 && new_dims[i] != PyArray_DIM(op, idim)) { PyErr_Format(PyExc_ValueError, "dimensions in operand %d for collapsing " -- cgit v1.2.1