Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BUG: Fixes einsum broadcasting bug when optimize=True #11219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2018
Merged

BUG: Fixes einsum broadcasting bug when optimize=True #11219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bd60c9
TST: Test einsum optimize broadcasting error
rsokl Jun 1, 2018
0ba249a
BUG: Fix check for singleton dimensions in einsum.
rsokl Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion numpy/core/einsumfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ def einsum(*operands, **kwargs):
# Checks have already been handled
input_str, results_index = einsum_str.split('->')
input_left, input_right = input_str.split(',')
if 1 in tmp_operands[0] or 1 in tmp_operands[1]:
if 1 in tmp_operands[0].shape or 1 in tmp_operands[1].shape:
left_dims = {dim: size for dim, size in
zip(input_left, tmp_operands[0].shape)}
right_dims = {dim: size for dim, size in
Expand Down
14 changes: 11 additions & 3 deletions numpy/core/tests/test_einsum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,16 +489,24 @@ def check_einsum_sums(self, dtype, do_opt=False):
assert_array_equal(np.einsum('ij,ij->j', p, q, optimize=True),
[10.] * 2)

p = np.ones((1, 5))
q = np.ones((5, 5))
# a blas-compatible contraction broadcasting case which was failing
# for optimize=True (ticket #10930)
x = np.array([2., 3.])
y = np.array([4.])
assert_array_equal(np.einsum("i, i", x, y, optimize=False), 20.)
assert_array_equal(np.einsum("i, i", x, y, optimize=True), 20.)

# all-ones array was bypassing bug (ticket #10930)
p = np.ones((1, 5)) / 2
q = np.ones((5, 5)) / 2
for optimize in (True, False):
assert_array_equal(np.einsum("...ij,...jk->...ik", p, p,
optimize=optimize),
np.einsum("...ij,...jk->...ik", p, q,
optimize=optimize))
assert_array_equal(np.einsum("...ij,...jk->...ik", p, q,
optimize=optimize),
np.full((1, 5), 5))
np.full((1, 5), 1.25))

def test_einsum_sums_int8(self):
self.check_einsum_sums('i1')
Expand Down