Skip to content

Commit d49073b

Browse files
alalekl-bat
alalek
authored and
l-bat
committed
Merge pull request opencv#599 from dkurt:dnn_onnx_const_reshape
Merge pull request opencv#516 from savuor:cvtcolor_bgr2gray_8u_15bits * fixed perf data for PyrLK after bgr2gray 8u change * fixed perf data for new bgr2gray coeffs fixed issue #1754@contrib for ximgproc Merge pull request opencv#528 from xoox:calib-release-object Add new test data for extended camera calibration method (opencv#528) * Reorder object points and image points Now the feature points are in the order as the same set of the object points, which makes the test data usable for testing calibration with CALIB_RELEASE_OBJECT flag. * Add one line to store calibration flags opencv/modules/calib3d/test/test_cameracalibration.cpp must be sync with this test data file. * Add new test data for camera calibration The new added calib2.dat is used for regression test of camera calibration with CALIB_RELEASE_OBJECT flag. * Add a line of data for the index of fixed point The new proposed calibration flag CALIB_RELEASE_OBJECT is removed. And the method selection is based on the range of the index of fixed point. For minus values, standard calibration method will be chosen. Values in a rational range will make the object-releasing calibration method selected. fixed "false alarm" test failures in opencv_test_objdetect (i.e. removed some errorneously detected "non-faces" from the regression data) added sanity data for opencv_contrib/optflow module (since TVL1 optflow is now there and it does sanity check in perf tests) Test data for opencv/opencv_contrib#1791 fixed perf data for mRGBA
2 parents 8869985 + a0e65b7 commit d49073b

File tree

12 files changed

+8778
-1318
lines changed

12 files changed

+8778
-1318
lines changed

‎testdata/cv/cameracalibration/calib1.dat

Lines changed: 583 additions & 581 deletions
Large diffs are not rendered by default.

‎testdata/cv/cameracalibration/calib2.dat

Lines changed: 7330 additions & 0 deletions
Large diffs are not rendered by default.

‎testdata/cv/cameracalibration/datafiles.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
1
1+
2
22
calib1.dat
3-
3+
calib2.dat

‎testdata/cv/cascadeandhog/cascade.xml

Lines changed: 73 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<opencv_storage>
33
<cascade>
4-
<distE>4.9999998882412910e-03</distE>
4+
<distE>0.01</distE>
55
<sE>1.7000000923871994e-02</sE>
66
<noPairE>1.0000000149011612e-01</noPairE>
77
<detector_names>
@@ -98,7 +98,7 @@
9898
183 183</img_2>
9999
<img_3>
100100
257 230 36 36 333 36 38 38 67 127 37 37 137 257 39 39 116 49 41
101-
41 218 162 34 34 396 86 42 42 26 279 54 54 407 279 79 79</img_3>
101+
41 396 86 42 42 26 279 54 54 407 279 79 79</img_3>
102102
<img_4>
103103
165 120 136 136</img_4>
104104
<img_5>
@@ -112,30 +112,80 @@
112112
<img_0>
113113
124 32 54 54</img_0>
114114
<img_1>
115-
116 208 48 48 154 205 52 52 225 1 53 53</img_1>
115+
225 1 53 53</img_1>
116116
<img_2>
117-
875 183 37 37 192 184 41 41 529 210 42 42 824 253 38 38 975 257
118-
43 43 1055 317 41 41 470 160 43 43 700 164 44 44 589 169 45 45
119-
342 180 40 40 819 180 43 43 994 187 41 41 267 208 43 43 937 213
120-
42 42 624 221 43 43 144 226 44 44 728 237 43 43 473 244 42 42
121-
569 253 44 44 644 271 41 41 787 272 43 43 445 287 44 44 159 299
122-
40 40 943 305 44 44 670 377 46 46 816 538 34 34 1039 208 42 42
123-
376 225 39 39 873 243 42 42 340 291 43 43 446 337 39 39 108 350
124-
48 48 347 356 49 49 1084 354 50 50 219 407 48 48 1161 414 48 48
125-
737 421 46 46 95 499 49 49 167 555 40 40 54 712 37 37 187 259 45
126-
45 1103 269 49 49 274 296 50 50 703 298 50 50 571 318 51 51 478
127-
340 50 50 833 345 49 49 409 345 47 47 240 353 45 45 786 379 49
128-
49 604 406 46 46 836 409 52 52 1002 419 52 52 474 478 53 53 961
129-
483 53 53 282 490 52 52 575 500 39 39 1126 505 52 52 75 880 46
130-
46 338 426 49 49 742 450 48 48 662 487 56 56 806 495 55 55 337
131-
52 51 51 561 121 51 51 703 350 54 54 551 729 59 59 110 879 49 49
132-
912 954 51 51 856 234 60 60</img_2>
117+
875 183 37 37
118+
192 184 41 41
119+
529 210 42 42
120+
824 253 38 38
121+
975 257 43 43
122+
1055 317 41 41
123+
470 160 43 43
124+
700 164 44 44
125+
589 169 45 45
126+
342 180 40 40
127+
819 180 43 43
128+
994 187 41 41
129+
267 208 43 43
130+
937 213 42 42
131+
624 221 43 43
132+
144 226 44 44
133+
728 237 43 43
134+
473 244 42 42
135+
569 253 44 44
136+
644 271 41 41
137+
787 272 43 43
138+
445 287 44 44
139+
159 299 40 40
140+
943 305 44 44
141+
670 377 46 46
142+
1039 208 42 42
143+
376 225 39 39
144+
873 243 42 42
145+
340 291 43 43
146+
446 337 39 39
147+
108 350 48 48
148+
347 356 49 49
149+
1084 354 50 50
150+
219 407 48 48
151+
1161 414 48 48
152+
737 421 46 46
153+
95 499 49 49
154+
187 259 45 45
155+
1103 269 49 49
156+
274 296 50 50
157+
703 298 50 50
158+
571 318 51 51
159+
478 340 50 50
160+
833 345 49 49
161+
409 345 47 47
162+
240 353 45 45
163+
786 379 49 49
164+
604 406 46 46
165+
836 409 52 52
166+
1002 419 52 52
167+
474 478 53 53
168+
961 483 53 53
169+
282 490 52 52
170+
1126 505 52 52
171+
338 426 49 49
172+
662 487 56 56
173+
806 495 55 55
174+
337 52 51 51
175+
551 729 59 59
176+
110 879 49 49
177+
</img_2>
133178
<img_3>
134-
66 126 39 39 257 230 35 35 332 35 41 41 137 256 41 41 115 48 42
135-
42 397 86 42 42 426 236 44 44 403 80 52 52 27 280 51 51 267 284
136-
62 62</img_3>
179+
66 126 39 39
180+
257 230 35 35
181+
332 35 41 41
182+
137 256 41 41
183+
115 48 42 42
184+
426 236 44 44
185+
403 80 52 52
186+
267 284 62 62</img_3>
137187
<img_4>
138-
34 210 50 50 421 115 54 54 164 120 141 141</img_4>
188+
164 120 141 141</img_4>
139189
<img_5>
140190
110 70 71 71 246 53 55 55 211 29 125 125</img_5>
141191
<img_6>

‎testdata/cv/ximgproc/corr.yml.gz

686 KB
Binary file not shown.

‎testdata/cv/ximgproc/image.png

127 KB
Loading

‎testdata/cv/ximgproc/opencv_logo.png

366 Bytes
Loading

‎testdata/cv/ximgproc/qdftData.yml.gz

177 KB
Binary file not shown.

‎testdata/cv/ximgproc/results/ridge_filter_test_ref/04.png

100755100644
0 Bytes
Loading

‎testdata/dnn/download_models.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,13 @@ def save(self, r):
445445
Model(
446446
name='VGG16 (ONNX)',
447447
url='https://s3.amazonaws.com/onnx-model-zoo/vgg/vgg16/vgg16.tar.gz',
448-
sha='7c02db88b2191457155f0ccca1d755e3e18604bf',
448+
sha='39bc0f689388a32227d804e97ea9f562467ed863',
449449
filename='vgg16.tar.gz'),
450450
Model(
451451
name='VGG16 (ONNX)',
452452
archive='vgg16.tar.gz',
453453
member='vgg16/vgg16.onnx',
454-
sha='d2833339fae2e5256698ee923731fd9a523fb747',
454+
sha='effed6f2bbe6c3a2f7705da4c0002ec6250827dd',
455455
filename='onnx/models/vgg16.onnx'),
456456
Model(
457457
name='VGG16 (ONNX)',
@@ -468,13 +468,13 @@ def save(self, r):
468468
Model(
469469
name='VGG16_bn (ONNX)',
470470
url='https://s3.amazonaws.com/onnx-model-zoo/vgg/vgg16-bn/vgg16-bn.tar.gz',
471-
sha='9dee2249f6336d19d7f6a0149a26825ec458dbf3',
471+
sha='60f4685aed632d2ce3b137017cf44ae1a5c55459',
472472
filename='vgg16-bn.tar.gz'),
473473
Model(
474474
name='VGG16_bn (ONNX)',
475475
archive='vgg16-bn.tar.gz',
476476
member='vgg16-bn/vgg16-bn.onnx',
477-
sha='dfcd3df92498416171e47b771a7c31de98558872',
477+
sha='e282e2137f1317d03ca1f2702e9cfddaf847e44d',
478478
filename='onnx/models/vgg16-bn.onnx'),
479479
Model(
480480
name='VGG16_bn (ONNX)',
@@ -491,13 +491,13 @@ def save(self, r):
491491
Model(
492492
name='ResNet-18v1 (ONNX)',
493493
url='https://s3.amazonaws.com/onnx-model-zoo/resnet/resnet18v1/resnet18v1.tar.gz',
494-
sha='83235d56d0b9118cb389f477bb45ddbfbb4e5c66',
494+
sha='d132be4857d024de9caa21fd5300dee7c063bc35',
495495
filename='resnet18v1.tar.gz'),
496496
Model(
497497
name='ResNet-18v1 (ONNX)',
498498
archive='resnet18v1.tar.gz',
499499
member='resnet18v1/resnet18v1.onnx',
500-
sha='5a9c94d32be17baf96653a6d2f732339b48835a0',
500+
sha='9d96d7142c5ce43aa61ce67124b8eb5530afff4c',
501501
filename='onnx/models/resnet18v1.onnx'),
502502
Model(
503503
name='ResNet-18v1 (ONNX)',
@@ -514,13 +514,13 @@ def save(self, r):
514514
Model(
515515
name='ResNet-50v1 (ONNX)',
516516
url='https://s3.amazonaws.com/onnx-model-zoo/resnet/resnet50v1/resnet50v1.tar.gz',
517-
sha='268df7b647c2ee522d85b4fb033b76a1e295c881',
517+
sha='a4ac2da7e0024d61fdb80481496ba966b48b9fea',
518518
filename='resnet50v1.tar.gz'),
519519
Model(
520520
name='ResNet-50v1 (ONNX)',
521521
archive='resnet50v1.tar.gz',
522522
member='resnet50v1/resnet50v1.onnx',
523-
sha='da4e9405da74deac8b7ff07038ed165f41065b44',
523+
sha='06aa26c6de448e11c64cd80cf06f5ab01de2ec9b',
524524
filename='onnx/models/resnet50v1.onnx'),
525525
Model(
526526
name='ResNet-50v1 (ONNX)',
@@ -640,13 +640,13 @@ def save(self, r):
640640
Model(
641641
name='LResNet100E-IR (ONNX)',
642642
url='https://s3.amazonaws.com/onnx-model-zoo/arcface/resnet100/resnet100.tar.gz',
643-
sha='537760f73256599acf40587528b291345c96c8c2',
643+
sha='b1178813b705d9d44ed806aa442f0b1cb11aea0a',
644644
filename='resnet100.tar.gz'),
645645
Model(
646646
name='LResNet100E-IR (ONNX)',
647647
archive='resnet100.tar.gz',
648648
member='resnet100/resnet100.onnx',
649-
sha='549bad59f620791c58a22363d74db765dd13fa54',
649+
sha='d307e426cf55cddf9f9292b5ffabb474eec93638',
650650
filename='onnx/models/LResNet100E_IR.onnx'),
651651
Model(
652652
name='LResNet100E-IR (ONNX)',

‎testdata/perf/optflow.xml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0"?>
2+
<opencv_storage>
3+
<OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1-----1--0-3---false->
4+
<uFlow>
5+
<kind>655360</kind>
6+
<type>13</type>
7+
<min>-3.5146024227142334e+00</min>
8+
<max>4.8351488113403320e+00</max>
9+
<last>
10+
<x>583</x>
11+
<y>387</y>
12+
<val>-8.1857768818736076e-03</val></last>
13+
<rng1>
14+
<x>545</x>
15+
<y>323</y>
16+
<val>1.0302889347076416e+00</val></rng1>
17+
<rng2>
18+
<x>580</x>
19+
<y>163</y>
20+
<cn>1</cn>
21+
<val>-3.4750491380691528e-02</val></rng2></uFlow></OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1-----1--0-3---false->
22+
<OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1-----1--0-3---true->
23+
<uFlow>
24+
<kind>655360</kind>
25+
<type>13</type>
26+
<min>-3.5046372413635254e+00</min>
27+
<max>4.3451681137084961e+00</max>
28+
<last>
29+
<x>583</x>
30+
<y>387</y>
31+
<val>-2.4322979152202606e-02</val></last>
32+
<rng1>
33+
<x>506</x>
34+
<y>70</y>
35+
<cn>1</cn>
36+
<val>-5.6306645274162292e-03</val></rng1>
37+
<rng2>
38+
<x>210</x>
39+
<y>214</y>
40+
<cn>1</cn>
41+
<val>-6.3248097896575928e-01</val></rng2></uFlow></OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1-----1--0-3---true->
42+
<OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1----3--0-5---false->
43+
<uFlow>
44+
<kind>655360</kind>
45+
<type>13</type>
46+
<min>-3.5634777545928955e+00</min>
47+
<max>5.7179822921752930e+00</max>
48+
<last>
49+
<x>583</x>
50+
<y>387</y>
51+
<val>-1.0125290602445602e-02</val></last>
52+
<rng1>
53+
<x>18</x>
54+
<y>372</y>
55+
<cn>1</cn>
56+
<val>2.5418498553335667e-03</val></rng1>
57+
<rng2>
58+
<x>82</x>
59+
<y>99</y>
60+
<cn>1</cn>
61+
<val>-7.1579486131668091e-02</val></rng2></uFlow></OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1----3--0-5---false->
62+
<OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1----3--0-5---true->
63+
<uFlow>
64+
<kind>655360</kind>
65+
<type>13</type>
66+
<min>-3.5621769428253174e+00</min>
67+
<max>3.9667177200317383e+00</max>
68+
<last>
69+
<x>583</x>
70+
<y>387</y>
71+
<val>1.6411958262324333e-02</val></last>
72+
<rng1>
73+
<x>75</x>
74+
<y>145</y>
75+
<cn>1</cn>
76+
<val>3.5596346855163574e-01</val></rng1>
77+
<rng2>
78+
<x>136</x>
79+
<y>377</y>
80+
<val>-5.0653451681137085e-01</val></rng2></uFlow></OCL_OpticalFlowDualTVL1Fixture_OpticalFlowDualTVL1--OpticalFlowDualTVL1----3--0-5---true->
81+
</opencv_storage>

0 commit comments

Comments
 (0)