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

Jump to bottom

[ONNX] Add GreaterOrEqual and LessOrEqual to opset 12 ONNX export #38311

Closed
wants to merge 4 commits into from
Closed

[ONNX] Add GreaterOrEqual and LessOrEqual to opset 12 ONNX export #38311

wants to merge 4 commits into from

Conversation

yaeldekel
Copy link
Contributor

GreaterOrEqual and LessOrEqual were added in opset 12, this PR adds support to export these operators to ONNX instead of using "not" and "less than" or "greater than".

@yaeldekel yaeldekel requested a review from apaszke as a code owner May 12, 2020 09:19
@facebook-github-bot facebook-github-bot added the oncall: jit Add this issue/PR to JIT oncall triage queue label May 12, 2020
@dr-ci
Copy link

dr-ci bot commented May 12, 2020 •
edited

💊 CI failures summary and remediations

As of commit 6f0e642 (more details on the Dr. CI page):

🕵️ 1 new failure recognized by patterns

The following CI failures do not appear to be due to upstream breakages:

See CircleCI build pytorch_windows_vs2019_py36_cuda10.1_test2 (1/1)

Step: "Test" (full log | diagnosis details | 🔁 rerun)

AssertionError: Not within tolerance rtol=1.3e-06 atol=1e-05 at input[0] (33.0 vs. 11.0) and 1 other locations (100.00%) 
  File "C:\Users\circleci\project\build\win_tmp\build\torch\testing\_internal\common_utils.py", line 979, in assertEqual 
    assertTensorsEqual(x, y) 
  File "C:\Users\circleci\project\build\win_tmp\build\torch\testing\_internal\common_utils.py", line 937, in assertTensorsEqual 
    atol=atol, rtol=rtol, message=message) 
  File "C:\Users\circleci\project\build\win_tmp\build\torch\testing\_internal\common_utils.py", line 979, in assertEqual 
    assertTensorsEqual(x, y) 
  File "C:\Users\circleci\project\build\win_tmp\build\torch\testing\_internal\common_utils.py", line 941, in assertTensorsEqual 
    torch.testing.assert_allclose(a, b, atol=atol, rtol=rtol, equal_nan=True, msg=message) 
  File "C:\Users\circleci\project\build\win_tmp\build\torch\testing\__init__.py", line 60, in assert_allclose 
    raise AssertionError(msg) 
AssertionError: Not within tolerance rtol=1.3e-06 atol=1e-05 at input[0] (33.0 vs. 11.0) and 1 other locations (100.00%) 
 
---------------------------------------------------------------------- 
Ran 5180 tests in 367.685s 
 
FAILED (failures=2, skipped=209) 
 
Generating XML reports... 
Generated XML report: test-reports\python-unittest\TEST-TestDevicePrecisionCUDA-20200514135948.xml 
Generated XML report: test-reports\python-unittest\TEST-TestTensorDeviceOpsCPU-20200514135948.xml 
Generated XML report: test-reports\python-unittest\TEST-TestTensorDeviceOpsCUDA-20200514135948.xml

🚧 1 fixed upstream failure:

These were probably caused by upstream breakages that were already fixed.

Please rebase on the viable/strict branch (expand for instructions)

Since your merge base is older than viable/strict, run these commands:

git fetch https://github.com/pytorch/pytorch viable/strict
git rebase FETCH_HEAD

Check out the recency history of this "viable master" tracking branch.

ci.pytorch.org: 1 failed

This comment was automatically generated by Dr. CI (expand for details).Follow this link to opt-out of these comments for your Pull Requests.

Please report bugs/suggestions on the GitHub issue tracker.

See how this bot performed.

This comment has been revised 10 times.

@ailzhang ailzhang requested a review from houseroad May 12, 2020 15:40
@ailzhang ailzhang added the triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module label May 12, 2020
neginraoof
neginraoof reviewed May 13, 2020
View reviewed changes
test/onnx/test_pytorch_onnx_onnxruntime.py
@@ -1956,42 +1956,70 @@ def forward(self, input):
x = torch.ones(5, 6)
self.run_test(DimArange(), x)

def _test_compare_ops(self, model, num_inputs):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the output data type in PyTorch if inputs don't have the same data type?
Edit: Inferred data type*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output type is always bool, regardless of the input types.

In reply to: 424530939 [](ancestors = 424530939)

neginraoof
neginraoof reviewed May 13, 2020
View reviewed changes
test/onnx/test_pytorch_onnx_onnxruntime.py
@@ -1956,42 +1956,70 @@ def forward(self, input):
x = torch.ones(5, 6)
self.run_test(DimArange(), x)

def _test_compare_ops(self, model, num_inputs):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a couple more tests for combination of input types (like float and int)?

neginraoof
neginraoof approved these changes May 14, 2020
View reviewed changes
Copy link
Contributor

@neginraoof neginraoof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@neginraoof
Copy link
Contributor

cc @houseroad for review. Thanks.

houseroad
houseroad approved these changes May 17, 2020
View reviewed changes
Copy link
Member

@houseroad houseroad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

facebook-github-bot
facebook-github-bot reviewed May 17, 2020
View reviewed changes
Copy link
Contributor

@facebook-github-bot facebook-github-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@houseroad has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@houseroad merged this pull request in ece878e.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@facebook-github-bot facebook-github-bot facebook-github-bot left review comments

@neginraoof neginraoof neginraoof approved these changes

@houseroad houseroad houseroad approved these changes

@apaszke apaszke Awaiting requested review from apaszke

Assignees
No one assigned
Labels
Merged oncall: jit Add this issue/PR to JIT oncall triage queue open source triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@yaeldekel @neginraoof @facebook-github-bot @houseroad @ailzhang @pytorchbot @mruberry @yaeldMS