Alexander Alekhin [Tue, 5 Feb 2019 16:03:42 +0000 (19:03 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 5 Feb 2019 14:58:27 +0000 (14:58 +0000)]
Merge pull request #13762 from alalek:ocl_dnn_mvn_local_size
Alexander Alekhin [Tue, 5 Feb 2019 12:27:29 +0000 (15:27 +0300)]
dnn(ocl): use compile-time LOCAL_SIZE parameter
instead of get_local_size(0) and dynamic local memory allocation
Alexander Alekhin [Tue, 5 Feb 2019 12:37:53 +0000 (12:37 +0000)]
Merge pull request #13670 from allnes:dnn_fix_obj_detect_sample
winice [Mon, 4 Feb 2019 15:59:00 +0000 (23:59 +0800)]
Merge pull request #13737 from winice-test:master
* Optical Flow rework to use wide universal intrinsics
* remove if (useSIMD) check as review requested
Alexander Alekhin [Sat, 2 Feb 2019 14:22:02 +0000 (14:22 +0000)]
Merge pull request #12855 from dkurt:js_features2d_tests
Dmitry Kurtaev [Tue, 16 Oct 2018 09:23:43 +0000 (12:23 +0300)]
Add tests for features2d JavaScript bindings
Alexander Alekhin [Fri, 1 Feb 2019 16:10:59 +0000 (16:10 +0000)]
Merge pull request #13705 from mshabunin:clang-warnings
Rostislav Vasilikhin [Fri, 1 Feb 2019 16:09:31 +0000 (19:09 +0300)]
Merge pull request #13708 from savuor:yuv42x_wide
YUV42x color conversions rewritten to wide intrinsics (#13708)
* a*b+c -> fma
* YUV420sp2RGB initially vectorized
* shorter var names
* loops by 4
* yuv420p2rgb vectorized
* yuv422toRGB vectorized
* reg arrays
* rgb2yuv420 vectorized
* warnings fixed
* try to fix align error
Alexander Alekhin [Fri, 1 Feb 2019 16:07:43 +0000 (16:07 +0000)]
Merge pull request #13722 from alalek:ocl_pass_ptr_for_empty_umat
Alexander Alekhin [Fri, 1 Feb 2019 10:17:32 +0000 (13:17 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 1 Feb 2019 10:01:39 +0000 (10:01 +0000)]
Merge pull request #13736 from dkurt:dnn_ie_future
Alexander Alekhin [Fri, 1 Feb 2019 09:58:14 +0000 (09:58 +0000)]
Merge pull request #13735 from dkurt:fix_13725
Alexander Alekhin [Fri, 1 Feb 2019 09:57:08 +0000 (09:57 +0000)]
Merge pull request #13716 from dkurt:dnn_conv_weights_clone
Hannah McLaughlin [Thu, 31 Jan 2019 12:34:36 +0000 (12:34 +0000)]
Merge pull request #13718 from lochsh:svm-sigmoid-fix
SVM sigmoid kernel fix (issue #13621) (#13718)
* Added test for sigmoid case for retrieving support vectors
* undo unhelpful test
* add test for sigmoid SVM with data that is easily separable into two concentric circles
* Update sigmoid kernel to use tanh(gamma * <x, y> + coef0) instead of -tanh(gamma * <x, y> + coef0)
* remove unnecessary constraint on coef0
* cleanup
* fixing inappropriate use of doubles
* Add f to float literal
* replace CV_Assert with ASSERT_EQ where appropriate
Dmitry Kurtaev [Thu, 31 Jan 2019 10:38:24 +0000 (13:38 +0300)]
Fix IE tests
Dmitry Kurtaev [Thu, 31 Jan 2019 10:40:54 +0000 (13:40 +0300)]
Align TensorFlow and OpenCV paths to create a text graph
Vitaly Tuzov [Wed, 30 Jan 2019 19:37:27 +0000 (22:37 +0300)]
Merge pull request #13693 from terfendail:spatialgrad_wintr
* spatialGradient() reworked to use wide universal intrinsics
* Moved row pointers inside loops
Alexander Nesterov [Tue, 22 Jan 2019 16:01:48 +0000 (15:01 -0100)]
Update obj. detect sample
Alexander Alekhin [Wed, 30 Jan 2019 11:48:53 +0000 (14:48 +0300)]
ocl: support empty "ptr only" UMat in Kernel::set()
add messages to avoid silent kernel destruction
Maksim Shabunin [Mon, 28 Jan 2019 11:48:00 +0000 (14:48 +0300)]
Fixed warnings produced by clang-9.0.0
Ramez Rafla [Tue, 29 Jan 2019 21:14:33 +0000 (16:14 -0500)]
Merge pull request #13710 from ramezrafla:3.4
* Added DMatch bindings
* Added CR which was accidently removed to maintain consistency
* Removed trailing white-space
Alexander Alekhin [Tue, 29 Jan 2019 16:21:08 +0000 (16:21 +0000)]
Merge pull request #13684 from terfendail:lblend_wintr
Alexander Alekhin [Tue, 29 Jan 2019 16:20:24 +0000 (19:20 +0300)]
Merge pull request #13679 from alalek:imgproc_median_blur_cleanup
* imgproc: cleanup medianBlur_8u_O1 code
Unnecessary per-channel buffers: H[c] / lut[c]
* imgproc(medianBlur_8u_O1): use CV_SIMD_WIDTH for alignment
Dmitry Kurtaev [Tue, 29 Jan 2019 11:29:47 +0000 (14:29 +0300)]
Clone convolution layer weights only for fusion
Arnaud Brejeon [Mon, 28 Jan 2019 18:36:00 +0000 (10:36 -0800)]
Merge pull request #13672 from arnaudbrejeon:bug_fix_12961
PyrDown: Fix bug #12961 (#13672)
* Force unaligned pointer and create test
* More cross-platform solution
* MSVC expects a proper order
* Remove useless clang macro
Alexander Alekhin [Mon, 28 Jan 2019 18:34:20 +0000 (18:34 +0000)]
Merge pull request #13692 from dkurt:dnn_do_not_crash_myriad_in_tests
Alexander Alekhin [Mon, 28 Jan 2019 18:32:21 +0000 (18:32 +0000)]
Merge pull request #13707 from dkurt:fix_13575
Dmitry Kurtaev [Mon, 28 Jan 2019 15:44:31 +0000 (18:44 +0300)]
Fix a dnn bug with retrieving all the output blobs
Alexey Smirnov [Mon, 28 Jan 2019 13:26:32 +0000 (16:26 +0300)]
Merge pull request #13678 from smirnov-alexey:gapi_fix_descrof_overloading
* Return vector of MetaArg instead of MatDesc and fix test with ADL check
* Fix construction of vector
* Change names and tests according to review
Also add GAPI_EXPORTS prefix for two ostream operators
Dmitry Kurtaev [Fri, 25 Jan 2019 12:02:29 +0000 (15:02 +0300)]
Remove ASSERT_ANY_THROW checks fpr Myriad plugin and FP32 networks
Alexander Alekhin [Fri, 25 Jan 2019 14:06:24 +0000 (14:06 +0000)]
Merge pull request #13686 from mshabunin:fix-avfoundation
ExpandingDev [Fri, 25 Jan 2019 13:36:28 +0000 (08:36 -0500)]
Merge pull request #13675 from ExpandingDev:patch-1
* Add note about building for pkg-config
* minor fixes
Alexander Alekhin [Fri, 25 Jan 2019 11:59:29 +0000 (11:59 +0000)]
Merge pull request #13608 from allnes:dnn_rework
Vitaly Tuzov [Thu, 24 Jan 2019 13:26:09 +0000 (16:26 +0300)]
Added performance test for blendLinear
Vitaly Tuzov [Wed, 23 Jan 2019 14:24:44 +0000 (17:24 +0300)]
blendLinear() reworked to use wide universal intrinsics
Alexander Alekhin [Thu, 24 Jan 2019 16:22:12 +0000 (16:22 +0000)]
Merge pull request #13687 from rgarnov:gapi_fix_fluid_heterogeneity
Alexander Alekhin [Thu, 24 Jan 2019 16:21:49 +0000 (16:21 +0000)]
Merge pull request #13685 from mshabunin:fix-avfoundation-34
Ruslan Garnov [Thu, 24 Jan 2019 13:19:27 +0000 (16:19 +0300)]
Fixed fluid heterogeneity support
Alexander Nesterov [Thu, 10 Jan 2019 17:29:44 +0000 (16:29 -0100)]
Added fix for other size
Maksim Shabunin [Thu, 24 Jan 2019 11:37:26 +0000 (14:37 +0300)]
AVFoundation on Mac: fixed frame count and unsupported format handling
Maksim Shabunin [Thu, 24 Jan 2019 11:37:26 +0000 (14:37 +0300)]
AVFoundation on Mac: fixed frame count and unsupported format handling
Alexander Alekhin [Tue, 22 Jan 2019 17:59:28 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 22 Jan 2019 15:31:28 +0000 (15:31 +0000)]
Merge pull request #13666 from savuor:yuv_wide_port
Alexey Smirnov [Tue, 22 Jan 2019 10:14:33 +0000 (13:14 +0300)]
Merge pull request #13664 from smirnov-alexey:gapi_add_descrof_overloading
* Add version of descr_of function taking vector of Mat
* Overload descr_of function for cv::Mat
* Add template function instead of copypasting and change tests a little
Alexander Alekhin [Mon, 21 Jan 2019 18:12:38 +0000 (18:12 +0000)]
Merge pull request #13658 from nglee:dev_CudaShflUpCompat
Alexander Alekhin [Mon, 21 Jan 2019 18:10:25 +0000 (18:10 +0000)]
Merge pull request #13668 from alalek:imgproc_rgb2yuv_regression
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:57:08 +0000 (18:57 +0300)]
a*b+c -> fma
Namgoo Lee [Mon, 21 Jan 2019 15:31:05 +0000 (15:31 +0000)]
__shfl_up_sync with mask for CUDA >= 9
* __shfl_up_sync with proper mask value for CUDA >= 9
* BlockScanInclusive for CUDA >= 9
* compatible_shfl_up for use in integral.hpp
* Use CLAHE in cudev
* Add tests for BlockScan
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:01:44 +0000 (18:01 +0300)]
fixed (un)signed packing s16 -> u8
Rostislav Vasilikhin [Mon, 21 Jan 2019 15:01:44 +0000 (18:01 +0300)]
fixed (un)signed packing s16 -> u8
Alexander Alekhin [Mon, 21 Jan 2019 13:04:23 +0000 (16:04 +0300)]
imgproc(test): RGB2YUV regression test
Rostislav Vasilikhin [Mon, 21 Jan 2019 12:35:34 +0000 (15:35 +0300)]
YUV vectorizations ported to master from 3.4
Alexander Alekhin [Sun, 20 Jan 2019 18:39:03 +0000 (18:39 +0000)]
Merge pull request #13656 from dkurt:dnn_tf_atrous_faster_rcnn
Alexander Alekhin [Sat, 19 Jan 2019 13:44:30 +0000 (13:44 +0000)]
Merge pull request #13580 from LaurentBerger:PythonStitch2
LaurentBerger [Fri, 4 Jan 2019 20:23:51 +0000 (21:23 +0100)]
Check syntax of stitchnig detailed
Alexander Alekhin [Fri, 18 Jan 2019 16:18:47 +0000 (16:18 +0000)]
Merge pull request #13650 from terfendail:shapedescr_wintr
Rostislav Vasilikhin [Fri, 18 Jan 2019 16:06:29 +0000 (19:06 +0300)]
Merge pull request #13649 from savuor:yuv_wide
YUV/YCrCb conversions rewritten to wide intrinsics (#13649)
* YUV: minors
* YUV42x conversions template-merged
* more template-merged YUV42x conversions; some NEON code removed
* rgb2yuv<float> vectorized
* yuv2rgb<float> vectorized
* memcpy removed
* Yuv2RGB<ushort> vectorized
* unused code removed
* rgb2yuv<ushort> vectorized
* rgb2yuv<uchar> vectorized
* v_pack_u used (up to +30% perf)
* yuv2rgb<uchar> vectorized
* fixed compilation
Alexander Alekhin [Fri, 18 Jan 2019 16:00:18 +0000 (16:00 +0000)]
Merge pull request #13539 from dkurt:ie_graph_api
Dmitry Kurtaev [Fri, 18 Jan 2019 15:46:52 +0000 (18:46 +0300)]
Create text graphs for Faster-RCNN from TensorFlow with dilated convolutions
Vitaly Tuzov [Thu, 17 Jan 2019 21:11:52 +0000 (00:11 +0300)]
boundingRect() reworked to use wide universal intrinsics
Alexander Alekhin [Fri, 18 Jan 2019 14:32:11 +0000 (17:32 +0300)]
Revert "Merge pull request #13586 from eightco:Core_bugfix3"
This reverts commit
3721c8bb068aceafce068ab459810440057d8254
except changes in modules/dnn/test/test_tf_importer.cpp
Alexander Alekhin [Fri, 18 Jan 2019 14:56:31 +0000 (14:56 +0000)]
Merge pull request #13637 from berak:fix_openvx
Vitaly Tuzov [Fri, 18 Jan 2019 11:59:03 +0000 (14:59 +0300)]
Performance test for bounding rect estimation
Andrey Golubev [Thu, 17 Jan 2019 17:59:47 +0000 (20:59 +0300)]
Merge pull request #13640 from andrey-golubev:gapi_gcallpriv_doc
* GAPI: document GCall's recursive behavior
* Move documentation outside the class
Lee Jaehwan [Thu, 17 Jan 2019 14:23:09 +0000 (23:23 +0900)]
Merge pull request #13586 from eightco:Core_bugfix3
* Add Operator override for multi-channel Mat with literal constant.
* simple test
* Operator overloading channel constraint for primitive types
* fix some test for #13586
Alexander Alekhin [Thu, 17 Jan 2019 12:35:20 +0000 (12:35 +0000)]
Merge pull request #13645 from mshabunin:doc-includes
Alexander Alekhin [Thu, 17 Jan 2019 12:34:52 +0000 (12:34 +0000)]
Merge pull request #13644 from berak:dnn_samples_googlenet
Dmitry Kurtaev [Mon, 14 Jan 2019 06:55:44 +0000 (09:55 +0300)]
Move Inference Engine to new API
berak [Thu, 17 Jan 2019 10:41:25 +0000 (11:41 +0100)]
dnn/samples: add googlenet to model zoo
Maksim Shabunin [Thu, 17 Jan 2019 10:57:40 +0000 (13:57 +0300)]
Enabled #include documentation in all members
Alexander Alekhin [Wed, 16 Jan 2019 18:18:57 +0000 (18:18 +0000)]
Merge pull request #13625 from nglee:dev_CudaFarnebackInitFlowFix
Alexander Alekhin [Wed, 16 Jan 2019 17:49:06 +0000 (17:49 +0000)]
Merge pull request #13639 from andrey-golubev:gapi_fix_gcall_misuse
Alexander Alekhin [Wed, 16 Jan 2019 15:45:26 +0000 (15:45 +0000)]
Merge pull request #13631 from terfendail:thresh_wintr
Andrey Golubev [Wed, 16 Jan 2019 15:15:44 +0000 (18:15 +0300)]
GAPI: fix GCall misuse in unrollExpr
berak [Wed, 16 Jan 2019 11:10:22 +0000 (12:10 +0100)]
fix openvx wrappers
Alexander Alekhin [Tue, 15 Jan 2019 17:47:21 +0000 (17:47 +0000)]
Merge pull request #13593 from brad-kelly:integral_avx512_ver34
Alexander Alekhin [Tue, 15 Jan 2019 17:46:26 +0000 (17:46 +0000)]
Merge pull request #13622 from sturkmen72:code_clean_up
Vitaly Tuzov [Tue, 15 Jan 2019 16:15:19 +0000 (19:15 +0300)]
threshold() reworked to use wide universal intrinsics
Alexander Alekhin [Tue, 15 Jan 2019 11:22:00 +0000 (11:22 +0000)]
Merge pull request #13610 from terfendail:morph_wintr
Brad Kelly [Wed, 14 Nov 2018 04:03:11 +0000 (20:03 -0800)]
Implementing AVX512 support for 3 channel cv::integral for CV_64F
Suleyman TURKMEN [Fri, 11 Jan 2019 17:31:55 +0000 (20:31 +0300)]
code clean up
Vitaly Tuzov [Thu, 10 Jan 2019 16:08:55 +0000 (19:08 +0300)]
Morphology reworked to use wide universal intrinsics
Alexander Alekhin [Mon, 14 Jan 2019 14:54:11 +0000 (14:54 +0000)]
Merge pull request #13619 from alalek:issue_13595
Namgoo Lee [Fri, 11 Jan 2019 04:00:08 +0000 (04:00 +0000)]
Fix Farneback Optical Flow Algorithm
- Before this PR, following tests failed on some platform.
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/19
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/23
- The algorithm now recognizes the OPTFLOW_USE_INITIAL_FLOW flag.
Previously, when the flag was set, it did not use the flow data
passed as input, instead used some garbage data in memory.
- More strict test limit.
Alexander Alekhin [Sun, 13 Jan 2019 09:35:24 +0000 (09:35 +0000)]
Merge pull request #13617 from terfendail:always_inline
atinfinity [Sun, 13 Jan 2019 09:34:05 +0000 (18:34 +0900)]
Merge pull request #13616 from atinfinity:fixed-py_matcher-tutorial
* fixed tutorial code of py_matcher
* fixed imread mode
Alexander Alekhin [Sun, 13 Jan 2019 09:33:05 +0000 (09:33 +0000)]
Merge pull request #13614 from dkurt:dnn_tf_ssd_fpn
Alexander Alekhin [Sat, 12 Jan 2019 11:14:18 +0000 (11:14 +0000)]
cmake: don't use LIB_SUFFIX with CMAKE_INSTALL_LIBDIR
Vitaly Tuzov [Fri, 11 Jan 2019 19:40:35 +0000 (22:40 +0300)]
Added CV_ALWAYS_INLINE macro
Jim Zhou [Fri, 11 Jan 2019 13:58:47 +0000 (21:58 +0800)]
Merge pull request #13601 from JimZhou-001:JimZhou-001
* Fix the bug in case determinant of rotation matrix is -1
* calib3d(test): check det(R) == 1
Dmitry Kurtaev [Fri, 11 Jan 2019 07:50:52 +0000 (10:50 +0300)]
SSD with FPN proposals from TensorFlow
Alexander Alekhin [Thu, 10 Jan 2019 15:15:09 +0000 (15:15 +0000)]
Merge pull request #13606 from rrrapha:malloc-h
Raphael Graf [Thu, 10 Jan 2019 10:54:45 +0000 (11:54 +0100)]
dnn: remove malloc.h include
Alexander Alekhin [Thu, 10 Jan 2019 09:29:41 +0000 (12:29 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 9 Jan 2019 15:45:09 +0000 (15:45 +0000)]
Merge pull request #13560 from cuihaoleo:master
Alexander Alekhin [Wed, 9 Jan 2019 14:42:57 +0000 (14:42 +0000)]
Merge pull request #13592 from tdp2110:master
Alexander Alekhin [Wed, 9 Jan 2019 14:02:59 +0000 (14:02 +0000)]
Merge pull request #13600 from dkurt:fix_13576
Alexander Alekhin [Wed, 9 Jan 2019 14:02:14 +0000 (14:02 +0000)]
Merge pull request #13599 from dkurt:dnn_conv_error_msg
Quentin Chateau [Wed, 9 Jan 2019 14:01:07 +0000 (15:01 +0100)]
Merge pull request #13584 from qchateau:improve_stitching_detailed
Improve stitching detailed (#13584)
* Added block size getter/setters
* Added a bunch of new features to the stitching_detailed sample
* Do not required XFEATURES2D for default use
* Add support for akaze features in stitching_detailed
* Improved sample logs