Alexander Alekhin [Wed, 18 Dec 2019 14:41:58 +0000 (14:41 +0000)]
Merge pull request #16082 from YashasSamaga:cuda4dnn-roi-pooling
Alexander Alekhin [Tue, 17 Dec 2019 18:58:12 +0000 (18:58 +0000)]
Merge pull request #16171 from YashasSamaga:cuda4dnn-tensor-cores
Alexander Alekhin [Tue, 17 Dec 2019 12:03:55 +0000 (12:03 +0000)]
Merge pull request #16083 from alalek:issue_14961
Alexander Alekhin [Fri, 6 Dec 2019 12:59:06 +0000 (15:59 +0300)]
gapi(test): avoid using of unstable random floating-point input
Orest Chura [Tue, 17 Dec 2019 08:00:49 +0000 (11:00 +0300)]
Merge pull request #15942 from OrestChura:fb_tutorial
G-API: Tutorial: Face beautification algorithm implementation
* Introduce a tutorial on face beautification algorithm
- small typo issue in render_ocv.cpp
* Addressing comments rgarnov smirnov-alexey
Alexander Alekhin [Mon, 16 Dec 2019 21:30:30 +0000 (21:30 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Tatsuro Shibamura [Mon, 16 Dec 2019 21:23:30 +0000 (06:23 +0900)]
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
Alexander Alekhin [Mon, 16 Dec 2019 20:14:31 +0000 (20:14 +0000)]
Merge pull request #16177 from cudawarped:fix_python_cudaarithm
cudawarped [Mon, 16 Dec 2019 18:38:58 +0000 (18:38 +0000)]
Fix mistake introcuded in previous PR and increase test coverage to avod this happening again
Alexander Alekhin [Mon, 16 Dec 2019 16:17:02 +0000 (16:17 +0000)]
Merge pull request #16172 from alalek:dnn_fix_keypoints_test
Alexander Alekhin [Mon, 16 Dec 2019 14:43:06 +0000 (17:43 +0300)]
dnn(test): fix Test_Model.Keypoints* tests
YashasSamaga [Mon, 16 Dec 2019 10:08:12 +0000 (15:38 +0530)]
enable tensor cores for fp16 convolutions
Alexander Alekhin [Sun, 15 Dec 2019 11:23:46 +0000 (11:23 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Sajarin [Sun, 15 Dec 2019 09:42:19 +0000 (04:42 -0500)]
Merge pull request #16100 from sajarindider:brief
* (doc): added info about STAR
* (doc): fixed typos and sentence structure
* fixed trailing whitespaces
Alexander Alekhin [Sun, 15 Dec 2019 09:28:08 +0000 (09:28 +0000)]
Merge pull request #16159 from alalek:imgcodecs_bmp_ubsan_enum_handling
Yashas Samaga B L [Sat, 14 Dec 2019 19:26:58 +0000 (00:56 +0530)]
Merge pull request #16092 from YashasSamaga:cuda4dnn-conv-act-fuse
cuda4dnn: fuse activations with convolutions
* fuse ReLU, ReLU6, TanH, Sigmoid with conv
* fix OpenCL errors
* improve ReLU, add power, swish and mish
* fix missing fusion entries
* fix handling of unsetAttached
* remove whole file indentation
* optimize power = 1.0, use IDENTITY instead of NONE
* handle edge case: change backend and then clear
Alexander Alekhin [Sat, 14 Dec 2019 18:51:21 +0000 (18:51 +0000)]
Merge pull request #16163 from alalek:fix_16122
Alexander Alekhin [Sat, 14 Dec 2019 15:02:43 +0000 (15:02 +0000)]
cmake: fix OpenCV_ARCH
Alexander Alekhin [Fri, 13 Dec 2019 15:35:04 +0000 (18:35 +0300)]
imgcodecs(bmp): make happy UBSAN with enum value range check
Xuanda Yang [Fri, 13 Dec 2019 15:29:39 +0000 (23:29 +0800)]
Merge pull request #16156 from TH3CHARLie:3.4
* Eltwise::DIV support in Halide backend
* fix typo
* remove div from generated test suite to pass CI, switching to manual test...
* ensure divisor not near to zero
* use randu
* dnn(test): update test data for Eltwise.Accuracy/DIV layer test
Diego [Fri, 13 Dec 2019 15:00:06 +0000 (16:00 +0100)]
Merge pull request #15189 from dvd42:keypoints_module
Keypoints module
Alexander Alekhin [Fri, 13 Dec 2019 14:54:42 +0000 (17:54 +0300)]
Merge pull request #16157 from alalek:update_libwebp_1.0.3
* 3rdparty: update libwebp 1.0.2 => 1.0.3
https://github.com/webmproject/libwebp/releases/tag/v1.0.3
* 3rdparty(libwebp): re-apply patches
Alexander Alekhin [Fri, 13 Dec 2019 14:52:40 +0000 (17:52 +0300)]
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
Alexander Alekhin [Fri, 13 Dec 2019 14:51:37 +0000 (14:51 +0000)]
Merge pull request #16148 from alalek:doxygen_update_config
Alexander Alekhin [Fri, 13 Dec 2019 14:51:19 +0000 (14:51 +0000)]
Merge pull request #16122 from alalek:cmake_update_cpu_compiler_detection
Alexander Alekhin [Fri, 13 Dec 2019 13:43:58 +0000 (13:43 +0000)]
Merge pull request #16153 from vsuyi:master
ysy [Fri, 13 Dec 2019 08:24:08 +0000 (16:24 +0800)]
fix wrong method name
Alexander Alekhin [Fri, 13 Dec 2019 01:13:00 +0000 (01:13 +0000)]
doc: update doxygen configuration
Alexander Alekhin [Thu, 12 Dec 2019 18:34:12 +0000 (18:34 +0000)]
Merge pull request #16141 from OrestChura:oc/fix-standalone-build
RAJKIRAN NATARAJAN [Thu, 12 Dec 2019 16:23:57 +0000 (16:23 +0000)]
Merge pull request #15966 from saskatchewancatch:issue-15760
Add checks for empty operands in Matrix expressions that don't check properly
* Starting to add checks for empty operands in Matrix expressions that
don't check properly.
* Adding checks and delcarations for checker functions
* Fix signatures and add checks for each class of Matrix Expr operation
* Make it catch the right exception
* Don't expose helper functions to public API
atalaman [Thu, 12 Dec 2019 16:10:14 +0000 (19:10 +0300)]
Merge pull request #16080 from TolyaTalamanov:at/fix-mosaic-primitive
G-API: Mosaic handle corner cases
* Handle corner cases
* Fix mosaic algo
* Fix bug with empty rects
Dmitry Matveev [Thu, 12 Dec 2019 15:48:38 +0000 (18:48 +0300)]
Merge pull request #16066 from dmatveev:dm/gapi_slides
* G-API: Added G-API Overview slides & its source code
- Sample code snippets are moved to separate files;
- Introduced a separate benchmark to measure Fluid/OpenCV
performance;
- Added notes on API changes (it is still a 4.0, not a 4.2 talk!)
- Added a "Metropolis" beamer download-n-build script.
* G-API: Addressed review issues on G-API overview slides
OrestChura [Thu, 12 Dec 2019 14:30:58 +0000 (17:30 +0300)]
Fix standalone-gapi
Alexander Alekhin [Thu, 12 Dec 2019 10:02:19 +0000 (13:02 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Paul Murphy [Thu, 12 Dec 2019 10:00:44 +0000 (04:00 -0600)]
Merge pull request #16138 from pmur:reg_16137
* imgproc: Prevent 1B overrun of 8C3 SIMD optimization
The fourth value read via v_load_q is essentially ignored,
but can cause trouble if it happens to cross page boundaries.
The final few iterations may attempt to read the most extreme
elements of S, which will read 1B beyond the array in most
aligment cases. Dynamically compute the stop. This could be
hoised from the loop, but will require a more extensive change.
Likewise, cleanup the iteration increment statements to make
it more obvious they do channel count (3) elements per pass.
This should resolve #16137
* imgproc(resize): extra check
Alexander Alekhin [Wed, 11 Dec 2019 17:18:51 +0000 (17:18 +0000)]
Merge pull request #16120 from alalek:python3.8
Alexander Alekhin [Wed, 11 Dec 2019 17:16:58 +0000 (20:16 +0300)]
Merge pull request #16088 from alalek:dnn_eltwise_layer_different_src_channels
dnn(eltwise): fix handling of different number of channels
* dnn(test): reproducer for Eltwise layer issue from PR16063
* dnn(eltwise): rework support for inputs with different channels
* dnn(eltwise): get rid of finalize(), variableChannels
* dnn(eltwise): update input sorting by number of channels
- do not swap inputs if number of channels are same after truncation
* dnn(test): skip "shortcut" with batch size 2 on MYRIAD targets
Alexander Alekhin [Wed, 11 Dec 2019 14:17:03 +0000 (14:17 +0000)]
Merge pull request #16130 from alalek:fix_build_gapi_gcc_4.x
Alexander Alekhin [Wed, 11 Dec 2019 14:15:46 +0000 (14:15 +0000)]
Merge pull request #16125 from alalek:core_safe_xadd
Alexander Alekhin [Wed, 11 Dec 2019 14:15:23 +0000 (14:15 +0000)]
Merge pull request #16124 from alalek:issue_13354
Alexander Alekhin [Wed, 11 Dec 2019 14:15:04 +0000 (14:15 +0000)]
Merge pull request #16123 from alalek:opencv_include_port_file
atalaman [Wed, 11 Dec 2019 14:10:42 +0000 (17:10 +0300)]
Merge pull request #16062 from TolyaTalamanov:at/add-default-initlization-for-primitives
G-API: Add default initialization for primitives
* Add ctors for primitives
* Add description for constructors
Alexander Alekhin [Wed, 11 Dec 2019 14:02:15 +0000 (14:02 +0000)]
Merge pull request #16098 from alalek:dnn_clarify_error_getMemoryShapes
Alexander Alekhin [Wed, 11 Dec 2019 14:01:39 +0000 (14:01 +0000)]
Merge pull request #16091 from dkurt:png_to_dot
Alexander Alekhin [Wed, 11 Dec 2019 14:00:59 +0000 (14:00 +0000)]
Merge pull request #16086 from alalek:gapi_test_bitwise_not_exclude_32f
Alexander Alekhin [Wed, 11 Dec 2019 13:52:38 +0000 (16:52 +0300)]
python: enable Python 3.8
Alexander Alekhin [Wed, 11 Dec 2019 12:30:47 +0000 (12:30 +0000)]
Merge pull request #16121 from shimat:fix_voronoi_typo
Alexander Alekhin [Wed, 11 Dec 2019 10:16:57 +0000 (13:16 +0300)]
gapi: fix build with GCC 4.8
Alexander Alekhin [Wed, 11 Dec 2019 00:45:10 +0000 (00:45 +0000)]
core: provide safe implementations of CV_XADD() only
Alexander Alekhin [Wed, 11 Dec 2019 00:35:13 +0000 (00:35 +0000)]
core: add "namespace cv" in CV_StaticAssert fallback implementation
Alexander Alekhin [Wed, 11 Dec 2019 00:27:13 +0000 (00:27 +0000)]
core: OPENCV_INCLUDE_PORT_FILE for custom platform configuration
Alexander Alekhin [Tue, 10 Dec 2019 22:35:36 +0000 (22:35 +0000)]
cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P
Drop:
- discouraged CMAKE_CL_64
- MSVC64
- MINGW64
shimat [Wed, 11 Dec 2019 00:13:58 +0000 (09:13 +0900)]
s/Voroni/Voronoi/g
Alexander Alekhin [Tue, 10 Dec 2019 19:00:10 +0000 (19:00 +0000)]
python: fix issue with bindings loading on Python 3.8
Alexander Alekhin [Tue, 10 Dec 2019 16:29:07 +0000 (16:29 +0000)]
Merge pull request #16109 from pixelb:gcc-9-pch
Alexander Alekhin [Tue, 10 Dec 2019 15:14:22 +0000 (15:14 +0000)]
Merge pull request #16117 from mshabunin:fix-hist-args-34
Pádraig Brady [Mon, 9 Dec 2019 20:25:40 +0000 (20:25 +0000)]
Fix pch generation when linker flags used with GCC
-c is required to avoid linking (and the associated missing "main" message)
when linker flags like "-Wl,-z,relro" are passed to GCC
Maksim Shabunin [Tue, 10 Dec 2019 12:13:38 +0000 (15:13 +0300)]
imgproc: add parameter checks in calcHist and calcBackProj
Alexander Alekhin [Tue, 10 Dec 2019 12:10:50 +0000 (12:10 +0000)]
Merge pull request #16107 from dkurt:dnn_ie_ngraph_v1_conv
Alexander Alekhin [Tue, 10 Dec 2019 12:08:04 +0000 (12:08 +0000)]
Merge pull request #16106 from dkurt:dnn_ie_ngraph_weights_fusion
Dmitry Kurtaev [Mon, 9 Dec 2019 18:47:13 +0000 (21:47 +0300)]
Modify nGraph's ConvolutionBackpropData and GroupConvolution
Dmitry Matveev [Tue, 10 Dec 2019 10:31:43 +0000 (13:31 +0300)]
Merge pull request #16081 from dmatveev:dm/ocv42_gapi_bugfixes
G-API: Fix various issues for 4.2 release
* G-API: Fix issues reported by Coverity
- Fixed: passing values by value instead of passing by reference
* G-API: Fix redundant std::move()'s in return statements
Fixes #15903
* G-API: Added a smarter handling of Stop messages in the pipeline
- This should fix the "expected 100, got 99 frames" problem
- Fixes #15882
* G-API: Pass enum instead of GKernelPackage in Streaming test parameters
- Likely fixes #15836
* G-API: Address review issues in new bugfix comments
Dmitry Matveev [Mon, 9 Dec 2019 21:30:10 +0000 (00:30 +0300)]
Merge pull request #16039 from dmatveev:dm/gapi_tutorial_interactive_face_detection
* G-API-NG/Docs: Added a tutorial page on interactive face detection sample
- Introduced a "--ser" option to run the pipeline serially for
benchmarking purposes
- Reorganized sample code to better fit the documentation;
- Fixed a couple of issues (mainly typos) in the public headers
* G-API-NG/Docs: Reflected meta-less compilation in new G-API tutorial
* G-API-NG/Docs: Addressed review comments on Face Analytics Pipeline example
Yashas Samaga B L [Mon, 9 Dec 2019 19:26:58 +0000 (00:56 +0530)]
Merge pull request #16069 from YashasSamaga:cuda4dnn-crop_and_resize
add CropAndResize layer for CUDA backend
* add CropAndResize layer
* process multiple channels per iteration
Alexander Alekhin [Mon, 9 Dec 2019 19:26:00 +0000 (19:26 +0000)]
Merge pull request #16089 from dkurt:dnn_ie_fix_fpga
RAJKIRAN NATARAJAN [Mon, 9 Dec 2019 19:24:35 +0000 (19:24 +0000)]
Merge pull request #16094 from saskatchewancatch:issue-16053
* Add eps error checking for approxPolyDP to allow sensible values only
for epsilon value of Douglas-Peucker algorithm.
* Review changes for PR
Alexander Alekhin [Mon, 9 Dec 2019 18:29:53 +0000 (18:29 +0000)]
Merge pull request #16093 from alalek:core_itt_thread_name_16072
Alexander Alekhin [Mon, 9 Dec 2019 18:29:24 +0000 (18:29 +0000)]
Merge pull request #16101 from dkurt:dnn_ie_ngraph_detection_output
Alexander Alekhin [Mon, 9 Dec 2019 18:28:29 +0000 (18:28 +0000)]
Merge pull request #16102 from asmorkalov:as/xperience_c
Dmitry Kurtaev [Mon, 9 Dec 2019 16:06:47 +0000 (19:06 +0300)]
Fix weights fusion for Convolution and Deconvolution layers in nGraph
Alexander Alekhin [Mon, 9 Dec 2019 14:34:48 +0000 (14:34 +0000)]
Merge pull request #16096 from YashasSamaga:cuda4dnn-region-optimize
Yashas Samaga B L [Mon, 9 Dec 2019 14:31:27 +0000 (20:01 +0530)]
Merge pull request #16097 from YashasSamaga:cuda4dnn-optimize-resize-bilinear
cuda4dnn(resize): process multiple channels each iteration
* resize bilinear: process multiple chans. per iter.
* remove unused headers
* correct dispatch logic
* resize_nn: process multiple chans. per iter.
Alexander Alekhin [Mon, 9 Dec 2019 14:15:38 +0000 (14:15 +0000)]
Merge pull request #16103 from alalek:videoio_ffmpeg_wrapper_version_check
Alexander Smorkalov [Mon, 9 Dec 2019 10:32:16 +0000 (13:32 +0300)]
Added Xperience.AI to copyright file.
Paul Murphy [Mon, 9 Dec 2019 11:54:06 +0000 (05:54 -0600)]
Merge pull request #15257 from pmur:resize
* resize: HResizeLinear reduce duplicate work
There appears to be a 2x unroll of the HResizeLinear against k,
however the k value is only incremented by 1 during the unroll. This
results in k - 1 duplicate passes when k > 1.
Likewise, the final pass may not respect the work done by the vector
loop. Start it with the offset returned by the vector op if
implemented. Note, no vector ops are implemented today.
The performance is most noticable on a linear downscale. A set of
performance tests are added to characterize this. The performance
improvement is 10-50% depending on the scaling.
* imgproc: vectorize HResizeLinear
Performance is mostly gated by the gather operations
for x inputs.
Likewise, provide a 2x unroll against k, this reduces the
number of alpha gathers by 1/2 for larger k.
While not a 4x improvement, it still performs substantially
better under P9 for a 1.4x improvement. P8 baseline is
1.05-1.10x due to reduced VSX instruction set.
For float types, this results in a more modest
1.2x improvement.
* Update U8 processing for non-bitexact linear resize
* core: hal: vsx: improve v_load_expand_q
With a little help, we can do this quickly without gprs on
all VSX enabled targets.
* resize: Fix cn == 3 step per feedback
Per feedback, ensure we don't overrun. This was caught via the
failure observed in Test_TensorFlow.inception_accuracy.
Alexander Alekhin [Mon, 9 Dec 2019 11:51:02 +0000 (14:51 +0300)]
Merge pull request #16085 from alalek:imgproc_threshold_to_zero_ipp_bug
* imgproc(IPP): wrong result from threshold(THRESH_TOZERO)
* imgproc(IPP): disable IPP code to pass THRESH_TOZERO test
Alexander Alekhin [Mon, 9 Dec 2019 11:06:36 +0000 (14:06 +0300)]
videoio(plugins): relax version check for FFmpeg wrapper on Windows
Dmitry Kurtaev [Mon, 9 Dec 2019 09:49:47 +0000 (12:49 +0300)]
Remove Dummy layer
Alexander Alekhin [Sun, 8 Dec 2019 22:11:55 +0000 (22:11 +0000)]
dnn: clarify error message from getMemoryShapes()
Yashas [Sun, 8 Dec 2019 15:33:30 +0000 (21:03 +0530)]
optimize region kernels
Alexander Alekhin [Sat, 7 Dec 2019 22:33:11 +0000 (22:33 +0000)]
Merge pull request #16084 from alalek:issue_15784
Alexander Alekhin [Sat, 7 Dec 2019 21:41:15 +0000 (21:41 +0000)]
core(trace/itt): avoid calling __itt_thread_set_name() by default
- don't override current application thread names
- set name for own threads only
Dmitry Kurtaev [Sat, 7 Dec 2019 12:01:06 +0000 (15:01 +0300)]
Replace .png to .dot
Alexander Alekhin [Fri, 6 Dec 2019 18:33:55 +0000 (18:33 +0000)]
Merge pull request #16087 from YashasSamaga:cuda4dnn-eltwise-div
Lubov Batanina [Fri, 6 Dec 2019 18:29:57 +0000 (21:29 +0300)]
Merge pull request #15988 from l-bat:custom_layer
Test create custom layer in python
* check is contiguos
* Add custom layer test
* Fix test
* Remove assert
* Move assert to pyopencv dnn
* remove assert
* Add unregister
* Fix python2
* proto to bytearray
* Fix data type
Dmitry Kurtaev [Fri, 6 Dec 2019 16:34:54 +0000 (19:34 +0300)]
Fix HETERO:FPGA,CPU plugin for IE backend
YashasSamaga [Fri, 6 Dec 2019 15:58:36 +0000 (21:28 +0530)]
add DIV support to EltwiseOp
Alexander Alekhin [Fri, 6 Dec 2019 15:12:10 +0000 (18:12 +0300)]
gapi(test): exclude 32F from bitwise_not case
Alexander Alekhin [Fri, 6 Dec 2019 14:08:21 +0000 (14:08 +0000)]
Merge pull request #16076 from l-bat:prior_ngraph
Alexander Alekhin [Fri, 6 Dec 2019 13:36:42 +0000 (16:36 +0300)]
gapi: update CMakeLists.txt, fix TBB dependency handling
YashasSamaga [Fri, 6 Dec 2019 12:49:37 +0000 (18:19 +0530)]
add ROIPoolingOp
Dmitry Matveev [Fri, 6 Dec 2019 12:36:02 +0000 (15:36 +0300)]
Merge pull request #16050 from dmatveev:dm/ocv42_gapi_doc_fixup
* G-API: Addressed various documentation issues
- Fixed various typos and missing references;
- Added brief documentaion on G_TYPED_KERNEL and G_COMPOUND_KERNEL macros;
- Briefly described GComputationT<>;
- Briefly described G-API data objects (in a group section).
* G-API: Some clean-ups in doxygen, also a chapter on Render API
* G-API: Expose more graph compilation arguments in the documentation
* G-API: Address documentation review comments
Alexander Alekhin [Fri, 6 Dec 2019 12:33:07 +0000 (12:33 +0000)]
Merge pull request #16079 from alalek:imgproc_color_clarify_error_message
Alexander Alekhin [Fri, 6 Dec 2019 12:32:22 +0000 (12:32 +0000)]
Merge pull request #16070 from dkurt:backport_15611
Alexander Alekhin [Fri, 6 Dec 2019 12:31:30 +0000 (12:31 +0000)]
Merge pull request #16077 from dmatveev:dm/gapi_narg_combine
Alexander Alekhin [Fri, 6 Dec 2019 11:26:11 +0000 (11:26 +0000)]
Merge pull request #16078 from alalek:update_version_4.2.0-pre
Alexander Alekhin [Fri, 6 Dec 2019 11:25:05 +0000 (11:25 +0000)]
Merge pull request #16071 from alalek:update_version_3.4.9-pre
Alexander Alekhin [Fri, 6 Dec 2019 10:25:51 +0000 (13:25 +0300)]
imgproc(color): clarify error message
Alexander Alekhin [Fri, 6 Dec 2019 09:58:57 +0000 (12:58 +0300)]
pre: OpenCV 4.2.0 (version++)
Liubov Batanina [Fri, 6 Dec 2019 08:27:59 +0000 (11:27 +0300)]
Support Swish and Mish activations