Skip to content
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

(5.x) Merge 4.x #1066

Merged
merged 37 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
becfa7f
add test for GEMM with bias
WanliZhong Dec 29, 2022
9481b5a
Merge pull request #1033 from WanliZhong:gemm_cuda
alalek Feb 8, 2023
9beaefb
Merge pull request #1044 from fengyuentau:add_gelu
fengyuentau Feb 10, 2023
3563e94
Merge pull request #1042 from dkurt:dnn_tflite
dkurt Feb 13, 2023
08fb97a
Specify TFLite models version
dkurt Feb 14, 2023
ba9ad57
Merge pull request #1045 from dkurt:specify_tflite_gen
alalek Feb 14, 2023
ea431f0
Test data for mirrored qr codes
Feb 23, 2023
0dfa4e5
add model: yunetv2
Wwupup Dec 23, 2022
515e0a0
Merge pull request #1046 from genciberisha:bug/issue-23249_detected_b…
asmorkalov Mar 21, 2023
0dce4d0
Test data for clip-vit-base-patch32
dkurt Mar 27, 2023
c97eaad
Merge pull request #1049 from dkurt:onnx_fixes
asmorkalov Apr 2, 2023
47f7f61
bmp decoder add test image with less than 8 bits mask
tantei3 Apr 2, 2023
6be4481
Merge pull request #1050 from tantei3:bmp_fix
asmorkalov Apr 6, 2023
ba08f71
Merge pull request #1038 from Wwupup:yunetv2
asmorkalov Apr 6, 2023
b1d009f
add new test case for split of opset 13
zihaomu Apr 11, 2023
389a440
cudacodec: add full coded colour range test file
cudawarped Mar 2, 2023
3d708ec
Download TFLite EfficientDet INT8
dkurt Mar 25, 2023
7652263
Merge pull request #1053 from zihaomu:onnx_opset13_split
asmorkalov Apr 14, 2023
2521c4d
Merge pull request #1051 from cudawarped:cudacodec_fix_colour_conversion
asmorkalov Apr 17, 2023
4f4eb3a
Merge pull request #1057 from Abdurrahheem:additional_lstm_tests
Abdurrahheem Apr 20, 2023
481b883
add 1x1_depthwise
zihaomu Apr 21, 2023
37e49e6
Merge pull request #1058 from zihaomu:issue_23465
alalek Apr 22, 2023
e062c6d
Merge pull request #1048 from dkurt:dnn_tflite_quant
asmorkalov Apr 24, 2023
a6e90f1
add scale factor to DB demo.
zihaomu Apr 25, 2023
8c7c046
Add testcase for WeChat QR Code bug (#1061)
Konano Apr 26, 2023
6e7d3c4
postprocess_model() shifted above to fix the issue 23508 in opencv/op…
appsinfinity868 Apr 22, 2023
890703d
Merge pull request #1059 from appsinfinity868:issue_23508_opencv_repo…
asmorkalov Apr 27, 2023
62ebe5a
added test data and model for lstm wihout hidden states initialization
Abdurrahheem Apr 25, 2023
ffa2587
Merge pull request #1062 from Abdurrahheem:tests_lstm_init_no_hidden_…
asmorkalov Apr 27, 2023
8b8ac07
Merge pull request #1011 from zihaomu:add_std2DB_API
alalek May 1, 2023
955d736
add broadcast where node
zihaomu May 5, 2023
e23a980
Merge pull request #1054 from zihaomu:add_onnx_where
asmorkalov May 5, 2023
e478135
working test generator
Abdurrahheem May 15, 2023
f06b101
added test data from LSTM layout feature
Abdurrahheem May 15, 2023
cae14dd
Merge pull request #1063 from Abdurrahheem:lstm_layout_attribute
asmorkalov May 17, 2023
847035e
Merge pull request #1064 from fengyuentau:qlinearsoftmax
fengyuentau May 25, 2023
dd7957a
Merge branch '4.x' into 5.x-merge-4.x-origin
asmorkalov May 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion testdata/cv/dnn_face/detection/cascades_labels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ er.png
141 256 32 42 150 273 165 272 159 281 153 288 165 287
68 127 31 38 78 140 92 140 86 147 80 155 91 154
image_00000000_0.png
1
2
317 160 14 16 321 166 327 167 324 169 322 172 326 172
236 181 10 12 238 186 244 186 240 188 238 190 243 190
karen-and-rob.png
2
191 30 47 61 206 54 227 55 217 66 206 75 225 76
Expand Down
Binary file added testdata/cv/qrcode/flipped/flipped_1.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/flipped/flipped_2.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/issue_3478.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 41 additions & 5 deletions testdata/dnn/download_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -942,11 +942,6 @@ def get_confirm_token(response): # in case of large files
url='https://drive.google.com/uc?export=dowload&id=19YWhArrNccaoSza0CfkXlA8im4-lAGsR',
sha='1b4dd21a6baa5e3523156776970895bd3db6960a',
filename='onnx/models/DB_TD500_resnet50.onnx'),
Model(
name='YuNet',
url='https://github.com/ShiqiYu/libfacedetection.train/raw/1688402dbd9b9fc4a3a6793810f558b7407ff384/tasks/task1/onnx/yunet_120x160.onnx',
sha='dfe691ae0c8e38d39d1a437e3f7e5fda7b256bdd',
filename='onnx/models/yunet-202202.onnx'),
Model(
name='face_recognizer_fast',
url='https://drive.google.com/uc?export=dowload&id=1ClK9WiB492c5OZFKveF3XiHCejoOxINW',
Expand Down Expand Up @@ -1020,6 +1015,47 @@ def get_confirm_token(response): # in case of large files
url='https://raw.githubusercontent.com/zihaomu/opencv_extra_data_backup/main/NanoTrackV2/models/nanotrack_head_sim_v2.onnx',
sha='39f168489671700cf739e402dfc67d41ce648aef',
filename='onnx/models/nanotrack_head_sim_v2.onnx'),
Model(
name='Face Mesh (TFLite)',
url='https://storage.googleapis.com/mediapipe-assets/face_landmark.tflite?generation=1668295060280094',
sha='eb01d1d88c833aaea64c880506da72e4a4f43154',
filename='tflite/face_landmark.tflite'),
Model(
name='Face Detection (TFLite)',
url='https://storage.googleapis.com/mediapipe-assets/face_detection_short_range.tflite?generation=1661875748538815',
sha='e8f749fafc23bb88daac85bc9f7e0698436f29a0',
filename='tflite/face_detection_short_range.tflite'),
Model(
name='Selfie Segmentation (TFLite)',
url='https://storage.googleapis.com/mediapipe-assets/selfie_segmentation.tflite?generation=1661875931201364',
sha='8d497f51bd678fa5fb95c3871be72eb5d722b831',
filename='tflite/selfie_segmentation.tflite'),
Model(
name='Hair Segmentation (TFLite)',
url='https://storage.googleapis.com/mediapipe-assets/hair_segmentation.tflite?generation=1661875756623461',
sha='bba28400dfc264b1ed7ee95df718fada1879644d',
filename='tflite/hair_segmentation.tflite'),
Model(
name='YuNet',
url='https://github.com/ShiqiYu/libfacedetection.train/raw/02246e79b1e976c83d1e135a85e0628120c93769/onnx/yunet_s_640_640.onnx',
sha='acbe4b5976ade60c4b866a30d0720d71589c8bbc',
filename='onnx/models/yunet-202303.onnx'),
Model(
name='EfficientDet (TFLite)',
url='https://storage.googleapis.com/mediapipe-assets/coco_efficientdet_lite0_v1_1.0_quant_2021_09_06.tflite?generation=1661875692679200',
sha='200217d746d58e68028a64ad0472631060e6affb',
filename='tflite/coco_efficientdet_lite0_v1_1.0_quant_2021_09_06.tflite'),
Model(
name='PP_OCRv3_DB_text_det (ONNX)',
url='https://github.com/zihaomu/zihaomu/files/9740907/PP_OCRv3_DB_text_det.tar.gz',
sha='a2a008361d785fbe32a22ec2106621ecd1576f48',
filename='PP_OCRv3_DB_text_det.tar.gz'),
Model(
name='PP_OCRv3_DB_text_det (ONNX)',
archive='PP_OCRv3_DB_text_det.tar.gz',
member='PP_OCRv3_DB_text_det/PP_OCRv3_DB_text_det.onnx',
sha='f541f0b448561c7ad919ba9fffa72ff105062934',
filename='onnx/models/PP_OCRv3_DB_text_det.onnx'),
]

# Note: models will be downloaded to current working directory
Expand Down
Binary file added testdata/dnn/onnx/data/input_clip-vit-base-head.npy
Binary file not shown.
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_gelu.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_gelu_approximation.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_gemm_vector_bias.npy
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 added testdata/dnn/onnx/data/input_lstm_init_h0_c0_0.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_init_h0_c0_1.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_init_h0_c0_2.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_0_0.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_0_1.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_0_2.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_1_0.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_1_1.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_lstm_layout_1_2.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_qlinearsoftmax_v11.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_qlinearsoftmax_v13.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_split_5.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_split_6.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/input_where_layer.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_clip-vit-base-head.npy
Binary file not shown.
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_gelu.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_gelu_approximation.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_gemm_vector_bias.npy
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 added testdata/dnn/onnx/data/output_lstm_init_h0_c0.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_lstm_layout_0.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_lstm_layout_1.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_qlinearsoftmax_v11.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_qlinearsoftmax_v13.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_split_5.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_split_6.npy
Binary file not shown.
Binary file added testdata/dnn/onnx/data/output_where_layer.npy
Binary file not shown.
Loading