Skip to content
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.

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

Fix eq none bug #7938

Merged
merged 29 commits into from
Apr 3, 2022
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e6e6973
fix reduce_sum scalar check bug
BBuf Mar 22, 2022
a0abdd5
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
00522df
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
68e0e08
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 24, 2022
0b90f9b
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 28, 2022
d81aa80
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
81954d7
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
c910fbe
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
32702cf
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
9fa0513
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 30, 2022
8402ce3
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 31, 2022
d39e827
fix equal none bug
BBuf Mar 31, 2022
840437a
refine
BBuf Mar 31, 2022
7143abf
auto format by CI
oneflow-ci-bot Mar 31, 2022
6068180
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Mar 31, 2022
3d04d12
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Mar 31, 2022
6a31faf
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Mar 31, 2022
3bcc2d9
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Mar 31, 2022
8512263
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 1, 2022
248e3de
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 1, 2022
24d2ea8
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 1, 2022
6ba2dc3
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 1, 2022
9ef095e
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
19b99aa
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
9aff8e8
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
27cb5a3
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
135eeee
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
e54b819
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 2, 2022
f96c383
Merge branch 'master' into fix_eq_none_bug
mergify[bot] Apr 3, 2022
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
7 changes: 6 additions & 1 deletion python/oneflow/framework/tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ def _meta_repr(self):


def _eq(self, other):
return flow._C.equal(self, other)
if (self is None and other is None):
return True
elif (self is None and other is not None) or (self is not None and other is None):
return False
else:
return flow._C.equal(self, other)


def _ne(self, other):
Expand Down
9 changes: 9 additions & 0 deletions python/oneflow/test/tensor/test_tensor_part_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,15 @@ def test_tensor_int(test_case):
x = flow.tensor(2.3)
y = int(x)
test_case.assertTrue(np.array_equal(y, 2))

def test_none_equal(test_case):
xt = flow.randn(10)
yt = flow.randn(10)
z = None in [xt, yt]
test_case.assertTrue(np.array_equal(z, False))
zt = None
z = None in [xt, yt, zt]
test_case.assertTrue(np.array_equal(z, True))


if __name__ == "__main__":
Expand Down