49497d8e7c
Merge pull request #17725 from pemmanuelviel:pev--precompute-divisor
2020-07-03 11:24:11 +00:00
728684840c
Fix trees parsing behavior in hierarchical_clustering_index:
...
Before, when maxCheck was reached in the first descent of a tree, time was still wasted parsing
the next trees till their best leaves whose points were not used at all.
2020-07-03 01:19:10 +02:00
73f7d091f8
Merge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
2020-07-02 11:54:28 +00:00
6a045fd678
Fix arguments list in loadindex for histogram intersection
2020-07-01 18:59:45 +02:00
327f92cc46
Precompute the divisor to ensure that no kind of compiler would process it on the fly at each call.
2020-07-01 18:52:05 +02:00
482cacd420
Mix of 32 and 64bits vector types prevents vectorisation for distance computation.
...
Argument "a" is of type ElementType* that is either int* or float*, while b was double*.
Mixing types prevents the possibility to use SSE or AVX instructions.
On implementation without SIMD instructions, this doesn't show any impact on performance.
2020-07-01 18:27:07 +02:00
93a6be836c
Remove duplicate line
2020-07-01 18:15:01 +02:00
ef7185ce43
Fix genericity of computeNodeStatistics that couldn't compute stats properly on sub-nodes
2020-07-01 12:14:15 +02:00
33fab84473
Type consistency for all xxxIndexParams integer arguments as well as with miniflann's LshIndexParams
2020-06-30 10:33:07 +02:00
a711e2aa41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-29 21:19:09 +00:00
a84afb6334
Merge pull request #17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
2020-06-29 20:53:34 +00:00
cdac7c7bec
Add test checking we don't throw when creating GenericIndex with LshIndexParams()
2020-06-28 19:51:04 +00:00
fe09c79f4b
Fix the 'cvflann::anyimpl::bad_any_cast' error using Lsh
2020-06-28 19:51:04 +00:00
daa88c6b9e
Merge pull request #17642 from pemmanuelviel:pev--fixes-and-clean
...
* 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
2020-06-26 22:34:52 +00:00
e45d74c8f9
Merge pull request #17638 from pemmanuelviel:pev--avoid-branching-in-loop
2020-06-26 19:22:20 +00:00
06b4292534
Fix: error in the dimension used for computeMinMax
...
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")
2020-06-23 15:47:27 +02:00
29f883feee
Optim: test that could be done once has been extracted from the loop
2020-06-23 15:43:38 +02:00
05fbd1e5bc
DNA mode: add the distance computations
2020-06-22 22:53:05 +02:00
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
c6c8783c60
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-16 21:30:30 +00:00
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00
318cba4ce3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-19 19:48:49 +00:00
7ec91aefc1
python: force using of ArgInfo
2019-11-15 19:16:22 +03:00
bea2c75452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-05 14:29:22 +03:00
f3aab47f94
Assorted documentation fixes
...
* removed private flann documentation
* common tutorial images moved to doc/images
* grouping issues
2019-08-31 01:50:11 +03:00
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
960bb540ec
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
backport of commit: 4e998c9ade
2019-08-05 17:19:12 +03:00
4e998c9ade
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
2019-07-28 10:21:15 -07:00
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
5b521bb778
Merge pull request #14898 from UnderscoreAsterisk:flann-warnings-and-4376
...
Keep a local copy of `features` from `flann::GenericIndex ` constructor (#14898 )
* Fix warnings on Windows
* Fix #4376
2019-06-26 19:35:11 +03:00
d60ac98ef2
Limited API support for Python3
2019-06-11 15:20:43 +03:00
10d61a2b44
Limited API support for Python3
2019-06-11 15:15:49 +03:00
8c25a8eb7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-22 19:31:31 +03:00
74e3403620
flann/kmeans: Fix non-determinism of KMeans index
...
When running with >1 OpenCV thread, KMeans index generation was
non-deterministic because of a RWW race. Issue is resolved by removing
the offending logic from the parallel section.
2019-03-20 08:44:31 -07:00
8bde6aea4b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-19 19:49:13 +00:00
7c72e095fa
Fix Flann compilation under nvcc + NEON
...
All <arm_neon.h> includes in core/cv_cpu_dispatch.h are protected by an
ifndef __CUDACC__ to prevent attempting to use neon intrinsics when
compiling cuda kernels (.cu) -- this prevents hard errors such as
error: identifier "__builtin_neon_qi" is undefined
Add this same protection to flann/dist.h to fix compilation involving
flann.hpp.
2019-02-19 15:11:01 +02:00
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
5ff76088b9
fixed memory issue in flann
2018-11-25 01:31:54 +01:00
043e7e3516
flann: drop untested hdf5.h
2018-10-21 15:16:52 +00:00
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
d8ffddd075
Merge pull request #12871 from UnderscoreAsterisk:document-Distance
...
* Document distance functors in dist.h
* Add spec for Distance
* Generate appropriate links for symbols
2018-10-20 11:15:13 +03:00
a7dfa261d8
Add documentation for radiusSearch
2018-10-18 04:09:16 +05:30
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
52f52f6786
flann: drop useless mutex
2018-09-26 19:37:44 +03:00
5fb0f34e8a
Merge pull request #12570 from alalek:drop_usrtype1
...
* core: drop usage of CV_USRTYPE1 in OpenCV
avoid OpenCV crashes due size change CV_ELEM_SIZE(CV_USRTYPE1): 8 -> 2
* ! fix persistence internal types
2018-09-19 13:55:26 +03:00
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
5d54def264
Add semicolons after CV_INSTRUMENT macros
2018-09-14 06:45:31 +09:00
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Alexander Alekhin
Pierre-Emmanuel Viel
Brian Wignall
Tatsuro Shibamura
Alexander Alekhin
Maksim Shabunin
luz.paz
TheGoddessInari
Apoorv Goel
Matthew K. Gumbel
Lindsay Roberts
1over
Apoorv
Hamdi Sahloul