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
Alexander Alekhin [Tue, 7 Jul 2020 10:36:01 +0000 (10:36 +0000)]
Merge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4
Alexander Alekhin [Mon, 6 Jul 2020 23:01:27 +0000 (23:01 +0000)]
Merge pull request #17728 from sturkmen72:patch-4
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
Alexander Alekhin [Mon, 6 Jul 2020 22:36:35 +0000 (22:36 +0000)]
Merge pull request #17743 from alalek:test_17666
Alexander Alekhin [Mon, 6 Jul 2020 21:50:23 +0000 (21:50 +0000)]
Merge pull request #17766 from alalek:backport_17756
Alexander Alekhin [Mon, 6 Jul 2020 14:13:38 +0000 (14:13 +0000)]
dnn(slice): disable buggy OCV/OCL implementation
Alexander Alekhin [Fri, 3 Jul 2020 19:14:05 +0000 (19:14 +0000)]
dnn(test): add YOLOv4-tiny tests
Alexander Alekhin [Mon, 6 Jul 2020 20:02:15 +0000 (20:02 +0000)]
Merge pull request #17761 from mshabunin:test-wo-jpg-png
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
Alexander Alekhin [Sun, 5 Jul 2020 22:16:46 +0000 (22:16 +0000)]
build: winpack_dldt with dldt 2020.4.0
Maksim Shabunin [Mon, 6 Jul 2020 11:52:52 +0000 (14:52 +0300)]
imgcodecs: fix test build with disabled JPEG and PNG libs
Suleyman TURKMEN [Wed, 1 Jul 2020 20:50:09 +0000 (23:50 +0300)]
Update documentation of imwrite()
Alexander Alekhin [Sat, 4 Jul 2020 17:17:57 +0000 (17:17 +0000)]
Merge pull request #17729 from modeste2015:3.4
Alexander Alekhin [Sat, 4 Jul 2020 17:16:57 +0000 (17:16 +0000)]
Merge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types
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
Alexander Alekhin [Sat, 4 Jul 2020 17:14:34 +0000 (17:14 +0000)]
Merge pull request #17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity
YashasSamaga [Sat, 4 Jul 2020 13:27:28 +0000 (18:57 +0530)]
generalize axis for concat fusion
Alexander Alekhin [Fri, 3 Jul 2020 21:21:27 +0000 (21:21 +0000)]
Merge pull request #17744 from alalek:issue_17657
Alexander Alekhin [Fri, 3 Jul 2020 19:31:41 +0000 (19:31 +0000)]
cmake: fix ENABLE_PROFILING
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
Alexander Alekhin [Fri, 3 Jul 2020 11:24:11 +0000 (11:24 +0000)]
Merge pull request #17725 from pemmanuelviel:pev--precompute-divisor
Alexander Alekhin [Thu, 2 Jul 2020 11:54:28 +0000 (11:54 +0000)]
Merge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
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.
Heritier Kinke [Thu, 2 Jul 2020 01:27:34 +0000 (03:27 +0200)]
forget to look in sub folder of include/openblas
Alexander Alekhin [Wed, 1 Jul 2020 18:14:08 +0000 (18:14 +0000)]
Merge pull request #17723 from pemmanuelviel:pev--remove-duplicate
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:20:02 +0000 (18:20 +0200)]
Fix arguments list in loadindex for histogram intersection
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.
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.
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:15:01 +0000 (18:15 +0200)]
Remove duplicate line
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
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
Pierre-Emmanuel Viel [Sun, 28 Jun 2020 14:55:50 +0000 (16:55 +0200)]
Add test checking we don't throw when creating GenericIndex with LshIndexParams()
Pierre-Emmanuel Viel [Tue, 16 Jun 2020 14:51:41 +0000 (16:51 +0200)]
Fix the 'cvflann::anyimpl::bad_any_cast' error using Lsh
Alexander Alekhin [Sat, 27 Jun 2020 20:17:16 +0000 (20:17 +0000)]
Merge pull request #17636 from okamotoR:3.4
Alexander Alekhin [Sat, 27 Jun 2020 20:08:36 +0000 (20:08 +0000)]
Merge pull request #17567 from dev-tronifier:new_branch
pemmanuelviel [Fri, 26 Jun 2020 22:34:52 +0000 (00:34 +0200)]
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
dev-tronifier [Wed, 17 Jun 2020 06:30:18 +0000 (12:00 +0530)]
Increased portability of CV_Func
Alexander Alekhin [Fri, 26 Jun 2020 19:22:20 +0000 (19:22 +0000)]
Merge pull request #17638 from pemmanuelviel:pev--avoid-branching-in-loop
Alexander Alekhin [Fri, 26 Jun 2020 17:41:53 +0000 (17:41 +0000)]
Merge pull request #17663 from alalek:backport_17658
Yosshi999 [Thu, 25 Jun 2020 11:34:31 +0000 (20:34 +0900)]
Merge pull request #17618 from Yosshi999:gsoc_sift-better-test
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
Ilya Lavrenov [Wed, 24 Jun 2020 20:58:18 +0000 (23:58 +0300)]
Conditional compilation for IR v7 support
backported commit
86905754e482fb265731840dcf9b36e6a2675c0d
Alexander Alekhin [Thu, 25 Jun 2020 09:12:40 +0000 (09:12 +0000)]
Merge pull request #17641 from pemmanuelviel:pev--fix-middleSplit-for-kdtree-single
Alexander Alekhin [Wed, 24 Jun 2020 10:57:37 +0000 (10:57 +0000)]
Merge pull request #17650 from alalek:update_libjpeg-turbo
Alexander Alekhin [Wed, 24 Jun 2020 10:57:07 +0000 (10:57 +0000)]
Merge pull request #17648 from alalek:update_libjpeg
Alexander Alekhin [Wed, 24 Jun 2020 06:28:16 +0000 (06:28 +0000)]
3rdparty: libjpeg-turbo 2.0.4 => 2.0.5
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5
Alexander Alekhin [Tue, 23 Jun 2020 20:35:56 +0000 (20:35 +0000)]
3rdparty: libjpeg 9d
http://www.ijg.org/files/jpegsrc.v9d.tar.gz
Alexander Alekhin [Tue, 23 Jun 2020 18:43:50 +0000 (18:43 +0000)]
Merge pull request #17624 from dkurt:dnn_optimize_mish
Alexander Alekhin [Tue, 23 Jun 2020 18:29:55 +0000 (18:29 +0000)]
Merge pull request #17633 from alalek:backport_17616
Pierre-Emmanuel Viel [Sat, 16 May 2020 18:13:00 +0000 (20:13 +0200)]
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")
Pierre-Emmanuel Viel [Sat, 16 May 2020 22:06:47 +0000 (00:06 +0200)]
Optim: test that could be done once has been extracted from the loop
okamotoR [Tue, 23 Jun 2020 12:36:47 +0000 (21:36 +0900)]
add if block for indexed color images
Ilya Lavrenov [Mon, 22 Jun 2020 08:45:56 +0000 (11:45 +0300)]
Conditional compilation for network reader
origibal commit:
63e92cccf2c38c3c7a041d7968063a9a2445d40c
Alexander Alekhin [Tue, 23 Jun 2020 11:01:47 +0000 (11:01 +0000)]
Merge pull request #17622 from dkurt:dnn_ie_cpu_ext_update
Dmitry Kurtaev [Mon, 22 Jun 2020 18:35:52 +0000 (21:35 +0300)]
Remove deprecated Inference Engine CPU extensions
Dmitry Kurtaev [Mon, 22 Jun 2020 20:22:21 +0000 (23:22 +0300)]
Optimize Mish for CPU backend
Alexander Alekhin [Mon, 22 Jun 2020 10:31:33 +0000 (10:31 +0000)]
Merge pull request #17592 from l-bat:disable_nms_in_yolo_layer
Alexander Alekhin [Sun, 21 Jun 2020 17:49:14 +0000 (17:49 +0000)]
Merge pull request #17599 from tomoaki0705:fixCUDAFailSafePath
Tomoaki Teshima [Sat, 20 Jun 2020 22:20:47 +0000 (07:20 +0900)]
make the fail safe path actually safe
* use only supported CC in the list
* workaround of #17526
Alexander Alekhin [Sat, 20 Jun 2020 22:01:36 +0000 (22:01 +0000)]
Merge pull request #17593 from tomoaki0705:addAmpereCUDA
Alexander Alekhin [Fri, 19 Jun 2020 21:35:07 +0000 (21:35 +0000)]
Merge pull request #17580 from sitic:bibfix
Tomoaki Teshima [Fri, 19 Jun 2020 11:46:18 +0000 (20:46 +0900)]
add Ampere CC
* Ampere has CC 8.0
* Arm64 server support has been added in CUDA 11 (only V100 for now)
Liubov Batanina [Fri, 19 Jun 2020 11:34:13 +0000 (14:34 +0300)]
Disabling dafault NMS in yolo layer
Jan Lebert [Thu, 18 Jun 2020 11:30:36 +0000 (13:30 +0200)]
docs: linkfix in bibliography
The [current link](https://arxiv.org/pdf/1808.01752) goes to a
random unrelated paper.
Alexander Alekhin [Fri, 19 Jun 2020 07:21:19 +0000 (07:21 +0000)]
Merge pull request #17587 from tomoaki0705:fixCUDAOptflowJetson
Tomoaki Teshima [Thu, 18 Jun 2020 22:56:37 +0000 (07:56 +0900)]
fix build on Jetson TX1 and TX2
* enable_if_t is a c++14 feature
Alexander Alekhin [Thu, 18 Jun 2020 20:54:28 +0000 (20:54 +0000)]
Merge pull request #17581 from tomoaki0705:fixCudaAsync
Alexander Alekhin [Thu, 18 Jun 2020 20:52:33 +0000 (20:52 +0000)]
Merge pull request #17578 from Bleach665:fix_win_eigen_build
Alexander Alekhin [Thu, 18 Jun 2020 20:51:52 +0000 (20:51 +0000)]
Merge pull request #17577 from philippefoubert:branch_color_yuv_simd
Philippe FOUBERT [Thu, 18 Jun 2020 09:48:43 +0000 (11:48 +0200)]
Fix the build of imgproc using MinGW (variables with the same name as symbols defined in MinGW headers)
Tomoaki Teshima [Thu, 18 Jun 2020 12:25:15 +0000 (21:25 +0900)]
fix build error on Jetson TX1 and TX2
* enable_if_t and is_base_of is c++14 feature
* override is c++11 feature
Yuriy Obukh [Thu, 18 Jun 2020 11:31:11 +0000 (14:31 +0300)]
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
Alex Cohn [Thu, 18 Jun 2020 07:40:43 +0000 (10:40 +0300)]
Merge pull request #17573 from alexcohn:fix/android_windows_build
* fixing #17572
https://github.com/opencv/opencv/issues/17572 Build for Android failed: "can't concat str to bytes"
on Windows 10 64bit with python 3.6.6
* similar to changes in platforms/winpack_dldt/build_package.py
Alexander Alekhin [Thu, 18 Jun 2020 07:39:14 +0000 (07:39 +0000)]
Merge pull request #17571 from tomoaki0705:fixAutomaticCC
Alexander Alekhin [Thu, 18 Jun 2020 07:38:16 +0000 (07:38 +0000)]
Merge pull request #17568 from alalek:cleanup_17527
Tomoaki Teshima [Wed, 17 Jun 2020 13:02:51 +0000 (22:02 +0900)]
fix build error of automatic CC detection
Alexander Alekhin [Tue, 16 Jun 2020 02:14:04 +0000 (02:14 +0000)]
cudacodec(build): fix detection in CMake, cleanup duplicate includes
NesQl [Wed, 17 Jun 2020 09:05:04 +0000 (17:05 +0800)]
Merge pull request #17468 from liqi-c:sharedlib_build_problem
TEngine installation rules fix for static build
* Modify cmake config error for -DBUILD_SHARED_LIBS=OFF
* Modify for not install tengine include directory
* Update compile error.
* move install command to tengine/CMakeLists.txt
* rm include dir when make install,only build static lib will install libtengine.a
Alexander Alekhin [Wed, 17 Jun 2020 08:45:55 +0000 (08:45 +0000)]
Merge pull request #17564 from l-bat:fix_yolov4
Liubov Batanina [Tue, 16 Jun 2020 17:09:25 +0000 (20:09 +0300)]
Changed StridedSlice to VariadicSplit in Region layer
Alexander Alekhin [Tue, 16 Jun 2020 20:06:56 +0000 (20:06 +0000)]
Merge pull request #17556 from nglee:dev_optFlowTVL1Async
Namgoo Lee [Tue, 16 Jun 2020 16:04:22 +0000 (01:04 +0900)]
cuda optflow tvl1 : async safety
also modify cuda canny to use createTextureObjectPitch2D, etc.
Alexander Alekhin [Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)]
Merge pull request #17557 from alalek:backport_17554
Alexander Alekhin [Mon, 15 Jun 2020 18:38:19 +0000 (18:38 +0000)]
Merge pull request #17533 from alalek:fix_dumpInputArray_nd_case
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher
backport of commit
74113737f3710069e5ae2daff09e77c824dd5a2b
Namgoo Lee [Mon, 15 Jun 2020 16:43:51 +0000 (01:43 +0900)]
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
Alexander Alekhin [Sun, 14 Jun 2020 11:08:16 +0000 (11:08 +0000)]
Merge pull request #17527 from tomoaki0705:detectCuvidHeader
Alexander Alekhin [Sat, 13 Jun 2020 18:36:34 +0000 (18:36 +0000)]
Merge pull request #17537 from Murazaki:patch-1
Alexander Alekhin [Fri, 12 Jun 2020 22:18:04 +0000 (22:18 +0000)]
Merge pull request #17536 from ilya-lavrenov:remove-error-listener
Mehdi Zakaria Benadel [Fri, 12 Jun 2020 18:59:43 +0000 (20:59 +0200)]
Fix typo
This typo just made me lose my mind on the conan package update. please merge.
Alexander Alekhin [Fri, 12 Jun 2020 21:24:34 +0000 (21:24 +0000)]
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0
Ilya Lavrenov [Fri, 12 Jun 2020 17:27:21 +0000 (20:27 +0300)]
Removed error lisneter usage
Alexander Alekhin [Tue, 7 Apr 2020 13:17:21 +0000 (16:17 +0300)]
dnn: use OpenVINO 2020.3 defines
Alexander Alekhin [Fri, 12 Jun 2020 10:07:58 +0000 (10:07 +0000)]
core: fix handling of ND-arrays in dumpInputArray() helpers
Alexander Alekhin [Fri, 12 Jun 2020 09:44:42 +0000 (09:44 +0000)]
Merge pull request #17143 from cyyever:detect_mkl_installed_by_nuget
cyy [Sat, 29 Feb 2020 10:59:43 +0000 (18:59 +0800)]
improve the mkl search procedure
Alexander Alekhin [Fri, 12 Jun 2020 06:58:14 +0000 (06:58 +0000)]
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
Jessica Wong [Thu, 21 May 2020 12:36:19 +0000 (08:36 -0400)]
Added information to OpenCV documentation [MacOS]
Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340
Tomoaki Teshima [Thu, 11 Jun 2020 14:06:18 +0000 (23:06 +0900)]
fix corner case of libnvcuvid
* detect header automatically and not based on version number
Alexander Alekhin [Wed, 10 Jun 2020 12:13:06 +0000 (12:13 +0000)]
Merge pull request #17511 from mshabunin:fix-kw-issues-34