platform/upstream/opencv.git
4 years agoMerge pull request #17842 from anton-potapov:gapi_debug_log
Alexander Alekhin [Thu, 16 Jul 2020 13:02:18 +0000 (13:02 +0000)]
Merge pull request #17842 from anton-potapov:gapi_debug_log

4 years agoMerge pull request #17818 from komakai:documentation-improvements
Giles Payne [Wed, 15 Jul 2020 18:42:05 +0000 (03:42 +0900)]
Merge pull request #17818 from komakai:documentation-improvements

Documentation fixes/improvements

* Documentation fixes/improvements

* Remove HASH_UTILS defines

4 years agoMerge pull request #17741 from aDanPin:dp/add_dinamic_graph_feature
Pinaev Danil [Wed, 15 Jul 2020 18:37:08 +0000 (21:37 +0300)]
Merge pull request #17741 from aDanPin:dp/add_dinamic_graph_feature

[G-API] Allow building graphs with a dynamic number of inputs and outputs

* Add dinamic graph feature and tests

* Remove unnecessary file

* Review response

* Add implementation of operator += for GRunArgs
And test for that case

* Tests refactoring

* Add doxygen
Review response

* Fix docs

* A small documentation fix

* Review response

* Add tests for more entities

* Add typed tests

* Another typed tests

* Doc fix

* Documentation fix

* Build fix

* Commit for rebuild

* The last one

4 years agoMerge pull request #17788 from YashasSamaga:cuda4dnn-nice-build
Alexander Alekhin [Wed, 15 Jul 2020 12:25:23 +0000 (12:25 +0000)]
Merge pull request #17788 from YashasSamaga:cuda4dnn-nice-build

4 years agoMerge pull request #17847 from anton-potapov:gapi_own_mat_ctor_warnings
Alexander Alekhin [Wed, 15 Jul 2020 10:48:02 +0000 (10:48 +0000)]
Merge pull request #17847 from anton-potapov:gapi_own_mat_ctor_warnings

4 years agoGAPI: fix warnings in own::Mat default generated constructors/assign op
Anton Potapov [Wed, 15 Jul 2020 07:49:05 +0000 (10:49 +0300)]
GAPI: fix warnings in own::Mat default generated constructors/assign op

4 years agoGAPI: GAPI_LOG_DEBUG facility
Anton Potapov [Tue, 14 Jul 2020 22:31:25 +0000 (01:31 +0300)]
GAPI: GAPI_LOG_DEBUG facility

4 years agoMerge pull request #17502 from dmatveev:dm/infer2
Dmitry Matveev [Tue, 14 Jul 2020 08:06:49 +0000 (11:06 +0300)]
Merge pull request #17502 from dmatveev:dm/infer2

* G-API: Introduce a new gapi::infer2 overload + gaze estimation sample

* G-API/infer2: Introduced static type checking for infer2

- Also added extra tests on the type check routine

* G-API/infer2: Addressed self-review comments in the sample app

- Also fix build on Linux;

* G-API/infer2: Remove incorrect SetLayout(HWC) + dead code

- Also fixed comments in the backend

* G-API/infer2: Continue with self-review

- Fix warnings/compile errors in gaze estimation
- Dropped the use of RTTI (VectorRef::holds()) from the giebackend
- Replaced it with a trait-based enums for GArray<T> and std::vector<T>
- The enums and traits are temporary and need to be unified with
  the S11N when it comes

* G-API/infer2: Final self-review items

- Refactored ROIList test to cover 70% for infer<> and infer2<>;
- Fixed the model data discovery routine to be compatible with new
  OpenVINO;
- Hopefully fixed the final issues (warnings) with the sample.

* G-API/infer2: address review problems

- Fixed typo in comments;
- Fixed public (Doxygen) comment on GArray<GMat> input case for infer2;
- Made model lookup more flexible to allow new & old OMZ dir layouts.

* G-API/infer2: Change the model paths again

* G-API/infer2: Change the lookup path for test data

