[ONNX] Enable constant folding for Shape #35386

KsenijaS · 2020-03-25T17:21:12Z

Enabled constant folding for onnx::Shape

dr-ci · 2020-03-25T17:22:40Z

💊 CircleCI build failures summary and remediations

As of commit 77c327d (more details on the Dr. CI page):

💚 💚 Looks good so far! There are no CircleCI failures yet. 💚 💚

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 37 times.

test/onnx/test_utility_funs.py

neginraoof · 2020-03-25T20:43:54Z

Also, please check the failures. Looks like test test/onnx/test_operators.py TestOperators.test_expand is failing.
Export of expand op in opset 9 uses ones_like op which uses shape op. This could be expected, please verify and update the expand expected graph file.

neginraoof

Thanks for the fixes. Please check if there's an onnxruntime test for shape and add that if not.

facebook-github-bot

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

KsenijaS · 2020-03-31T17:20:18Z

@houseroad can you merge this PR?

neginraoof · 2020-04-02T19:20:22Z

@KsenijaS could you rebase this PR please?

KsenijaS · 2020-04-07T17:27:15Z

@houseroad can you please review my PR, it seems that none of the failure are caused by my changes

houseroad

not sure why we need to change onnx::gather part

houseroad · 2020-04-07T17:32:54Z

torch/csrc/jit/passes/onnx/constant_fold.cpp

@@ -295,7 +299,7 @@ c10::optional<at::Tensor> runTorchBackendForOnnx(
        inputTensorValues[0], p, node->is(attr::axes), node->i(attr::keepdims));
    return c10::optional<at::Tensor>(updated_val);
  } else if (node->kind() == onnx::Gather) {
-    assert(inputTensorValues.size() == 1);
+    assert(inputTensorValues.size() == 2);


why change this?

gather has 2 inputs, that's why my tests were failing

This was a bug in gather implementation for constant folding. This node is required to have 2 inputs always (Note that this assertion as not blocking tests on CI, and was caught locally).

@houseroad if you have no further comments, can this PR be merged?

KsenijaS · 2020-04-08T16:36:00Z

@houseroad can we merge this PR?

BowenBao

LGTM, please update assert to TORCH_INTERNAL_ASSERT

torch/csrc/jit/passes/onnx/constant_fold.cpp

facebook-github-bot

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

houseroad

Thanks

facebook-github-bot · 2020-04-12T04:22:33Z

@houseroad merged this pull request in 4f728c9.

facebook-github-bot · 2020-04-12T04:22:38Z

@houseroad merged this pull request in 4f728c9.

Summary: Enabled constant folding for onnx::Shape Pull Request resolved: pytorch#35386 Reviewed By: hl475 Differential Revision: D20682412 Pulled By: houseroad fbshipit-source-id: 4559a35f174edfb7e6364c0fbf5bc1d55d0d26dc

constant fold for shape

0d581a4

KsenijaS requested a review from apaszke as a code owner March 25, 2020 17:21

facebook-github-bot added the oncall: jit Add this issue/PR to JIT oncall triage queue label Mar 25, 2020

uncomment the code

e511e0e

pytorchbot added the open source label Mar 25, 2020

eellison mentioned this pull request Mar 25, 2020

[JIT] remove prim::shape op #34286

Closed

neginraoof approved these changes Mar 25, 2020

View reviewed changes

test/onnx/test_utility_funs.py Outdated Show resolved Hide resolved

neginraoof suggested changes Mar 25, 2020

View reviewed changes

test/onnx/test_utility_funs.py Outdated Show resolved Hide resolved

KsenijaS added 2 commits March 25, 2020 15:18

update test

f37e99c

update expand file

48a4be1

ngimel added the triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module label Mar 25, 2020

ngimel requested a review from houseroad March 25, 2020 23:13

ngimel added the module: onnx Related to torch.onnx label Mar 25, 2020

neginraoof reviewed Mar 26, 2020

View reviewed changes

KsenijaS added 2 commits March 26, 2020 15:40

Merge https://github.com/pytorch/pytorch into shape_const_fold

637eea6

add onnxruntime test

f267049

facebook-github-bot reviewed Mar 26, 2020

View reviewed changes

neginraoof approved these changes Mar 27, 2020

View reviewed changes

fix merge conflict

76a87b1

KsenijaS added 5 commits April 2, 2020 14:33

Merge https://github.com/pytorch/pytorch into shape_const_fold

065d1b7

Merge https://github.com/pytorch/pytorch into shape_const_fold

763b485

Merge https://github.com/pytorch/pytorch into shape_const_fold

ee8778e

fix failing test

6d57639

Merge https://github.com/pytorch/pytorch into shape_const_fold

31a410f

houseroad reviewed Apr 7, 2020

View reviewed changes

eellison mentioned this pull request Apr 8, 2020

[ONNX] disable size optimizations for onnx #36243

Closed

BowenBao approved these changes Apr 9, 2020

View reviewed changes

torch/csrc/jit/passes/onnx/constant_fold.cpp Outdated Show resolved Hide resolved

KsenijaS added 2 commits April 10, 2020 10:22

use TORCH_INTERNAL_ASSERT

58da44c

Merge https://github.com/pytorch/pytorch into shape_const_fold

77c327d

facebook-github-bot reviewed Apr 10, 2020

View reviewed changes

houseroad approved these changes Apr 10, 2020

View reviewed changes

facebook-github-bot closed this in 4f728c9 Apr 11, 2020

facebook-github-bot added the merged label Apr 12, 2020

mruberry added the Merged label Oct 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ONNX] Enable constant folding for Shape #35386

[ONNX] Enable constant folding for Shape #35386

KsenijaS commented Mar 25, 2020

dr-ci bot commented Mar 25, 2020 •

edited

neginraoof commented Mar 25, 2020

neginraoof left a comment

facebook-github-bot left a comment

KsenijaS commented Mar 31, 2020

neginraoof commented Apr 2, 2020

KsenijaS commented Apr 7, 2020

houseroad left a comment

houseroad Apr 7, 2020

KsenijaS Apr 7, 2020

neginraoof Apr 7, 2020

KsenijaS Apr 8, 2020

KsenijaS commented Apr 8, 2020

BowenBao left a comment

facebook-github-bot left a comment

houseroad left a comment

facebook-github-bot commented Apr 12, 2020

facebook-github-bot commented Apr 12, 2020

[ONNX] Enable constant folding for Shape #35386

[ONNX] Enable constant folding for Shape #35386

Conversation

KsenijaS commented Mar 25, 2020

dr-ci bot commented Mar 25, 2020 • edited

💊 CircleCI build failures summary and remediations

neginraoof commented Mar 25, 2020

neginraoof left a comment

Choose a reason for hiding this comment

facebook-github-bot left a comment

Choose a reason for hiding this comment

KsenijaS commented Mar 31, 2020

neginraoof commented Apr 2, 2020

KsenijaS commented Apr 7, 2020

houseroad left a comment

Choose a reason for hiding this comment

houseroad Apr 7, 2020

Choose a reason for hiding this comment

KsenijaS Apr 7, 2020

Choose a reason for hiding this comment

neginraoof Apr 7, 2020

Choose a reason for hiding this comment

KsenijaS Apr 8, 2020

Choose a reason for hiding this comment

KsenijaS commented Apr 8, 2020

BowenBao left a comment

Choose a reason for hiding this comment

facebook-github-bot left a comment

Choose a reason for hiding this comment

houseroad left a comment

Choose a reason for hiding this comment

facebook-github-bot commented Apr 12, 2020

facebook-github-bot commented Apr 12, 2020

dr-ci bot commented Mar 25, 2020 •

edited