Skip to content

Fixed bug in ONNX Mul op#18353

Merged
alalek merged 2 commits intoopencv:3.4from
l-bat:issue_18350
Sep 18, 2020
Merged

Fixed bug in ONNX Mul op#18353
alalek merged 2 commits intoopencv:3.4from
l-bat:issue_18350

Conversation

@l-bat
Copy link
Copy Markdown
Contributor

@l-bat l-bat commented Sep 17, 2020

merge with extra: opencv/opencv_extra#808
resolves: #18350

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom,Custom Win,Custom Mac
build_image:Custom=ubuntu-openvino-2020.4.0:16.04
build_image:Custom Win=openvino-2020.3.0
build_image:Custom Mac=openvino-2020.3.0

test_modules:Custom=dnn,python2,python3,java
test_modules:Custom Win=dnn,python2,python3,java
test_modules:Custom Mac=dnn,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@l-bat l-bat added this to the 3.4.12 milestone Sep 17, 2020
@l-bat l-bat linked an issue Sep 17, 2020 that may be closed by this pull request
dnn: Inconsistent shape for ConcatLayer in function 'getMemoryShapes' from onnx #18350
Closed
4 tasks
@l-bat l-bat requested a review from dkurt September 17, 2020 11:49
alalek
alalek reviewed Sep 17, 2020
View reviewed changes
modules/dnn/test/test_onnx_importer.cpp
{
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
testONNXModels("scale");
Copy link
Copy Markdown
Member

@alalek alalek Sep 17, 2020

Choose a reason for hiding this comment

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

Please fix indentation

modules/dnn/src/onnx/onnx_importer.cpp Outdated
{
std::string secondInp = node_proto.input(1);
node_proto.set_input(1, node_proto.input(0));
node_proto.set_input(0, secondInp);
Copy link
Copy Markdown
Member

@alalek alalek Sep 17, 2020

Choose a reason for hiding this comment

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

node_proto.set_input()

Not sure that it is a good idea to hack original input structures.

It is better to create some own intermediate object (or create methods to fill operations instead of 1000 LOC function).

dkurt
dkurt approved these changes Sep 17, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@dkurt dkurt left a comment

Choose a reason for hiding this comment

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

👍

@alalek alalek merged commit ebb5289 into opencv:3.4 Sep 18, 2020
@alalek alalek mentioned this pull request Sep 19, 2020
Merged
@l-bat l-bat mentioned this pull request Sep 21, 2020
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek left review comments

@dkurt dkurt dkurt approved these changes

Assignees

@dkurt dkurt

Labels

bug category: dnn

Projects

None yet

Milestone

3.4.12

Development

Successfully merging this pull request may close these issues.

dnn: Inconsistent shape for ConcatLayer in function 'getMemoryShapes' from onnx

3 participants

@l-bat @alalek @dkurt