diff options
| author | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-10-05 01:04:26 +0200 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-10-05 01:04:26 +0200 |
| commit | 7d1a3cf3478b5dde9fcbeb54a4fe826a5f22f530 (patch) | |
| tree | a97a210d5b2c4a60fb983d041a974ebffad3355d /numpy/core/src | |
| parent | cd0b8e7031fa16a60b22b74f1b0273ca60d58668 (diff) | |
| parent | 8615d5e57c7f07c41f5f5c87d3b8ab6da4bfb4ec (diff) | |
| download | numpy-7d1a3cf3478b5dde9fcbeb54a4fe826a5f22f530.tar.gz | |
Merge pull request #5152 from tovrstra/collapsingbug
fixed #5147 collapsingbug in einsum
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/multiarray/einsum.c.src | 2 |
1 files changed, 1 insertions, 1 deletions
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 " |