Skip to content

(4.x) Merge 3.4#23167

Merged
alalek merged 16 commits intoopencv:4.xfrom
alalek:merge-3.4
Jan 23, 2023
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 21, 2023

#16189 from mshabunin:enable-two-channels
#23108 from crackwitz:issue-23107
#23111 from Yeatse:fix-apple-silicon-build
#23120 from alalek:fixup_22246_2
#23128 from Isydmr:update-fastNlMeansDenoising-documentation
#23145 from savuor:backport34_fix_inf
#23148 from alalek:perf_drop_calibration
#23154 from tomoaki0705:handleNonBitExact

Previous "Merge 3.4": #23042

build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-1,linux-4,linux-f1

alalek and others added 15 commits January 8, 2023 18:18
Usage of imread(): magic number 0, unchecked result

* docs: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()

* samples, apps: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()

* tests: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()

* doc/py_tutorials: check imread() result
…ng-documentation

Fix broken paper link for fastNlMeansDenoising

* Fix broken link

* Move citation to `opencv.bib`

* Cite researchgate reference

* Correct citation label

* Use semantic scholar BibTex
perf: drop runtime time adjustment calibration
eps_tvec_noise[CALIB_HAND_EYE_HORAUD] = 5.0e-2;
eps_tvec_noise[CALIB_HAND_EYE_TSAI] = 7.0e-2;
eps_tvec_noise[CALIB_HAND_EYE_PARK] = 7.0e-2;
eps_tvec_noise[CALIB_HAND_EYE_HORAUD] = 7.0e-2;
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated checks tolerance values to due to RNG generator update (stable and independent values: #16189)

/cc @catree

TEST_P(Test_Int8_nets, EfficientDet)
{
if (cvtest::skipUnstableTests)
throw SkipTestException("Skip unstable test"); // detail: https://github.com/opencv/opencv/pull/23167
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test failed on MSVS2015 build with --test_threads=3 (also 7, 9):

[ RUN      ] Test_Int8_nets.EfficientDet/0, where GetParam() = OCV/CPU
[ INFO:0@94.488] global tf_importer.cpp:3014 cv::dnn::dnn4_v20221220::`anonymous-namespace'::TFImporter::populateNet DNN/TF: parsing model (N/A version info). Number of nodes = 2011
[ INFO:0@94.488] global tf_importer.cpp:3021 cv::dnn::dnn4_v20221220::`anonymous-namespace'::TFImporter::populateNet DNN/TF: parsing config (N/A version info). Number of nodes = 938
Unmatched prediction: class 16 score 0.661760 box [0.226657 x 0.547847 from (0.166423, 0.385289)]
Highest IoU: 0
c:\build\precommit_windows64\4.x\opencv\modules\dnn\test\test_common.impl.hpp(144): error: Value of: matched
  Actual: false
Expected: true
Unmatched reference: class 17 score 0.824592 box [0.244581 x 0.530952 from (0.166575, 0.399682)] IoU diff: 1
c:\build\precommit_windows64\4.x\opencv\modules\dnn\test\test_common.impl.hpp(156): error: Expected: (refScores[i]) <= (confThreshold), actual: 0.824592 vs 0.65
[  FAILED  ] Test_Int8_nets.EfficientDet/0, where GetParam() = OCV/CPU (4345 ms)

"Class" is different - no way to tune tolerance.

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 23, 2023

👍

@alalek alalek merged commit 18cbfa4 into opencv:4.x Jan 23, 2023
This was referenced Jan 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants