Improve reshapeability of models with eltwise nodes influencing shapes by rkazants · Pull Request #2767 · openvinotoolkit/openvino

rkazants · 2020-10-22T10:29:15Z

Description: Reshape node always needs to be inserted in order to preserve ShapeOf nodes (reshapability of a model) that can potentially be above elementwise node.

Refactor EltwiseInputReshape_test and EltwiseInputNormalization_test since the logic of maintaining reshape for eltwise has been changed.
Merge EltwiseInputReshape and EltwiseInputNormalization transformations and corresponding tests
Refactor EltwiseInputReshape transformation to move to new Graph API.
Remove Unsqueeze from fused_op in nGraph

JIRA: 39665

Code:

Comments
Code style (PEP8)
Transformation generates reshape-able IR
Transformation preserves original framework node names

Validation:

Unit tests
Framework operation tests, N/A
Transformation tests
e2e model test with an update of ./tests/e2e_oss/utils/reshape_utils.py
Model Optimizer IR Reader check

Documentation:

Supported frameworks operations list, N/A
Supported public models list, N/A
New operations specification, N/A
Guide on how to convert the public model, N/A
User guide update, N/A

Signed-off-by: Roman Kazantsev roman.kazantsev@intel.com

model-optimizer/extensions/middle/EltwiseInputReshape.py

model-optimizer/mo/utils/shape.py

model-optimizer/extensions/middle/EltwiseInputReshape.py

rkazants · 2020-11-06T06:58:15Z

Now I anticipate to get opencv/opencv#18741 merged to make pre-commit green.

ilyachur

nGraph part LGTM

ngraph/core/include/ngraph/op/unsqueeze.hpp

Reshape node always needs to be inserted in order to preserve ShapeOf nodes (reshapability of a model) that can potentially be above elementwise node. Refactor EltwiseInputReshape_test and EltwiseInputNormalization_test since the logic of maintaining reshape for eltwise has been changed. Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

model-optimizer/extensions/middle/EltwiseInputReshape.py

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

lazarevevgeny

In general, code looks good, but some improvements should be applied

model-optimizer/extensions/middle/EltwiseInputReshape.py

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

openvinotoolkit#2767) * Fix ElementwiseInputReshape transformation Reshape node always needs to be inserted in order to preserve ShapeOf nodes (reshapability of a model) that can potentially be above elementwise node. Refactor EltwiseInputReshape_test and EltwiseInputNormalization_test since the logic of maintaining reshape for eltwise has been changed. Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Merge EltwiseInputNormalization and EltwiseInputReshape transformations Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Remove Unsqueeze from Fused_op Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Fix code after code review #1 Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Fix code after review #2 Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Fix code review #4 Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Perform full normalization based on shapes of all inputs to eltwise Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Refactor much to avoid old API and edges with unsqueeze_dims attribute Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com> * Fix code after review Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

rkazants requested review from a team, e-nugmanova and lazarevevgeny October 22, 2020 10:29

openvino-pushbot added the category: MO Model Optimizer label Oct 22, 2020

rkazants requested review from achetver and vgavrilo October 22, 2020 10:33

lazarevevgeny reviewed Oct 22, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch from 2eaeac1 to 3104514 Compare October 22, 2020 19:23

rkazants requested a review from lazarevevgeny October 22, 2020 19:25

rkazants force-pushed the fix/rkazants/39665 branch from 3104514 to f581c8d Compare October 23, 2020 05:19

lazarevevgeny reviewed Oct 23, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch from f581c8d to 0a7e589 Compare October 26, 2020 11:51

lazarevevgeny reviewed Oct 26, 2020

View reviewed changes

model-optimizer/mo/utils/shape.py Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch from 0a7e589 to 4f0479f Compare October 26, 2020 21:08

rkazants requested a review from lazarevevgeny October 26, 2020 21:10

lazarevevgeny suggested changes Oct 27, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch from 4f0479f to 187fd1c Compare October 29, 2020 10:40

rkazants requested a review from lazarevevgeny October 29, 2020 10:41

lazarevevgeny suggested changes Oct 29, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch from 187fd1c to 6ffbc0c Compare October 29, 2020 15:39

rkazants requested a review from lazarevevgeny October 29, 2020 15:39

rkazants changed the title ~~Fix ElementwiseInputReshape transformation~~ Improve reshapeability of models with eltwise nodes influencing shapes Oct 29, 2020

lazarevevgeny suggested changes Oct 30, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

lazarevevgeny reviewed Oct 30, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch 2 times, most recently from e23c78d to 88486b4 Compare November 2, 2020 10:32

rkazants requested a review from lazarevevgeny November 2, 2020 10:34

rkazants force-pushed the fix/rkazants/39665 branch from 88486b4 to 1a5798d Compare November 2, 2020 10:42

rkazants requested review from a team and ilyachur November 2, 2020 11:58

rkazants mentioned this pull request Nov 6, 2020

Use explicit opset of Unsqueeze from nGraph opencv/opencv#18741

Merged

6 tasks

ilyachur approved these changes Nov 6, 2020

View reviewed changes

ilyachur reviewed Nov 6, 2020

View reviewed changes

ngraph/core/include/ngraph/op/unsqueeze.hpp Show resolved Hide resolved

rkazants force-pushed the fix/rkazants/39665 branch 3 times, most recently from 342dccc to 1e3b311 Compare November 12, 2020 21:57

rkazants added 7 commits November 13, 2020 08:58

Merge EltwiseInputNormalization and EltwiseInputReshape transformations

3103be6

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Remove Unsqueeze from Fused_op

143d610

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Fix code after code review #1

8cdb85d

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Fix code after review #2

3f8d4bc

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Fix code review #4

1eaa548

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

Perform full normalization based on shapes of all inputs to eltwise

5bb7b96

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

rkazants force-pushed the fix/rkazants/39665 branch from 1e3b311 to 5bb7b96 Compare November 13, 2020 06:00

rkazants requested review from lazarevevgeny November 13, 2020 06:04

lazarevevgeny suggested changes Nov 13, 2020

View reviewed changes

Refactor much to avoid old API and edges with unsqueeze_dims attribute

f2df747

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

rkazants requested a review from lazarevevgeny November 13, 2020 10:32

lazarevevgeny reviewed Nov 13, 2020

View reviewed changes

model-optimizer/extensions/middle/EltwiseInputReshape.py Outdated Show resolved Hide resolved

Fix code after review

fd15383

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

rkazants requested a review from lazarevevgeny November 13, 2020 14:21

openvinotoolkit deleted a comment from rkazants Nov 13, 2020

lazarevevgeny approved these changes Nov 13, 2020

View reviewed changes

lazarevevgeny approved these changes Nov 16, 2020

View reviewed changes

lazarevevgeny merged commit 10b18a0 into openvinotoolkit:master Nov 16, 2020

Conversation

rkazants commented Oct 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rkazants commented Nov 6, 2020

Uh oh!

ilyachur left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lazarevevgeny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rkazants commented Oct 22, 2020 •

edited

Loading