Skip to content

Merge 3.4#17697

Merged
alalek merged 20 commits intoopencv:masterfrom
alalek:merge-3.4
Jun 29, 2020
Merged

Merge 3.4#17697
alalek merged 20 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jun 29, 2020

#17567 from dev-tronifier:new_branch
#17618 from Yosshi999:gsoc_sift-better-test
#17636 from okamotoR:3.4
#17638 from pemmanuelviel:pev--avoid-branching-in-loop
#17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
#17641 from pemmanuelviel:pev--fix-middleSplit-for-kdtree-single
#17642 from pemmanuelviel:pev--fixes-and-clean
#17648 from alalek:update_libjpeg
#17650 from alalek:update_libjpeg-turbo
#17663 from alalek:backport_17658

closes #17613
closes #17628
closes #17607
closes #17612

Previous "Merge 3.4": #17646

ci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#build_image:Custom=ubuntu-openvino-2020.2.0:16.04
#buildworker:Custom=linux-2
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.2.0
build_image:Custom Mac=openvino-2020.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.1.0
build_image:Custom Win=openvino-2020.2.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

okamotoR and others added 20 commits June 23, 2020 21:36
Instead of using the current dimension for which we just got a big span,
we were computing Min and Max for the previous dimension stored in cutfeat
(and using 0 instead of the dimension indice for the very first dimension
with "span > (1-eps)max_span")
Added/Fixed testcases for SIFT

* merge perf_sift into conventional perf tests

* Fix disabled SIFT scale invariance tests

allows trainIdx duplication in matching scaled keypoints
* Clean: make the use of the indices array length consistent

Either we don't want this method to be used in the future for any other node
than the root node, and so we replace indices_length by size_ and remove it as
argument, or we want to be able to use it potentially for other nodes, and
so using size_ instead of indices_length would have lead to a bug.

* Fix: b was not an address

* Fix: transpose the Flann repo commit "Fixes in accum_dist methods" from Adil Ibragimov

Avoids trying to compute log(ratio) with ratio = 0

* Fix: transpose the Flann repo commit "result_set bugfix" from Jack Rae

* Fix Jack Rae commit as the initial i - 1 index was decremented before entering the loop body

* Clean: transpose the Flann repo commit "Updated comments in lsh_index" from Richard McPherson

* Fix: Transpose the Flann repo commit "Fixing unreachable code in lsh_table.h" from hypevr

* Fix warning the same way it was done in flann standalone repo

* Change the return value in case of unsupported type
INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DetectorScaleInvariance,
Value(IMAGE_BIKES, SIFT::create(), 0.69f, 0.98f));
INSTANTIATE_TEST_CASE_P(SIFT, DetectorScaleInvariance,
Value(IMAGE_BIKES, SIFT::create(0, 3, 0.09), 0.65f, 0.98f));
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.

@Yosshi999 I have reduced test threshold on master branch:

[ RUN      ] SIFT/DetectorScaleInvariance.scale/0, where GetParam() = ("detectors_descriptors_evaluation/images_datasets/bikes/img1.png", 0.69, 0.98)
scale = 1.5, keyPointMatchesRatio = 0.767554, scaleInliersRatio = 0.996845
scale = 2, keyPointMatchesRatio = 0.812734, scaleInliersRatio = 1
/home/alalek/projects/opencv/dev/modules/features2d/test/test_detectors_invariance.impl.hpp:198: Failure
Expected: (keyPointMatchesRatio) >= (minKeyPointMatchesRatio), actual: 0.678571 vs 0.69
scale = 2.5, keyPointMatchesRatio = 0.678571, scaleInliersRatio = 1
[  FAILED  ] SIFT/DetectorScaleInvariance.scale/0, where GetParam() = ("detectors_descriptors_evaluation/images_datasets/bikes/img1.png", 0.69, 0.98) (285 ms)

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 29, 2020

👍

@alalek alalek merged commit a711e2a into opencv:master Jun 29, 2020
@alalek alalek mentioned this pull request Jul 6, 2020
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.

6 participants