Skip to content

(5.x) Merge 4.x #949

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

Merged
merged 35 commits into from
Dec 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
97f8a2d
add tests for Ceil, Floor, Log, Round, Sqrt, Not, Equal, Less, Greate…
rogday Oct 14, 2021
cede775
Merge pull request #864 from MaximMilashchenko:Audio
MaximMilashchenko Oct 20, 2021
1a5993e
Merge pull request #921 from rogday:simple_layers
alalek Oct 20, 2021
005655e
32bit rgb bmp file should not copy data as rgba
Oct 21, 2021
1079dca
Merge pull request #927 from Harvey-Huang:32bit_rgb
alalek Oct 21, 2021
9313c1b
Merge pull request #925 from Harvey-Huang:master
Harvey-Huang Oct 22, 2021
b4b84b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Oct 23, 2021
14b350b
fixed bug: opencv read tif file convert Palette color image as graysc…
Oct 27, 2021
e2dd637
Merge pull request #931 from Harvey-Huang:master
alalek Oct 27, 2021
eb99255
add test data for QR detect fix
APrigarina Nov 3, 2021
db89432
Merge pull request #933 from APrigarina:add_test_qrdetect_fix
alalek Nov 3, 2021
2f4ae84
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Nov 5, 2021
cbc4d1b
Merge pull request #932 from Crayon-new:tf_pooling
Crayon-new Nov 9, 2021
6a712be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Nov 13, 2021
127e646
Merge pull request #807 from ZhengQiushi:my_3.4
ZhengQiushi Nov 15, 2021
0122c2f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Nov 20, 2021
cb19926
add test data for amtmul and batchmatmul
Crayon-new Nov 30, 2021
e302311
add test data for ArgMin and ArgMax
rogday Dec 6, 2021
934397b
Merge pull request #941 from rogday:argminmax_dnn
alalek Dec 7, 2021
c5e6718
Merge pull request #940 from pccvlab:MatMul_with_two_inputs
alalek Dec 10, 2021
3087438
add testdata for square
cqn2219076254 Dec 13, 2021
1171cbc
Test data for new pre-filtering in cuda::StereoBM.
asmorkalov Dec 13, 2021
d72416e
Merge pull request #944 from asmorkalov:as/stereo_prefilter
alalek Dec 14, 2021
01e8a30
Merge pull request #937 from rogday:onnx_tests
rogday Dec 14, 2021
e235126
Merge pull request #943 from pccvlab:square
alalek Dec 15, 2021
4b21e9d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Dec 15, 2021
267aafe
add test data for tf_Argmin and tf_Argmax
Crayon-new Dec 16, 2021
1304891
Merge pull request #946 from pccvlab:tf_Arg
alalek Dec 16, 2021
b1ce373
Regression test data for cuda::stereoBM with uniqueness check.
asmorkalov Oct 15, 2021
5002d3d
Merge pull request #924 from asmorkalov:as/stereo_bm_uniqueness_ratio
alalek Dec 20, 2021
b543e77
add test data for Div
rogday Dec 20, 2021
b2e7c8a
Merge pull request #947 from rogday:div_fix
alalek Dec 21, 2021
5a8a68e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Dec 22, 2021
37294e3
Merge pull request #831 from mpashchenkov:mp/oe-add-gapi
Dec 23, 2021
807e3ed
Merge branch 4.x
alalek Dec 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 9 additions & 0 deletions testdata/cv/qrcode/decode_encode/capacity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"version_ecc_capacity": [
{ "version_level": "1", "ecc_level": [ 19, 16, 13, 9 ] },
{ "version_level": "2", "ecc_level": [ 34, 28, 22, 16 ] },
{ "version_level": "3", "ecc_level": [ 55, 44, 34, 26 ] },
{ "version_level": "4", "ecc_level": [ 80, 64, 48, 36 ] },
{ "version_level": "5", "ecc_level": [ 108, 86, 62, 46 ] }
]
}
7 changes: 7 additions & 0 deletions testdata/cv/qrcode/decode_encode/symbol_sets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"symbols_sets": [
{ "mode": 1, "symbols_set":"0123456789" },
{ "mode": 2, "symbols_set":"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:" },
{ "mode": 4, "symbols_set":"!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}"}
]
}
28 changes: 28 additions & 0 deletions testdata/cv/qrcode/encode/dataset_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"test_images": [
{ "image_name": "version1_mode1.png", "info": "12345678" },
{ "image_name": "version1_mode2.png", "info": "ADSWE22223DFAS" },
{ "image_name": "version1_mode4.png", "info": "[email protected]" },
{ "image_name": "version1_mode7.png", "info": "дЛцмЩрёВ" },
{ "image_name": "version2_mode1.png",
"info": "91172339675319066800542009332763324407887566419283892024943292" },
{ "image_name": "version2_mode2.png",
"info": "000NATASHA WE DROPPED EVERYTHING000" },
{ "image_name": "version2_mode4.png",
"info": "aQqdqecq%hre3?JXcDxx#PqLG_29G*R^" },
{ "image_name": "version2_mode7.png",
"info": "42ЁдЬзьКЕ,ыЙкя" },
{ "image_name": "version3_mode2.png",
"info": "OPENCV OSPP 2020 QR-CODE ENCODER. TEST ENCODER QR VERSION 3 MODE ALPHANUMERIC" },
{ "image_name": "version3_mode4.png",
"info": "https://github.com/opencv/opencv/tree/master/modules/" },
{ "image_name": "version3_mode7.png",
"info": "ПЖлШУ.ьёвщЛДо8феп7ъА" },
{ "image_name": "version4_mode4.png",
"info": "aQqdqecq%hre3?JXcDxx#PqLG_29G*R^&f?bD6C5qam+Y_MUGaSmS5&fh_Q&bCZz" },
{ "image_name": "version4_mode7.png",
"info": "и?ЮпЙДЁХслМЖЬ4ыпЛД,нЕу5РВя8ЦзцП.6б" },
{ "image_name": "version5_mode7.png",
"info": "957БщпоХСЛдЦешхЯ1ЕШТ;П4!сёИгфла.НЫКУЗВЧ,уймЁМ" }
]
}
Binary file added testdata/cv/qrcode/encode/version1_mode1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version1_mode2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version1_mode4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version1_mode7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version2_mode1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version2_mode2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version2_mode4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version2_mode7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version3_mode2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version3_mode4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version3_mode7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version4_mode4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version4_mode7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/encode/version5_mode7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testdata/cv/qrcode/qrcode_near_the_end.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions testdata/dnn/onnx/conformance/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Original repo: https://github.com/onnx/onnx/tree/bc4c4c48f664d4d08cabd30a57063588d7537408/onnx/backend/test/data/node
License (Apache 2): https://github.com/onnx/onnx/blob/master/LICENSE
13 changes: 13 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_abs/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
 backend-test:I

xy"Abstest_absZ
x



b
y



B
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BxJ�x��?h��>��z?�j@$ �?�.z��8s?b��hdӽ�9�>(�>�%�?^�B?�0�= B�>]ת>�=�?R�iJ�>�Z�/d#��S'?�K]?��=��C@�(��Hm;= �?�2�?��?��>���>�Ec������!��� >*z�?��?�Oƾmǚ��6��&õ�gڿ��?�x�FKྙ[��� G?4�ο��Y�L=e��> �����k��QN�>.:�=�ݚ>�b"�6���
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ByJ�x��?h��>��z?�j@$ �?�.z?�8s?b�>hd�=�9�>(�>�%�?^�B?�0�= B�>]ת>�=�?R>iJ�>�Z?/d#@�S'?�K]?��=?�C@�(�?Hm;= �?>2�?��?��>���>�Ec?���?�!�>� >*z�?��?�O�>mǚ>�6�?&õ?g�?��?�x?FK�>�[�?� G?4��?��Y>L=e?�> �?��?k��<QN�>.:�=�ݚ>�b"?6��>
13 changes: 13 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_acos/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
 backend-test:K

xy"Acos test_acosZ
x



b
y



B
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BxJ�  ?�7?�N?w} ?H��>QY%?n �><Kd?��v?rR�>~�J?�e?^k?��l?Z{�=�p�=��<�&U?H5G?�^?��z?��L?G�>��G?�9�=��#?4�>��q?ڗ?�N�>�s�>.4F?���>�?�<\?N�?c�?y�q?Ƌ.?k�>���>��2?��v=9�*?�+?�nW>A>��>L8�>j�?a��>}?���=��U>R.%>2'?p��>I��>�Jz>
Expand Down
Binary file not shown.
11 changes: 11 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_acos_example/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
 backend-test:C

xy"Acostest_acos_exampleZ
x


b
y


B
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ByJ �
@��?�
�?
14 changes: 14 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_acosh/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
 backend-test:M

xy"Acosh
test_acoshZ
x



b
y



B
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ByJ���@D{,@�#@��@�8@��&@v�@��8@[m=@ @�22@*�@�@>;@���?ZT�?/?�5@�81@Վ7@�P>@&�2@��@�d1@\<�?�N&@}2�?�G<@�6@�@���?��0@�@��@��?j[$@��#@sK$@=9<@o�)@��@��@+@V�?5�(@a�(@յ�?(ճ?�V@�k@��@\@��>@�^�?��?O��?�n'@��?<<@YZ�?
Expand Down
11 changes: 11 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_acosh_example/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
 backend-test:E

xy"Acoshtest_acosh_exampleZ
x


b
y


B
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BRJ���=
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX_newJ�b�?
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH_newJ@�?@
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BRJ���=
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX1_newJ�b�?
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX2_newJ@��?7@
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH1_newJ@�?@
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH2_newJ��@��A
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BRJ���=
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BXJ���?333@
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BVJ���?fff@
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BHJ���=���=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX_newJd4�?\N*@
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BV_newJ1��?��R@
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH_newJ9�M?��@
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BRJ���=
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX1_newJ�VB?
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BX2_newJd� ?6��?
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BV1_newJp��?
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH1_newJ�?
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BH2_newJZ�?;�A
19 changes: 19 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_add/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
 backend-test:i

x
ysum"Addtest_addZ
x



Z
y



b
sum



B
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BxJ�x��?h��>��z?�j@$ �?�.z��8s?b��hdӽ�9�>(�>�%�?^�B?�0�= B�>]ת>�=�?R�iJ�>�Z�/d#��S'?�K]?��=��C@�(��Hm;= �?�2�?��?��>���>�Ec������!��� >*z�?��?�Oƾmǚ��6��&õ�gڿ��?�x�FKྙ[��� G?4�ο��Y�L=e��> �����k��QN�>.:�=�ݚ>�b"�6���
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ByJ�^&,�Z��[*P���ܿ3�5>;�;W�п���>�Dh���T=��:?>�ב?������>�O/���^�~/�Ѓ���f=�#����f?Ok�>��Ŀ �?��?@�?7>8�l��F��?5mξy�? FU>z?�u�>��4?G,<h��?>�>���> �?^���A���b*x?�(�����?��Ӿ3Y?��"�?���?, �?��g?Iy\�}�?�7���mM?r?���N4?�l?
Expand Down
Binary file not shown.
18 changes: 18 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_add_bcast/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
 backend-test:g

x
ysum"Addtest_add_bcastZ
x



Z
y


b
sum



B
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BxJ�x��?h��>��z?�j@$ �?�.z��8s?b��hdӽ�9�>(�>�%�?^�B?�0�= B�>]ת>�=�?R�iJ�>�Z�/d#��S'?�K]?��=��C@�(��Hm;= �?�2�?��?��>���>�Ec������!��� >*z�?��?�Oƾmǚ��6��&õ�gڿ��?�x�FKྙ[��� G?4�ο��Y�L=e��> �����k��QN�>.:�=�ݚ>�b"�6���
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ByJ^&,�Z��[*P���ܿ3�5>
Binary file not shown.
19 changes: 19 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_add_uint8/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
 backend-test:o

x
ysum"Addtest_add_uint8Z
x



Z
y



b
sum



B
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ByJ<


      
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BsumJ<&, $!"' ,$'"
17 changes: 17 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_and2d/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
 backend-test:_

x
yand"And
test_and2dZ
x
 

Z
y
 

b
and
 

B
Binary file not shown.
Binary file not shown.
Binary file not shown.
20 changes: 20 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_and3d/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
 backend-test:k

x
yand"And
test_and3dZ
x
 


Z
y
 


b
and
 


B
Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 23 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_and4d/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
 backend-test:w

x
yand"And
test_and4dZ
x
 



Z
y
 



b
and
 



B
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 18 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_and_bcast3v1d/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
 backend-test:k

x
yand"Andtest_and_bcast3v1dZ
x
 


Z
y

 
b
and
 


B
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 18 additions & 0 deletions testdata/dnn/onnx/conformance/node/test_and_bcast3v2d/model.onnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
 backend-test:o

x
yand"Andtest_and_bcast3v2dZ
x
 


Z
y
 

b
and
 


B
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading