(4.x) Merge 3.4 by alalek · Pull Request #21340 · opencv/opencv

alalek · 2021-12-24T14:05:21Z

#21306 from aBITnav:patch-1
#21320 from catree:solvePnP_doc_page
#21321 from alalek:dnn_test_decompose_dynamic_axes
#21322 from alalek:dnn_catch_errors
#21323 from alalek:dnn_do_not_rebuilt_network_in_setInput
#21325 from APrigarina:fix_asift_sample
#21327 from alalek:imgcodecs_openexr_runtime_disabled
#21329 from alalek:cmake_openexr_find_package
#21330 from alalek:fix_highgui_gtk_mouse_callbacks
#21331 from alalek:issue_21289
#21335 from alalek:dnn_onnx_dump_input_output
#21336 from alalek:dnn_pooling_check_array_indexes
#21341 from alalek:issue_20930_3.4

Previous "Merge 3.4": #21317

Details

buildworker:Win64 OpenCL=windows-2
Xbuildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=powerpc64le
Xbuild_image:Custom=ubuntu-openvino-2019r3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.4.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2021.1.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.2.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.1:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.2:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=ubuntu-vulkan:16.04
Xbuildworker:Custom=linux-4
Xbuild_image:Custom=fedora:28
Xbuild_image:Custom=ubuntu-cuda:16.04
Xbuild_image:Custom=ubuntu-clang:18.04
Xbuild_image:Custom=ubuntu:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=mips64el

Xbuild_image:Custom Mac=openvino-2019r3.0
Xbuild_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
Xbuild_image:Custom Mac=openvino-2021.4.0
Xbuild_image:Custom Mac=openvino-2021.4.1
build_image:Custom Mac=openvino-2021.4.2
test_modules:Custom Mac=dnn,gapi,python2,python3,java

Xbuild_image:Custom Win=openvino-2019r3.0
Xbuild_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
Xbuild_image:Custom Win=openvino-2021.4.0
Xbuild_image:Custom Win=openvino-2021.4.1
build_image:Custom Win=openvino-2021.4.2
buildworker:Custom Win=windows-3
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules:Custom Win=dnn,gapi,python2,python3,java
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF
Xbuild_image:Custom Win=msvs2017
Xbuild_image:Custom Win=msvs2019

- this doesn't make sense in case of multiple inputs

- builtin OpenEXR source code is outdated - external OpenEXR distributions are allowed

…c_axes

…k_in_setInput

…lbacks

- to avoid out of buffer access

…ndexes

…_disabled

alalek · 2021-12-24T14:09:29Z

modules/dnn/test/test_onnx_importer.cpp

+// FIXIT disabled due to non-standard ONNX model domains, need to add ONNX domains support
+// Example:
+// DNN/ONNX: unsupported opset[1]: domain='com.microsoft.experimental' version=1
+// DNN/ONNX: unsupported opset[2]: domain='ai.onnx.preview.training' version=1
+// DNN/ONNX: unsupported opset[3]: domain='com.microsoft.nchwc' version=1
+// DNN/ONNX: unsupported opset[4]: domain='com.microsoft.mlfeaturizers' version=1
+// DNN/ONNX: unsupported opset[5]: domain='ai.onnx.ml' version=2
+// DNN/ONNX: unsupported opset[6]: domain='com.microsoft' version=1
+// DNN/ONNX: unsupported opset[7]: domain='ai.onnx.training' version=1
+#if 0


Need to properly implement ONNX domains support for quantized networks.

/cc @vpisarev

relates #20535

alalek · 2021-12-24T15:35:55Z

Face detector (from #20422) was imported through bugs. New checks for unsupported cases emits these errors:

DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]

[ RUN      ] Objdetect_face_detection.regression
[ INFO:0@12.252] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (721) populateNet DNN/ONNX: loading ONNX v6 model produced by 'pytorch':1.9. Number of nodes = 111, initializers = 92, inputs = 1, outputs = 3
[ INFO:0@12.252] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (654) parseOperatorSet DNN/ONNX: ONNX opset version = 9
[ERROR:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (2479) parseShape DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]
[ERROR:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (872) handleNode DNN/ONNX: ERROR during processing node with 1 inputs and 1 outputs: [Shape]:(265)
[ INFO:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (876) handleNode     Input[0] = '243'
[ INFO:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (880) handleNode     Output[0] = '265'
unknown file: Failure
C++ exception with description "OpenCV(4.5.5-pre) /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp:891: error: (-2:Unspecified error) in function 'handleNode'
> Node [Shape]:(265) parse error: OpenCV(4.5.5-pre) /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp:2480: error: (-215:Assertion failed) !isDynamicShape in function 'parseShape'
> " thrown in the test body.

/cc @fengyuentau @vpisarev

Workaround with disabling this check is ugly as it passes incorrect importing problems to the next layers:

DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 250 [ 0 0 0 34 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 257 [ 0 0 0 34 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 264 [ 0 0 0 51 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 297 [ 0 -4 ]

Is it OK?

alalek · 2021-12-24T17:54:54Z

modules/dnn/src/onnx/onnx_importer.cpp

+    if (isDynamicShape)
+    {
+        CV_LOG_ERROR(NULL, "DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input " << toString(inpShape, node_proto.input(0)));
+        // FIXIT repair assertion
+        // Disabled to pass face detector tests from #20422
+        // CV_Assert(!isDynamicShape);  // not supported
+    }


Error trigger is disabled.

alalek · 2021-12-24T17:56:01Z

👍

fengyuentau · 2022-01-04T08:45:23Z

Face detector (from #20422) was imported through bugs. New checks for unsupported cases emits these errors:

DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]

[ RUN      ] Objdetect_face_detection.regression
[ INFO:0@12.252] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (721) populateNet DNN/ONNX: loading ONNX v6 model produced by 'pytorch':1.9. Number of nodes = 111, initializers = 92, inputs = 1, outputs = 3
[ INFO:0@12.252] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (654) parseOperatorSet DNN/ONNX: ONNX opset version = 9
[ERROR:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (2479) parseShape DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]
[ERROR:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (872) handleNode DNN/ONNX: ERROR during processing node with 1 inputs and 1 outputs: [Shape]:(265)
[ INFO:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (876) handleNode     Input[0] = '243'
[ INFO:0@12.256] global /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp (880) handleNode     Output[0] = '265'
unknown file: Failure
C++ exception with description "OpenCV(4.5.5-pre) /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp:891: error: (-2:Unspecified error) in function 'handleNode'
> Node [Shape]:(265) parse error: OpenCV(4.5.5-pre) /build/precommit_linux64/4.x/opencv/modules/dnn/src/onnx/onnx_importer.cpp:2480: error: (-215:Assertion failed) !isDynamicShape in function 'parseShape'
> " thrown in the test body.

/cc @fengyuentau @vpisarev

Workaround with disabling this check is ugly as it passes incorrect importing problems to the next layers:

DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 243 [ 0 0 0 51 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 250 [ 0 0 0 34 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 257 [ 0 0 0 34 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 264 [ 0 0 0 51 ]
DNN/ONNX(Shape): dynamic 'zero' shapes are not supported, input 297 [ 0 -4 ]

Is it OK?

Problem is confirmed. Working on it.

alalek and others added 26 commits December 23, 2021 00:47

dnn(test): decompose 'DynamicAxes' test

6e299b5

dnn: do not try to rebuilt network during setInput()

c408157

- this doesn't make sense in case of multiple inputs

prevent index error in find_obj sample

ada16fd

imgcodecs: disable OpenEXR in runtime for 3rdparty source code

381d9ba

- builtin OpenEXR source code is outdated - external OpenEXR distributions are allowed

highgui(gtk): fix onmouse event flags

85d4e56

highgui(gtk): repair scroll events

36bd2a6

Merge pull request opencv#21321 from alalek:dnn_test_decompose_dynami…

9f17c62

…c_axes

dnn: improve debug messages, add ONNX opset version

cc02fcd

dnn(onnx): fix Resize inputs handling

51e65db

dnn(onnx): emit error in Shape for dynamic input

88a18c8

Merge pull request opencv#21323 from alalek:dnn_do_not_rebuilt_networ…

011ed38

…k_in_setInput

Summarize PnP pose computation on a single separate page.

032a61b

Merge pull request opencv#21322 from alalek:dnn_catch_errors

f558944

Merge pull request opencv#21330 from alalek:fix_highgui_gtk_mouse_cal…

b12c2c7

…lbacks

Merge pull request opencv#21331 from alalek:issue_21289

f11ab4c

dnn(onnx): debug dump of inputs/outputs/initializers in importer

ed4becf

dnn: add checks in pooling layer implementation

6385511

- to avoid out of buffer access

cmake: use find_package(OpenEXR) to support OpenEXR 3+

f43fec7

Fix: Grammatical mistake

d086ee1

Merge pull request opencv#21325 from APrigarina:fix_asift_sample

abc9e98

Merge pull request opencv#21335 from alalek:dnn_onnx_dump_input_output

bde955f

Merge pull request opencv#21336 from alalek:dnn_pooling_check_array_i…

cdd4354

…ndexes

Merge pull request opencv#21306 from aBITnav:patch-1

8d3f0d0

Merge pull request opencv#21320 from catree:solvePnP_doc_page

3a8316a

Merge pull request opencv#21327 from alalek:imgcodecs_openexr_runtime…

90e3692

…_disabled

Merge pull request opencv#21329 from alalek:cmake_openexr_find_package

92651d2

alalek commented Dec 24, 2021

View reviewed changes

python: use '((x,y), (w,h), angle)' in std::vector<RotatedRect>

cdfa8a6

Merge pull request opencv#21341 from alalek:issue_20930_3.4

655d381

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

217fea9

alalek commented Dec 24, 2021

View reviewed changes

alalek merged commit 217fea9 into opencv:4.x Dec 24, 2021

This was referenced Dec 25, 2021

dnn(onnx): handle non-default ONNX domains #21343

Merged

(4.x) Merge 3.4 #21365

Merged

fengyuentau mentioned this pull request Mar 31, 2022

Replace default YuNet with the one of fixed input shape to avoid 'parseShape' error opencv/opencv_zoo#44

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

(4.x) Merge 3.4#21340

(4.x) Merge 3.4#21340
alalek merged 29 commits intoopencv:4.xfrom
alalek:merge-3.4

alalek commented Dec 24, 2021 •

edited

Loading

Uh oh!

alalek Dec 24, 2021 •

edited

Loading

Uh oh!

alalek commented Dec 24, 2021

Uh oh!

alalek Dec 24, 2021

Uh oh!

alalek commented Dec 24, 2021

Uh oh!

fengyuentau commented Jan 4, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

alalek commented Dec 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alalek Dec 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alalek commented Dec 24, 2021

Uh oh!

alalek Dec 24, 2021

Choose a reason for hiding this comment

Uh oh!

alalek commented Dec 24, 2021

Uh oh!

fengyuentau commented Jan 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

alalek commented Dec 24, 2021 •

edited

Loading

alalek Dec 24, 2021 •

edited

Loading

fengyuentau commented Jan 4, 2022 •

edited

Loading