* G-API/infer2: use randu instead of imread. CI war is over

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 13 Jul 2020 19:54:49 +0000 (19:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17694 from dbudniko:dbudniko/serialization_args2
Dmitry Budnikov [Mon, 13 Jul 2020 19:24:46 +0000 (22:24 +0300)]
Merge pull request #17694 from dbudniko:dbudniko/serialization_args2

G-API args serialization

* args serialization

* GRunArgP draft

* UMat added

* bind added

* DmitryM's review addressed. Code clean up required.

* fix android build

* bind test added

* more comments addressed

* try to fix Mac build

* clean up

* header-based generic implementation (GRunArg)

* clang again

* one more attempt for clang

* more clean up

* More Dmitry's comments addressed.

* monostate removed

* Top level functions and some other comments addressed.

* fix warnings

* disable warning

4 years agoMerge pull request #17830 from alalek:fix_17815
Alexander Alekhin [Mon, 13 Jul 2020 18:52:34 +0000 (18:52 +0000)]
Merge pull request #17830 from alalek:fix_17815

4 years agofeatures2d: v_fma => v_muladd for integers
Alexander Alekhin [Mon, 13 Jul 2020 17:15:41 +0000 (17:15 +0000)]
features2d: v_fma => v_muladd for integers

4 years agoMerge pull request #17806 from alalek:dnn_ie_num_threads_windows
Alexander Alekhin [Mon, 13 Jul 2020 17:12:31 +0000 (17:12 +0000)]
Merge pull request #17806 from alalek:dnn_ie_num_threads_windows

4 years agoimproved diagnostics for build issues
YashasSamaga [Mon, 13 Jul 2020 15:39:38 +0000 (21:09 +0530)]
improved diagnostics for build issues

4 years agoMerge pull request #17639 from pemmanuelviel:pev--binary-kmeans
pemmanuelviel [Mon, 13 Jul 2020 12:59:10 +0000 (14:59 +0200)]
Merge pull request #17639 from pemmanuelviel:pev--binary-kmeans

Pev binary kmeans

* Ongoing work transposing kmeans clustering method for bitfields: the computeClustering method

Ongoing work transposing kmeans clustering method for bitfields: interface computeBitfieldClustering

Fix genericity of computeNodeStatistics

Ongoing work transposing kmeans clustering method for bitfields: adapt computeNodeStatistics()

Ongoing work transposing kmeans clustering method for bitfields: adapt findNN() method

Ongoing work transposing kmeans clustering method for bitfields: allow kmeans with Hamming distance

Ongoing work transposing kmeans clustering method for bitfields: adapt distances code

Ongoing work transposing kmeans clustering method for bitfields: adapt load/save code

Ongoing work transposing kmeans clustering method for bitfields: adapt kmeans hierarchicalClustring()

PivotType -> CentersType Renaming

Fix type casting for ARM SIMD implementation of Hamming

Fix warnings with Win32 compilation

Fix warnings with Win64 compilation

Fix wrong parenthesis position on rounding

* Ensure proper rounding when CentersType is integral

4 years agoMerge pull request #17770 from jasonKercher:3.4_triggered
jasonKercher [Mon, 13 Jul 2020 12:29:54 +0000 (08:29 -0400)]
Merge pull request #17770 from jasonKercher:3.4_triggered

3.4 Allow first capture to return false

* fix first capture timeout

* fix first capture timeout

4 years agoMerge pull request #17822 from alalek:issue_17792
Alexander Alekhin [Mon, 13 Jul 2020 11:08:33 +0000 (11:08 +0000)]
Merge pull request #17822 from alalek:issue_17792

4 years agoMerge pull request #17805 from tomoaki0705:fixCUDAHostCompilerIssue
Alexander Alekhin [Sun, 12 Jul 2020 13:05:14 +0000 (13:05 +0000)]
Merge pull request #17805 from tomoaki0705:fixCUDAHostCompilerIssue

4 years agore-enable automatic CC detection on Jetson
Tomoaki Teshima [Sun, 12 Jul 2020 12:22:12 +0000 (21:22 +0900)]
re-enable automatic CC detection on Jetson
     * treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate

4 years agocore: use lazy on-demand initialization for param_traceEnable
Alexander Alekhin [Sun, 12 Jul 2020 11:53:46 +0000 (11:53 +0000)]
core: use lazy on-demand initialization for param_traceEnable

4 years agoMerge pull request #17813 from hannesa2:FixTypo
Alexander Alekhin [Sat, 11 Jul 2020 19:20:49 +0000 (19:20 +0000)]
Merge pull request #17813 from hannesa2:FixTypo

4 years agoMerge pull request #17783 from dmatveev:dm/pmc_script
Alexander Alekhin [Sat, 11 Jul 2020 19:11:03 +0000 (19:11 +0000)]
Merge pull request #17783 from dmatveev:dm/pmc_script

4 years agoMerge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Sat, 11 Jul 2020 19:09:21 +0000 (19:09 +0000)]
Merge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic

