Skip to content

Commit dd7957a

Browse files
committed
Merge branch '4.x' into 5.x-merge-4.x-origin
2 parents 0919998 + 847035e commit dd7957a

File tree

78 files changed

+686
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+686
-44
lines changed

testdata/cv/dnn_face/detection/cascades_labels.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ er.png
8888
141 256 32 42 150 273 165 272 159 281 153 288 165 287
8989
68 127 31 38 78 140 92 140 86 147 80 155 91 154
9090
image_00000000_0.png
91-
1
91+
2
9292
317 160 14 16 321 166 327 167 324 169 322 172 326 172
93+
236 181 10 12 238 186 244 186 240 188 238 190 243 190
9394
karen-and-rob.png
9495
2
9596
191 30 47 61 206 54 227 55 217 66 206 75 225 76
2.6 KB
2.94 KB

testdata/cv/qrcode/issue_3478.png

1.18 KB

testdata/dnn/download_models.py

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -942,11 +942,6 @@ def get_confirm_token(response): # in case of large files
942942
url='https://drive.google.com/uc?export=dowload&id=19YWhArrNccaoSza0CfkXlA8im4-lAGsR',
943943
sha='1b4dd21a6baa5e3523156776970895bd3db6960a',
944944
filename='onnx/models/DB_TD500_resnet50.onnx'),
945-
Model(
946-
name='YuNet',
947-
url='https://github.com/ShiqiYu/libfacedetection.train/raw/1688402dbd9b9fc4a3a6793810f558b7407ff384/tasks/task1/onnx/yunet_120x160.onnx',
948-
sha='dfe691ae0c8e38d39d1a437e3f7e5fda7b256bdd',
949-
filename='onnx/models/yunet-202202.onnx'),
950945
Model(
951946
name='face_recognizer_fast',
952947
url='https://drive.google.com/uc?export=dowload&id=1ClK9WiB492c5OZFKveF3XiHCejoOxINW',
@@ -1020,6 +1015,47 @@ def get_confirm_token(response): # in case of large files
10201015
url='https://raw.githubusercontent.com/zihaomu/opencv_extra_data_backup/main/NanoTrackV2/models/nanotrack_head_sim_v2.onnx',
10211016
sha='39f168489671700cf739e402dfc67d41ce648aef',
10221017
filename='onnx/models/nanotrack_head_sim_v2.onnx'),
1018+
Model(
1019+
name='Face Mesh (TFLite)',
1020+
url='https://storage.googleapis.com/mediapipe-assets/face_landmark.tflite?generation=1668295060280094',
1021+
sha='eb01d1d88c833aaea64c880506da72e4a4f43154',
1022+
filename='tflite/face_landmark.tflite'),
1023+
Model(
1024+
name='Face Detection (TFLite)',
1025+
url='https://storage.googleapis.com/mediapipe-assets/face_detection_short_range.tflite?generation=1661875748538815',
1026+
sha='e8f749fafc23bb88daac85bc9f7e0698436f29a0',
1027+
filename='tflite/face_detection_short_range.tflite'),
1028+
Model(
1029+
name='Selfie Segmentation (TFLite)',
1030+
url='https://storage.googleapis.com/mediapipe-assets/selfie_segmentation.tflite?generation=1661875931201364',
1031+
sha='8d497f51bd678fa5fb95c3871be72eb5d722b831',
1032+
filename='tflite/selfie_segmentation.tflite'),
1033+
Model(
1034+
name='Hair Segmentation (TFLite)',
1035+
url='https://storage.googleapis.com/mediapipe-assets/hair_segmentation.tflite?generation=1661875756623461',
1036+
sha='bba28400dfc264b1ed7ee95df718fada1879644d',
1037+
filename='tflite/hair_segmentation.tflite'),
1038+
Model(
1039+
name='YuNet',
1040+
url='https://github.com/ShiqiYu/libfacedetection.train/raw/02246e79b1e976c83d1e135a85e0628120c93769/onnx/yunet_s_640_640.onnx',
1041+
sha='acbe4b5976ade60c4b866a30d0720d71589c8bbc',
1042+
filename='onnx/models/yunet-202303.onnx'),
1043+
Model(
1044+
name='EfficientDet (TFLite)',
1045+
url='https://storage.googleapis.com/mediapipe-assets/coco_efficientdet_lite0_v1_1.0_quant_2021_09_06.tflite?generation=1661875692679200',
1046+
sha='200217d746d58e68028a64ad0472631060e6affb',
1047+
filename='tflite/coco_efficientdet_lite0_v1_1.0_quant_2021_09_06.tflite'),
1048+
Model(
1049+
name='PP_OCRv3_DB_text_det (ONNX)',
1050+
url='https://github.com/zihaomu/zihaomu/files/9740907/PP_OCRv3_DB_text_det.tar.gz',
1051+
sha='a2a008361d785fbe32a22ec2106621ecd1576f48',
1052+
filename='PP_OCRv3_DB_text_det.tar.gz'),
1053+
Model(
1054+
name='PP_OCRv3_DB_text_det (ONNX)',
1055+
archive='PP_OCRv3_DB_text_det.tar.gz',
1056+
member='PP_OCRv3_DB_text_det/PP_OCRv3_DB_text_det.onnx',
1057+
sha='f541f0b448561c7ad919ba9fffa72ff105062934',
1058+
filename='onnx/models/PP_OCRv3_DB_text_det.onnx'),
10231059
]
10241060

10251061
# Note: models will be downloaded to current working directory
140 Bytes
Binary file not shown.
Binary file not shown.

testdata/dnn/onnx/data/input_gelu.npy

528 Bytes
Binary file not shown.
528 Bytes
Binary file not shown.
200 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)