Alexander Alekhin [Mon, 29 Jun 2020 21:00:18 +0000 (21:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
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
Alexander Alekhin [Mon, 29 Jun 2020 19:15:24 +0000 (19:15 +0000)]
Merge pull request #17695 from alalek:issue_17677
Alexander Alekhin [Mon, 29 Jun 2020 19:13:59 +0000 (19:13 +0000)]
Merge pull request #17686 from alalek:cmake_cuda_cxx_flag
Dmitry Budnikov [Mon, 29 Jun 2020 17:57:44 +0000 (20:57 +0300)]
min max fix for standalone
Alexander Alekhin [Mon, 29 Jun 2020 17:46:09 +0000 (17:46 +0000)]
cmake(gapi): fix opencv_world build for winpack
Alexander Alekhin [Sun, 28 Jun 2020 22:49:00 +0000 (01:49 +0300)]
cmake(cuda): update handling of -std=c++11/14 flags
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
cyy [Sat, 27 Jun 2020 20:34:44 +0000 (04:34 +0800)]
Merge pull request #17499 from cyyever:fix_CUDA11
Fix cuda11
* use cudnn_version.h to detect version when it is available
* remove nppi from CUDA11
* use ocv_list_filterout
* dnn(cuda): temporary disable CUDNN 8.0
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:12:08 +0000 (20:12 +0000)]
Merge pull request #17665 from komakai:fix-ios-dynamic-build
Alexander Alekhin [Sat, 27 Jun 2020 20:08:36 +0000 (20:08 +0000)]
Merge pull request #17567 from dev-tronifier:new_branch
Alexander Alekhin [Fri, 26 Jun 2020 22:51:34 +0000 (22:51 +0000)]
Merge pull request #17671 from tomoaki0705:fixCUDANativeDetection
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
Dmitry Budnikov [Fri, 26 Jun 2020 19:41:29 +0000 (22:41 +0300)]
Merge pull request #17020 from dbudniko:dbudniko/serialization_backend
G-API Serialization routines
* Serialization backend in tests, initial version
* S11N/00: A Great Rename
- "Serialization" is too long and too error-prone to type,
so now it is renamed to "s11n" everywhere;
- Same applies to "SRLZ";
- Tests also renamed to start with 'S11N.*' (easier to run);
- Also updated copyright years in new files to 2020.
* S11N/01: Some basic interface segregation
- Moved some details (low-level functions) out of serialization.hpp;
- Introduced I::IStream and I::OStream interfaces;
- Implemented those via the existing [De]SerializationStream classes;
- Moved all operators to use interfaces instead of classes;
- Moved the htonl/ntohl handling out of operators (to the classes).
The implementation didn't change much, it is a subject to the further
refactoring
* S11N/02: Basic operator reorg, basic tests, vector support
- Reorganized operators on atomic types to follow >>/<< model
(put them closer in the code for the respective types);
- Introduce more operators for basic (scalar) types;
- Drop all vector s11n overloads -- replace with a generic
(template-based) one;
- Introduced a new test suite where low-level s11n functionality
is tested (for the basic types).
* S11N/03: Operators reorganization
- Sorted the Opaque types enum by complexity;
- Reorganized the existing operators for basic types, also ordered by
complexity;
- Organized operators in three groups (Basics, OpenCV, G-API);
- Added a generic serialization for variant<>;
- Reimplemented some of the existing operators (for OpenCV and G-API
data structures);
- Introduced new operators for cv::gimpl data types. These operators
(and so, the data structures) are not yet used in the graph
dump/reconstruction routine, it will be done as a next step.
* S11N/04: The Great Clean-up
- Drop the duplicates of GModel data structures from the
serialization, serialize the GModel data structures themselve
instead (hand-written code replaced with operators).
- Also removed usuned code for printing, etc.
* S11N/05: Internal API Clean-up
- Minimize the serialization API to just Streams and Operators;
- Refactor and fix the graph serialization (deconstruction and
reconstruction) routines, fix data addressing problems there;
- Move the serialization.[ch]pp files to the core G-API library
* S11N/06: Top-level API introduction
- !!!This is likely the most invasive commit in the series!!!
- Introduced a top-level API to serialize and deserialize a GComputation
- Extended the compiler to support both forms of a GComputation:
an expession based and a deserialized one. This has led to changes in
the cv::GComputation::Priv and in its dependent components (even the
transformation tests);
- Had to extend the kernel API (GKernel) with extra information on
operations (mainly `outMeta`) which was only available for expression
based graphs. Now the `outMeta` can be taken from kernels too (and for
the deserialized graphs it is the only way);
- Revisited the internal serialization API, had to expose previously
hidden entities (like `GSerialized`);
- Extended the serialized graph info with new details (object counter,
protocol). Added unordered_map generic serialization for that;
- Reworked the very first pipeline test to be "proper"; GREEN now, the rest
is to be reworked in the next iteration.
* S11N/07: Tests reworked
- Moved the sample pipeline tests w/serialization to
test the public API (`cv::gapi::serialize`, then
followed by `cv::gapi::deserialize<>`). All GREEN.
- As a consequence, dropped the "Serialization" test
backend as no longer necessary.
* S11N/08: Final touches
- Exposed the C++ native data types at Streams level;
- Switched the ByteMemoryIn/OutStreams to store data in `char`
internally (2x less memory for sample pipelines);
- Fixed and refactored Mat dumping to the stream;
- Renamed S11N pipeline tests to their new meaning.
* linux build fix
* fix RcDesc and int uint warnings
* more Linux build fix
* white space and virtual android error fix (attempt)
* more warnings to be fixed
* android warnings fix attempt
* one more attempt for android build fix
* android warnings one more fix
* return back override
* avoid size_t
* static deserialize
* and how do you like this, elon? anonymous namespace to fix android warning.
* static inline
* trying to fix standalone build
* mat dims fix
* fix mat r/w for standalone
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
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
Tomoaki Teshima [Fri, 26 Jun 2020 07:36:59 +0000 (16:36 +0900)]
fix native detection on Jetson
Giles Payne [Thu, 25 Jun 2020 12:27:31 +0000 (21:27 +0900)]
Dynamic build for Objective-C/Swift wrapper
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:42:58 +0000 (09:42 +0000)]
Merge pull request #17658 from ilya-lavrenov:get-layer-by-name
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
Ilya Lavrenov [Wed, 24 Jun 2020 20:58:18 +0000 (23:58 +0300)]
Conditional compilation for IR v7 support
Alexander Alekhin [Thu, 25 Jun 2020 08:22:20 +0000 (08:22 +0000)]
Merge pull request #17584 from AsyaPronina:gapi_state_init_params_via_compile_args
Anastasiya [Wed, 24 Jun 2020 21:43:12 +0000 (00:43 +0300)]
Enable state initialization params via compile_args
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 09:44:51 +0000 (09:44 +0000)]
Merge pull request #17605 from TolyaTalamanov:at/fix-plaidml-kernels-function
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 19:15:47 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 23 Jun 2020 18:44:50 +0000 (18:44 +0000)]
Merge pull request #17621 from YashasSamaga:cuda4dnn-mish-half
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
Alexander Alekhin [Tue, 23 Jun 2020 12:51:21 +0000 (12:51 +0000)]
Merge pull request #17634 from dkurt:dnn_ie_cpu_ext_update_master
okamotoR [Tue, 23 Jun 2020 12:36:47 +0000 (21:36 +0900)]
add if block for indexed color images
Dmitry Kurtaev [Mon, 22 Jun 2020 18:35:52 +0000 (21:35 +0300)]
Remove deprecated Inference Engine CPU extensions
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
YashasSamaga [Mon, 22 Jun 2020 13:39:36 +0000 (19:09 +0530)]
use fp32 mish for fp16 mish
Alexander Alekhin [Mon, 22 Jun 2020 12:10:34 +0000 (12:10 +0000)]
Merge pull request #17616 from ilya-lavrenov:network-reader
Alexander Alekhin [Mon, 22 Jun 2020 11:36:40 +0000 (11:36 +0000)]
Merge pull request #17576 from philippefoubert:branch_ximea
Alexander Alekhin [Mon, 22 Jun 2020 11:33:35 +0000 (11:33 +0000)]
Merge pull request #17617 from alalek:fix_logger_initialization
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 [Mon, 22 Jun 2020 09:27:26 +0000 (09:27 +0000)]
core(logger): complete initialization of logger structures
- for using of logging functions from global destructors
Ilya Lavrenov [Mon, 22 Jun 2020 08:45:56 +0000 (11:45 +0300)]
Conditional compilation for network reader
Anatoliy Talamanov [Sun, 21 Jun 2020 21:46:41 +0000 (00:46 +0300)]
Add implementation in case plaidml isn't found
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 [Sat, 20 Jun 2020 21:07:05 +0000 (21:07 +0000)]
Merge pull request #17526 from cyyever:fix_cuda_detection
Philippe FOUBERT [Thu, 18 Jun 2020 09:09:08 +0000 (11:09 +0200)]
Fix the detection of the XIMEA library (since its location may be different when the version of the ximea software is updated)
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:33:50 +0000 (07:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
Yashas Samaga B L [Wed, 17 Jun 2020 09:07:52 +0000 (14:37 +0530)]
Merge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs
cuda4dnn: reduce CUDA version requirements to at least CUDA 9.2
* remove half2 specializations
* do not remove atomicAdd for half in CUDA 10 and below
* remove fp16.hpp
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
Alexander Alekhin [Wed, 17 Jun 2020 07:58:35 +0000 (07:58 +0000)]
Merge pull request #17555 from komakai:objc-fix-sift
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
Alexander Alekhin [Tue, 16 Jun 2020 19:53:51 +0000 (19:53 +0000)]
Merge pull request #17561 from thatoddmailbox:android-fix-disable-samples
Pinaev Danil [Tue, 16 Jun 2020 19:48:09 +0000 (22:48 +0300)]
Merge pull request #16772 from aDanPin:dp/performance_render_tests
Added g-api render performance tests
* Add render performance tests for BGROCV
* Add render NV12 performance tests
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
* Just a small fix
* Final review response I hope)
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
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.
Alex Studer [Tue, 16 Jun 2020 04:11:26 +0000 (00:11 -0400)]
platforms/android: fix --no_samples_build flag not working
Giles Payne [Mon, 15 Jun 2020 23:15:27 +0000 (08:15 +0900)]
Cleanup unneeded raw pointer handling code
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
Alexander Alekhin [Mon, 15 Jun 2020 18:02:03 +0000 (18:02 +0000)]
Merge pull request #17554 from ilya-lavrenov:plugin-dispatcher
Namgoo Lee [Mon, 15 Jun 2020 16:43:51 +0000 (01:43 +0900)]
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
Giles Payne [Mon, 15 Jun 2020 14:17:19 +0000 (23:17 +0900)]
Use cv::Ptr instead of raw pointers
Giles Payne [Mon, 15 Jun 2020 14:16:22 +0000 (23:16 +0900)]
Fix testFitEllipse test
Giles Payne [Mon, 15 Jun 2020 14:15:05 +0000 (23:15 +0900)]
Fix framework_name option in build script
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher
Alexander Alekhin [Sun, 14 Jun 2020 11:08:53 +0000 (11:08 +0000)]
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
Alexander Alekhin [Sun, 14 Jun 2020 11:08:16 +0000 (11:08 +0000)]
Merge pull request #17527 from tomoaki0705:detectCuvidHeader