diff options
author | Sebastian Berg <sebastian@sipsolutions.net> | 2020-05-11 16:33:04 -0500 |
---|---|---|
committer | Sebastian Berg <sebastian@sipsolutions.net> | 2020-05-11 18:42:14 -0500 |
commit | 87cb35f371c5711ea20979b9e2569ca544b237e6 (patch) | |
tree | fb9676db3a0c10324e0704225068a12a53491f89 | |
parent | 7f8dc86765f6f52e45126c3d7c80ac00eb01d271 (diff) | |
download | numpy-87cb35f371c5711ea20979b9e2569ca544b237e6.tar.gz |
MAINT: Use reduction axis marker for einsum
-rw-r--r-- | numpy/core/src/multiarray/einsum.c.src | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src index 1cc557825..b914e5bb3 100644 --- a/numpy/core/src/multiarray/einsum.c.src +++ b/numpy/core/src/multiarray/einsum.c.src @@ -2740,7 +2740,7 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop, op_axes[nop][idim] = idim; } for (idim = ndim_output; idim < ndim_iter; ++idim) { - op_axes[nop][idim] = -1; + op_axes[nop][idim] = NPY_ITER_REDUCTION_AXIS(-1); } /* Set the iterator per-op flags */ @@ -2753,13 +2753,11 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop, op_flags[nop] = NPY_ITER_READWRITE| NPY_ITER_NBO| NPY_ITER_ALIGNED| - NPY_ITER_ALLOCATE| - NPY_ITER_NO_BROADCAST; + NPY_ITER_ALLOCATE; iter_flags = NPY_ITER_EXTERNAL_LOOP| NPY_ITER_BUFFERED| NPY_ITER_DELAY_BUFALLOC| NPY_ITER_GROWINNER| - NPY_ITER_REDUCE_OK| NPY_ITER_REFS_OK| NPY_ITER_ZEROSIZE_OK; if (out != NULL) { |