4 years agoerror if cuda4dnn depends are not resolved
YashasSamaga [Thu, 9 Jul 2020 12:31:33 +0000 (18:01 +0530)]
error if cuda4dnn depends are not resolved

4 years agoFix typo
Hannes Achleitner [Sat, 11 Jul 2020 06:10:15 +0000 (08:10 +0200)]
Fix typo

4 years agoMerge pull request #17635 from jsxyhelu:3.4
Alexander Alekhin [Fri, 10 Jul 2020 15:11:53 +0000 (15:11 +0000)]
Merge pull request #17635 from jsxyhelu:3.4

4 years agodnn(ie): enable KEY_CPU_THREADS_NUM for Windows
Alexander Alekhin [Fri, 10 Jul 2020 14:29:21 +0000 (14:29 +0000)]
dnn(ie): enable KEY_CPU_THREADS_NUM for Windows

4 years agoUse“ moms” replace "contourArea"
jsxyhelu [Tue, 23 Jun 2020 12:39:55 +0000 (20:39 +0800)]
Use“ moms” replace "contourArea"

double area = moms.m00;
is same as
double area = contourArea(contours[contourIdx]);
Not to mention
"moms" already calculated here,"contourArea" should not apply

4 years agoMerge pull request #17791 from YashasSamaga:cuda4dnn-fix-concat-fusion
Alexander Alekhin [Fri, 10 Jul 2020 10:55:01 +0000 (10:55 +0000)]
Merge pull request #17791 from YashasSamaga:cuda4dnn-fix-concat-fusion

4 years agoMerge pull request #17772 from mshabunin:fix-match-umat-mask
Alexander Alekhin [Fri, 10 Jul 2020 10:53:55 +0000 (10:53 +0000)]
Merge pull request #17772 from mshabunin:fix-match-umat-mask

4 years agouse bufferarea for allocating buffer
Yosshi999 [Thu, 9 Jul 2020 16:50:20 +0000 (16:50 +0000)]
use bufferarea for allocating buffer

4 years agofix concat fusion for cuda4dnn
YashasSamaga [Thu, 9 Jul 2020 14:10:44 +0000 (19:40 +0530)]
fix concat fusion for cuda4dnn

4 years agoAdded test for checkMasks with UMat train descs
Maksim Shabunin [Thu, 9 Jul 2020 13:03:04 +0000 (16:03 +0300)]
Added test for checkMasks with UMat train descs

4 years agoFixed checkMasks in DescriptorMatcher with train descs in UMats
Maksim Shabunin [Tue, 7 Jul 2020 10:26:43 +0000 (13:26 +0300)]
Fixed checkMasks in DescriptorMatcher with train descs in UMats

4 years agoMerge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2
Yashas Samaga B L [Thu, 9 Jul 2020 13:02:21 +0000 (18:32 +0530)]
Merge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2

cuda4dnn(conv): fuse eltwise with convolutions

* fuse eltwise with convolutions

* manually rebase to avoid bad git merge

4 years agoG-API: Change the default FD model in the privacy-masking-camera
Dmitry Matveev [Thu, 9 Jul 2020 11:09:59 +0000 (14:09 +0300)]
G-API: Change the default FD model in the privacy-masking-camera

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 8 Jul 2020 21:03:43 +0000 (21:03 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17737 from pemmanuelviel:pev--fix-trees-descent
Alexander Alekhin [Wed, 8 Jul 2020 20:59:29 +0000 (20:59 +0000)]
Merge pull request #17737 from pemmanuelviel:pev--fix-trees-descent

4 years agoMerge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Wed, 8 Jul 2020 20:33:40 +0000 (20:33 +0000)]
Merge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic

4 years agoMerge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel
Alexander Alekhin [Wed, 8 Jul 2020 20:20:19 +0000 (20:20 +0000)]
Merge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel

4 years agoMerge pull request #17674 from alalek:issue_16214
Alexander Alekhin [Wed, 8 Jul 2020 20:01:35 +0000 (20:01 +0000)]
Merge pull request #17674 from alalek:issue_16214

4 years agoMerge pull request #17777 from alalek:backport_cuda_cmake
Alexander Alekhin [Wed, 8 Jul 2020 20:00:12 +0000 (20:00 +0000)]
Merge pull request #17777 from alalek:backport_cuda_cmake

4 years agoMerge pull request #17745 from alalek:cuda_fix_ccbin
Alexander Alekhin [Wed, 8 Jul 2020 19:59:42 +0000 (19:59 +0000)]
Merge pull request #17745 from alalek:cuda_fix_ccbin

4 years agoAdded a script to measure & report privacy masking camera performance in different...
Dmitry Matveev [Wed, 8 Jul 2020 16:19:37 +0000 (19:19 +0300)]
Added a script to measure & report privacy masking camera performance in different configurations

4 years agoimgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version
Alexander Alekhin [Fri, 26 Jun 2020 22:31:02 +0000 (22:31 +0000)]
imgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version

4 years agoimgproc(test): test bitExact cases in OCL/sepFilter2D
Alexander Alekhin [Sun, 28 Jun 2020 08:14:54 +0000 (08:14 +0000)]
imgproc(test): test bitExact cases in OCL/sepFilter2D

4 years agocmake(cuda): repair ccbin, re-implement execute_process() cache
Alexander Alekhin [Fri, 3 Jul 2020 21:11:11 +0000 (21:11 +0000)]
cmake(cuda): repair ccbin, re-implement execute_process() cache

- preventive fix for arch "11.0" (CUDA_ARCH_BIN_OR_PTX_10 bug)
- new var: OPENCV_CUDA_DETECTION_NVCC_FLAGS
- new var: OPENCV_CMAKE_CUDA_DEBUG

4 years agocmake: backport CUDA scripts
Alexander Alekhin [Wed, 8 Jul 2020 07:28:40 +0000 (07:28 +0000)]
cmake: backport CUDA scripts

4 years agoMerge pull request #17759 from alalek:build_opencv_winpack_dldt_2020.4.0
Alexander Alekhin [Tue, 7 Jul 2020 19:28:53 +0000 (19:28 +0000)]
Merge pull request #17759 from alalek:build_opencv_winpack_dldt_2020.4.0

4 years agoMerge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4
Alexander Alekhin [Tue, 7 Jul 2020 10:36:01 +0000 (10:36 +0000)]
Merge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 6 Jul 2020 23:05:04 +0000 (23:05 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17728 from sturkmen72:patch-4
Alexander Alekhin [Mon, 6 Jul 2020 23:01:27 +0000 (23:01 +0000)]
Merge pull request #17728 from sturkmen72:patch-4

4 years agoMerge pull request #17699 from alalek:build_core_cuda
Alexander Alekhin [Mon, 6 Jul 2020 22:58:17 +0000 (01:58 +0300)]
Merge pull request #17699 from alalek:build_core_cuda

* core(cuda): fix build

- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167

* cmake(cuda): backport workaround for CUDA 11

* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize

* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS

4 years agoMerge pull request #17685 from YashasSamaga:cuda4dnn-cudnn8-support
Alexander Alekhin [Mon, 6 Jul 2020 22:48:07 +0000 (22:48 +0000)]
Merge pull request #17685 from YashasSamaga:cuda4dnn-cudnn8-support

4 years agoMerge pull request #17743 from alalek:test_17666
Alexander Alekhin [Mon, 6 Jul 2020 22:36:35 +0000 (22:36 +0000)]
Merge pull request #17743 from alalek:test_17666

4 years agoMerge pull request #17766 from alalek:backport_17756
Alexander Alekhin [Mon, 6 Jul 2020 21:50:23 +0000 (21:50 +0000)]
Merge pull request #17766 from alalek:backport_17756

4 years agodnn(slice): disable buggy OCV/OCL implementation
Alexander Alekhin [Mon, 6 Jul 2020 14:13:38 +0000 (14:13 +0000)]
dnn(slice): disable buggy OCV/OCL implementation

4 years agodnn(test): add YOLOv4-tiny tests
Alexander Alekhin [Fri, 3 Jul 2020 19:14:05 +0000 (19:14 +0000)]
dnn(test): add YOLOv4-tiny tests

4 years agoMerge pull request #17761 from mshabunin:test-wo-jpg-png
Alexander Alekhin [Mon, 6 Jul 2020 20:02:15 +0000 (20:02 +0000)]
Merge pull request #17761 from mshabunin:test-wo-jpg-png

4 years agoMerge pull request #17754 from YashasSamaga:cuda4dnn-slice-concat-copy-reduction
Alexander Alekhin [Mon, 6 Jul 2020 20:00:51 +0000 (20:00 +0000)]
Merge pull request #17754 from YashasSamaga:cuda4dnn-slice-concat-copy-reduction

4 years agoMerge pull request #17758 from tomoaki0705:fixGapiOpenclTestError
Alexander Alekhin [Mon, 6 Jul 2020 19:57:53 +0000 (19:57 +0000)]
Merge pull request #17758 from tomoaki0705:fixGapiOpenclTestError

4 years agoFixed header paths for some nGraph ops
Ilya Churaev [Mon, 6 Jul 2020 08:11:59 +0000 (11:11 +0300)]
Fixed header paths for some nGraph ops

* Added dependency on IE version

backport of commit: 992c908b566d264b824680d0cf7d668cdf918254

4 years agobuild: winpack_dldt with dldt 2020.4.0
Alexander Alekhin [Sun, 5 Jul 2020 22:16:46 +0000 (22:16 +0000)]
build: winpack_dldt with dldt 2020.4.0

4 years agoimgcodecs: fix test build with disabled JPEG and PNG libs
Maksim Shabunin [Mon, 6 Jul 2020 11:52:52 +0000 (14:52 +0300)]
imgcodecs: fix test build with disabled JPEG and PNG libs

4 years agoavoid kernel compile error on Arm SBCs
Tomoaki Teshima [Mon, 6 Jul 2020 09:27:19 +0000 (18:27 +0900)]
avoid kernel compile error on Arm SBCs

4 years agoMerge pull request #17756 from ilyachur:feature/ichuraev/fix_ngraph_headers
Ilya Churaev [Mon, 6 Jul 2020 08:11:59 +0000 (11:11 +0300)]
Merge pull request #17756 from ilyachur:feature/ichuraev/fix_ngraph_headers

* Fixed header paths for some nGraph ops

* Added dependency on IE version

4 years agoUpdate documentation of imwrite()
Suleyman TURKMEN [Wed, 1 Jul 2020 20:50:09 +0000 (23:50 +0300)]
Update documentation of imwrite()

4 years agoreduce slice, concat to copy; enable more concat fusions
YashasSamaga [Sun, 5 Jul 2020 15:22:35 +0000 (20:52 +0530)]
reduce slice, concat to copy; enable more concat fusions

4 years agoMerge pull request #17729 from modeste2015:3.4
Alexander Alekhin [Sat, 4 Jul 2020 17:17:57 +0000 (17:17 +0000)]
Merge pull request #17729 from modeste2015:3.4

4 years agoMerge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types
Alexander Alekhin [Sat, 4 Jul 2020 17:16:57 +0000 (17:16 +0000)]
Merge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types

4 years agoMerge pull request #17722 from pemmanuelviel:pev--replace-asserts
pemmanuelviel [Sat, 4 Jul 2020 17:15:44 +0000 (19:15 +0200)]
Merge pull request #17722 from pemmanuelviel:pev--replace-asserts

* Clean: replace C style asserts by CV_Assert and CV_DbgAssert

* Try fixing warning on Windows compilation

* Another way trying to fix warnings on Win

* Fixing warnings with some compilers:
Some compilers warn on systematic exit preventing to execute the code that follows.
This is why assert(0) that exits only in debug was working, but not CV_Assert or CV_Error
that exit both in release and debug, even if with different behavior.
In addition, other compilers complain when return 0 is removed from getKey(),
even if before we have a statement leading to systematic exit.

* Disable "unreachable code" warnings for Win compilers so we can use proper CV_Error

4 years agoMerge pull request #17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity
Alexander Alekhin [Sat, 4 Jul 2020 17:14:34 +0000 (17:14 +0000)]
Merge pull request #17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity

4 years agogeneralize axis for concat fusion
YashasSamaga [Sat, 4 Jul 2020 13:27:28 +0000 (18:57 +0530)]
generalize axis for concat fusion

4 years agotransfer output blobs in background
YashasSamaga [Sat, 4 Jul 2020 07:24:56 +0000 (12:54 +0530)]
transfer output blobs in background

4 years agoMerge pull request #17454 from creinders:master
Christoph [Fri, 3 Jul 2020 22:59:19 +0000 (00:59 +0200)]
Merge pull request #17454 from creinders:master

fix instable fisheye undistortPoints

* remove artefacts when (un)distorting fisheye images with large distortion coefficient values

* fix fisheye undistortion when theta is close to zero

* add fisheye image undistort and distort test

* Fixed type conversion warnings

* fixed trailing whitespace

4 years agoMerge pull request #17701 from pemmanuelviel:pev-lshIndexParams-consistency
Alexander Alekhin [Fri, 3 Jul 2020 22:53:44 +0000 (22:53 +0000)]
Merge pull request #17701 from pemmanuelviel:pev-lshIndexParams-consistency

4 years agoMerge pull request #17744 from alalek:issue_17657
Alexander Alekhin [Fri, 3 Jul 2020 21:21:27 +0000 (21:21 +0000)]
Merge pull request #17744 from alalek:issue_17657

4 years agocmake: fix ENABLE_PROFILING
Alexander Alekhin [Fri, 3 Jul 2020 19:31:41 +0000 (19:31 +0000)]
cmake: fix ENABLE_PROFILING

4 years agoMerge pull request #17733 from l-bat:tiny_yolov4
Liubov Batanina [Fri, 3 Jul 2020 18:07:08 +0000 (21:07 +0300)]
Merge pull request #17733 from l-bat:tiny_yolov4

* Supported yolov4-tiny

* Added comments

4 years agoMerge pull request #17725 from pemmanuelviel:pev--precompute-divisor
Alexander Alekhin [Fri, 3 Jul 2020 11:24:11 +0000 (11:24 +0000)]
Merge pull request #17725 from pemmanuelviel:pev--precompute-divisor

4 years agoFix trees parsing behavior in hierarchical_clustering_index:
Pierre-Emmanuel Viel [Thu, 18 Jun 2020 14:30:29 +0000 (16:30 +0200)]
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.

4 years agoMerge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
Alexander Alekhin [Thu, 2 Jul 2020 11:54:28 +0000 (11:54 +0000)]
Merge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments

4 years agoMerge pull request #17708 from shirriff:patch-1
Ken Shirriff [Thu, 2 Jul 2020 10:58:53 +0000 (03:58 -0700)]
Merge pull request #17708 from shirriff:patch-1

Clarify component statistics documentation

* Change ConnectedComponentsTypes documentation

Change from "algorithm output formats" to "statistics" because it specifies types of statistics, not formats.

* Documentation: clarify component statistics

Explain that ConnectedComponentTypes selects a statistic.

4 years agoforget to look in sub folder of include/openblas
Heritier Kinke [Thu, 2 Jul 2020 01:27:34 +0000 (03:27 +0200)]
forget to look in sub folder of include/openblas

4 years agoMerge pull request #17723 from pemmanuelviel:pev--remove-duplicate
Alexander Alekhin [Wed, 1 Jul 2020 18:14:08 +0000 (18:14 +0000)]
Merge pull request #17723 from pemmanuelviel:pev--remove-duplicate

4 years agoFix arguments list in loadindex for histogram intersection
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:20:02 +0000 (18:20 +0200)]
Fix arguments list in loadindex for histogram intersection

4 years agoPrecompute the divisor to ensure that no kind of compiler would process it on the...
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:52:05 +0000 (18:52 +0200)]
Precompute the divisor to ensure that no kind of compiler would process it on the fly at each call.

4 years agoMix of 32 and 64bits vector types prevents vectorisation for distance computation.
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:27:07 +0000 (18:27 +0200)]
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.

4 years agoRemove duplicate line
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:15:01 +0000 (18:15 +0200)]
Remove duplicate line

4 years agoFix genericity of computeNodeStatistics that couldn't compute stats properly on sub...
Pierre-Emmanuel Viel [Tue, 30 Jun 2020 22:43:42 +0000 (00:43 +0200)]
Fix genericity of computeNodeStatistics that couldn't compute stats properly on sub-nodes

4 years agoMerge pull request #17700 from asmorkalov:as/cuda_cmake_compat
Alexander Alekhin [Tue, 30 Jun 2020 19:55:53 +0000 (19:55 +0000)]
Merge pull request #17700 from asmorkalov:as/cuda_cmake_compat

4 years agoadd cuDNN 8 support
YashasSamaga [Tue, 30 Jun 2020 16:21:23 +0000 (21:51 +0530)]
add cuDNN 8 support

4 years agoType consistency for all xxxIndexParams integer arguments as well as with miniflann...
Pierre-Emmanuel Viel [Tue, 30 Jun 2020 08:33:07 +0000 (10:33 +0200)]
Type consistency for all xxxIndexParams integer arguments as well as with miniflann's LshIndexParams

4 years agoRestored compatibility with CMake older than 3.7.
Alexander Smorkalov [Tue, 30 Jun 2020 08:28:36 +0000 (11:28 +0300)]
Restored compatibility with CMake older than 3.7.

4 years agouse universal SIMD intrinsics for SIFT
Yosshi999 [Tue, 30 Jun 2020 06:41:55 +0000 (06:41 +0000)]
use universal SIMD intrinsics for SIFT

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 29 Jun 2020 21:00:18 +0000 (21:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
Alexander Alekhin [Mon, 29 Jun 2020 20:53:34 +0000 (20:53 +0000)]
Merge pull request #17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast

4 years agoMerge pull request #17696 from dbudniko:dbudniko/g_api_fix_min_max
Alexander Alekhin [Mon, 29 Jun 2020 19:54:40 +0000 (19:54 +0000)]
Merge pull request #17696 from dbudniko:dbudniko/g_api_fix_min_max

4 years agoMerge pull request #17695 from alalek:issue_17677
Alexander Alekhin [Mon, 29 Jun 2020 19:15:24 +0000 (19:15 +0000)]
Merge pull request #17695 from alalek:issue_17677

4 years agoMerge pull request #17686 from alalek:cmake_cuda_cxx_flag
Alexander Alekhin [Mon, 29 Jun 2020 19:13:59 +0000 (19:13 +0000)]
Merge pull request #17686 from alalek:cmake_cuda_cxx_flag