Dmitry Budnikov [Thu, 29 Nov 2018 13:29:11 +0000 (16:29 +0300)]
Merge pull request #13240 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming
G-API rename GPU backend to OCL backend (#13240)
* renaming draft
* inline namespace instead non-safe define
* more back compatibility
* Updates after review from Dmitry
Alexander Alekhin [Wed, 28 Nov 2018 20:00:04 +0000 (20:00 +0000)]
Merge pull request #13264 from mshabunin:fix-windows
Alexander Alekhin [Wed, 28 Nov 2018 19:51:29 +0000 (19:51 +0000)]
Merge pull request #13320 from alalek:api_checks_4.0.0
Evgeny Latkin [Wed, 28 Nov 2018 16:50:39 +0000 (19:50 +0300)]
Merge pull request #13319 from elatkin:el/gapi_perf_erdilate_2
GAPI (fluid): Erode/Dilate optimization, part 2 (#13319)
* GAPI (fluid): Erode/Dilate optimization: hard-code 3x3 case
* GAPI (fluid): Erode/Dilate optimization: CPU dispatcher
* GAPI (fluid): Erode/Dilate optimization: speed-up 10-15x times with CV_SIMD
* GAPI (fluid): Erode/Dilate optimization: 20-30% speed-up
Alexander Alekhin [Wed, 28 Nov 2018 12:12:55 +0000 (15:12 +0300)]
opencv4: fix abi-checker (to enable API/source checks only)
Evgeny Latkin [Wed, 28 Nov 2018 15:20:31 +0000 (18:20 +0300)]
Merge pull request #13315 from elatkin:el/gapi_perf_erdilate
GAPI (fluid): Erode/Dilate optimization (#13315)
* GAPI (fluid): Erode/Dilate optimization: hard-code 3x3 case
* GAPI (fluid): Erode/Dilate optimization: CPU dispatcher
* GAPI (fluid): Erode/Dilate optimization: speed-up 10-15x times with CV_SIMD
Evgeny Latkin [Tue, 27 Nov 2018 16:12:14 +0000 (19:12 +0300)]
Merge pull request #13290 from elatkin:el/gapi_perf_filter2d
GAPI (fluid): Filter 2D optimization (#13290)
* GAPI (fluid): Filter 2D optimization: speedup 13x if float, 2x if integral
* GAPI (fluid): Filter 2D speedup 8x if output is short/ushort
* GAPI (fluid): Filter 2D speedup 7x if output is uchar
* GAPI (fluid): Filter 2D optimization: fixed compiler warnings
* GAPI (fluid): fix compiler warnings on Mac
* GAPI (fluid): fix compiler warnings on Mac
* GAPI (fluid): fix compiler errors on VS2015
* GAPI (fluid): fix compiler errors on VS2015
* GAPI (fluid): fix compiler errors on VS2015
Maksim Shabunin [Tue, 27 Nov 2018 12:26:09 +0000 (12:26 +0000)]
Merge pull request #13293 from dkurt:dnn_add_extra_ie_net_method
Alexander Alekhin [Tue, 27 Nov 2018 10:56:23 +0000 (10:56 +0000)]
Merge pull request #13292 from mshabunin:fix-filenode-compat
Dmitry Kurtaev [Tue, 27 Nov 2018 09:02:00 +0000 (12:02 +0300)]
Add serialize method for IE net wrapper
Maksim Shabunin [Tue, 27 Nov 2018 08:47:23 +0000 (11:47 +0300)]
Made FileNode::operator string inline
Dmitry Budnikov [Mon, 26 Nov 2018 14:44:46 +0000 (17:44 +0300)]
Merge pull request #13251 from dbudniko:dbudniko/gapi_more_fixes_for_tests
More fixes for G-API tests (#13251)
* scalar comparator and more fixes for tests
* add weighted aligned
* white space
* more white space
* Add weighted test accuracy check enabled
Alexander Alekhin [Mon, 26 Nov 2018 12:37:45 +0000 (15:37 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 26 Nov 2018 12:29:30 +0000 (12:29 +0000)]
Merge pull request #13242 from terfendail:contours_wintr
Maksim Shabunin [Fri, 23 Nov 2018 16:14:14 +0000 (19:14 +0300)]
Restored function to rescale pixel values before imshow
Alexander Alekhin [Mon, 26 Nov 2018 12:24:16 +0000 (12:24 +0000)]
Merge pull request #13280 from dkurt:enable_dnn_ie_r4_tests
Evgeny Latkin [Mon, 26 Nov 2018 12:05:35 +0000 (15:05 +0300)]
Merge pull request #13221 from elatkin:el/gapi_perf_sepfilter
GAPI (fluid): optimization of Separable filter (#13221)
* GAPI (fluid): Separable filter: performance test
* GAPI (fluid): enable all performance tests
* GAPI: separable filters: alternative code for Sobel
* GAPI (fluid): hide unused old code for Sobel filter
* GAPI (fluid): especial code for Sobel if U8 into S16
* GAPI (fluid): back to old code for Sobel
* GAPI (fluid): run_sepfilter3x3_impl() with CPU dispatcher
* GAPI (fluid): run_sepfilter3x3_impl(): fix compiler warnings
* GAPI (fluid): new engine for separable filters (but Sobel)
* GAPI (fluid): new performance engine for Sobel
* GAPI (fluid): Sepfilters performance: fixed compilation error
Matthias Winkelmann [Mon, 26 Nov 2018 12:04:16 +0000 (13:04 +0100)]
Merge pull request #13228 from MatthiasWinkelmann:master
Add URLs, harmonise formatting, and fix parse error in bibliography (#13228)
* Fixed parse error in bibliography
* Removed extra curly braces
* harmonized whitespace
* changed organisation -> publisher where appropriate. Organisation is intended as the author's organisation, not the publishing.
* harmonized capitalisation and whitespace
* Add links to about 1/3 of references
Dmitry Kurtaev [Mon, 26 Nov 2018 09:09:50 +0000 (12:09 +0300)]
Enable some dnn tests according to the new Intel's Inference Engine release (R4)
Alexander Alekhin [Mon, 26 Nov 2018 09:30:31 +0000 (09:30 +0000)]
Merge pull request #13279 from mshabunin:fix-carotene-build-3.4
Alexander Alekhin [Mon, 26 Nov 2018 09:29:47 +0000 (09:29 +0000)]
Merge pull request #13278 from mshabunin:fix-carotene-build
Alexander Alekhin [Mon, 26 Nov 2018 09:15:09 +0000 (09:15 +0000)]
Merge pull request #13275 from wzw-intel:thread_safe
Maksim Shabunin [Mon, 26 Nov 2018 08:30:20 +0000 (11:30 +0300)]
Fixed NEON detection in Carotene build
Maksim Shabunin [Mon, 26 Nov 2018 08:30:20 +0000 (11:30 +0300)]
Fixed NEON detection in Carotene build
Wu Zhiwen [Thu, 22 Nov 2018 08:18:35 +0000 (16:18 +0800)]
dnn/Vulkan: make thread safe
Use a global dedicated mutex to make sure initialize once and
protect command buffer pool and queue.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Alexander Alekhin [Sun, 25 Nov 2018 18:27:42 +0000 (18:27 +0000)]
Merge pull request #13270 from 1over:flann_dist_fix
Alexander Alekhin [Sun, 25 Nov 2018 18:27:01 +0000 (18:27 +0000)]
Merge pull request #13269 from alalek:ocl_fix_kernels_with_use_host_mem
Alexander Alekhin [Sun, 25 Nov 2018 18:26:28 +0000 (18:26 +0000)]
Merge pull request #13268 from alalek:core_findfile_linux_use_dladdr
Alexander Alekhin [Sun, 25 Nov 2018 18:25:48 +0000 (18:25 +0000)]
Merge pull request #13254 from alalek:update_python_install_path
1over [Sun, 25 Nov 2018 00:31:54 +0000 (01:31 +0100)]
fixed memory issue in flann
Alexander Alekhin [Sat, 24 Nov 2018 15:36:43 +0000 (15:36 +0000)]
ocl: fix kernels launching with USE_HOST_PTR UMat
created from RAW memory buffers (without proper lifetime management)
Alexander Alekhin [Sat, 24 Nov 2018 15:22:54 +0000 (15:22 +0000)]
core: use dladdr() instead of parsing /proc/self/maps
Alexander Alekhin [Thu, 22 Nov 2018 21:06:33 +0000 (21:06 +0000)]
python: update install paths
- don't require "OPENCV_PYTHON{2,3}_INSTALL_PATH" if OPENCV_SKIP_PYTHON_LOADER=ON
- avoid unnecessary relative paths in generated config-X.Y.py
Alexander Alekhin [Fri, 23 Nov 2018 17:12:01 +0000 (17:12 +0000)]
Merge pull request #13263 from dkurt:dnn_refactor_tests
Alexander Alekhin [Fri, 23 Nov 2018 17:09:47 +0000 (17:09 +0000)]
Merge pull request #13260 from alalek:cmake_ade_12856
Alexander Alekhin [Fri, 23 Nov 2018 17:02:46 +0000 (20:02 +0300)]
Merge pull request #13253 from alalek:fix_13201
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
Dmitry Kurtaev [Fri, 23 Nov 2018 15:23:27 +0000 (18:23 +0300)]
Fix ONNX's emotion_ferplus model.
Reduce input size for OpenPose tests
Dmitry Budnikov [Fri, 23 Nov 2018 14:51:15 +0000 (17:51 +0300)]
Merge pull request #13120 from dbudniko:dbudniko/gapi_opencl_kernel_example
* custom OpenCL G-API kernel draft
* clean up and warnings fix
* more warnings
* white space
* new blank line at the EOF removed
* HAVE_OPENCL guard
* remove unnecessary ocl API call
* remove sum test workaround
* check if opencl activated
* fix std::str warning
* CPU fall back for symm7x7
* gpu test kernel draft
* adjust have opencl guard
* more guards
* one more attempt to adjust guards
* empty stub files and kernel source files creation in the test directory
* try to force auto generation
* one more attempt to force build
* remove symm7x7 custom from gapi module
* looks like that this version works properly on Win desktop
* clean up
* more clean up
* address some suggestions from Dmitry's review
* const kernel coefficients
* CV_Error in kernel + try to fix cpu fallback
* CV_Error_ instead CV_Error
* everything in one gapi_gpu_test.cpp
* fix warning
* remove kernel generation, add kernel string
* avoid generated code and ocl internal namespace
* fix misprint
* c_str
Alexander Alekhin [Fri, 23 Nov 2018 09:51:26 +0000 (12:51 +0300)]
cmake: allow to disable ADE build too (BUILD_opencv_gapi=OFF is not enough)
CMake option: WITH_ADE=OFF
WuZhiwen [Thu, 22 Nov 2018 16:46:30 +0000 (00:46 +0800)]
Merge pull request #13244 from wzw-intel:init_vulkan
* dnn/Vulkan: don't init Vulkan runtime if using other backend/target
Don't need to explictly call a init API but will automatically
init Vulkan environment the first time to use an VkCom object.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: depress compilier warning for "-Wsign-promo"
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Alexander Alekhin [Thu, 22 Nov 2018 16:05:14 +0000 (16:05 +0000)]
Merge pull request #13243 from etienne02:3.4
Alexander Alekhin [Thu, 22 Nov 2018 14:18:23 +0000 (17:18 +0300)]
Merge pull request #13241 from pasbi:master
Alexander Alekhin [Thu, 22 Nov 2018 14:17:35 +0000 (14:17 +0000)]
Merge pull request #13239 from bramton:freebsd-build-fix
Bram [Wed, 21 Nov 2018 15:05:22 +0000 (16:05 +0100)]
Fixed build on FreeBSD
Etienne Brateau [Thu, 22 Nov 2018 00:39:09 +0000 (01:39 +0100)]
Fix missing check part (defined(__cplusplus)) in header types_c.h
pascal [Wed, 21 Nov 2018 16:59:37 +0000 (17:59 +0100)]
updated documentation for imread and imwrite (added pfm image format)
Vitaly Tuzov [Tue, 20 Nov 2018 17:00:37 +0000 (20:00 +0300)]
Added performance tests for findContours
Vitaly Tuzov [Mon, 19 Nov 2018 15:53:12 +0000 (18:53 +0300)]
Updated findContours to use wide universal intrinsics
Alexander Alekhin [Wed, 21 Nov 2018 15:54:59 +0000 (15:54 +0000)]
Merge pull request #13236 from tomoaki0705:featureHighguiGetProp
Alexander Alekhin [Wed, 21 Nov 2018 15:54:42 +0000 (15:54 +0000)]
Merge pull request #13235 from berak:highgui_window_w32
Alexander Alekhin [Wed, 21 Nov 2018 14:30:31 +0000 (14:30 +0000)]
Merge pull request #13209 from alalek:issue_12865
Tomoaki Teshima [Wed, 21 Nov 2018 14:04:23 +0000 (23:04 +0900)]
add missing API cvGetPropVisible_W32
berak [Wed, 21 Nov 2018 10:05:24 +0000 (11:05 +0100)]
highgui: restore convertscale semantics in window_w32.cpp
Alexander Alekhin [Wed, 21 Nov 2018 08:33:39 +0000 (08:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 21 Nov 2018 08:32:13 +0000 (08:32 +0000)]
Merge pull request #13232 from huangqinjin:openmp
huangqinjin [Wed, 21 Nov 2018 02:52:50 +0000 (10:52 +0800)]
fix numThreadsMax for OpenMP
introduced by commit
4e629000095779ae8f544ddd4de77633680a3db9
Alexander Alekhin [Tue, 20 Nov 2018 21:26:05 +0000 (21:26 +0000)]
Merge pull request #13224 from seiko2plus:core_ppc64le_infa
Sayed Adel [Tue, 20 Nov 2018 12:05:20 +0000 (12:05 +0000)]
core: several improves and fixes on ppc64le infrastructure
- add infrastructure support for Power9/VSX3
- fix missing VSX flags on GCC4.9 and CLANG4(#13210, #13222)
- fix disable VSX optimzation on GCC by using flag ENABLE_VSX
- flag ENABLE_VSX is deprecated now, use CPU_BASELINE, CPU_DISPATCH instead
- add VSX3 to arithmetic dispatchable flags
Alexander Alekhin [Tue, 20 Nov 2018 14:59:35 +0000 (14:59 +0000)]
Merge pull request #13223 from dan-masek:fix_drawmatches_alpha
Alexander Alekhin [Tue, 20 Nov 2018 14:55:42 +0000 (14:55 +0000)]
Merge pull request #13214 from 1over:fix_rect
Alexander Alekhin [Tue, 20 Nov 2018 14:53:19 +0000 (14:53 +0000)]
Merge pull request #13213 from alalek:fix_format
Ruslan Garnov [Tue, 20 Nov 2018 14:25:04 +0000 (17:25 +0300)]
Merge pull request #13215 from rgarnov:rg/overhead
* Added caching of agents execution sequence
* Merged linesRead() and nextWindow() methods on FluidAgent in one method
* Added caching of input lines for fluid::View
* Added caching of output lines for fluid::Buffer
* Fixed GAPI_Assert to work in standalone mode
Dan Mašek [Tue, 20 Nov 2018 14:08:40 +0000 (15:08 +0100)]
Resolve #13219: Make randomly generated colours opaque.
Alexander Alekhin [Tue, 20 Nov 2018 13:25:13 +0000 (13:25 +0000)]
Merge pull request #13218 from dmatveev:fix_standalone
Dmitry Matveev [Tue, 20 Nov 2018 11:00:08 +0000 (14:00 +0300)]
G-API: Recent inclusion has broken STANDALONE build
This MR fixes this.
1over [Mon, 19 Nov 2018 23:48:17 +0000 (00:48 +0100)]
fixed operator- for Rect
Alexander Alekhin [Mon, 19 Nov 2018 19:33:56 +0000 (19:33 +0000)]
dnn: fix format
Alexander Alekhin [Mon, 19 Nov 2018 16:11:52 +0000 (19:11 +0300)]
cmake: don't generate dllmain for cudev module
Alexander Alekhin [Mon, 19 Nov 2018 16:03:20 +0000 (16:03 +0000)]
Merge pull request #13181 from dkurt:ocv_dnn_fpga
Alexander Alekhin [Mon, 19 Nov 2018 15:59:12 +0000 (15:59 +0000)]
Merge pull request #13146 from terfendail:bilateral_nan
Alexander Alekhin [Mon, 19 Nov 2018 15:55:35 +0000 (15:55 +0000)]
Merge pull request #13144 from dkurt:update_tf_mask_rcnn
Evgeny Latkin [Mon, 19 Nov 2018 15:52:48 +0000 (18:52 +0300)]
Merge pull request #13206 from elatkin:el/gapi_perf_rgb2lab
GAPI (fluid): RGB to Lab optimization (#13206)
* GAPI (fluid): BGR2LUV, RGB2Lab: performance test
* GAPI (fluid): BGR2LUV, RGB2Lab: using cv::hal::cvtBGRtoLab
* GAPI (fluid): BGR2LUV, RGB2Lab: hide reference code with #ifdef
Evgeny Latkin [Mon, 19 Nov 2018 14:30:14 +0000 (17:30 +0300)]
Merge pull request #13174 from elatkin:el/gapi_perf_rgb2yuv
GAPI (fluid): RGB to YUV optimization (#13174)
* GAPI (fluid): RGB to YUV: activate performance tests
* GAPI (fluid): speedup 4-8x RGB-to-YUV, 2.5x YUV to RGB with int16 arithmetic
* GAPI (fluid): RGB <--> YUV: fixed compiler warning
* GAPI (fluid): RGB <--> YUV: additional speedup 2-3x times (10-15x over original) via manual CV_SIMD
* GAPI (fluid): RGB <--> YUV: dynamic CV_SIMD dispatching
Dmitry Kurtaev [Fri, 16 Nov 2018 14:09:54 +0000 (17:09 +0300)]
DNN_TARGET_FPGA using Intel's Inference Engine
Alexander Alekhin [Sun, 18 Nov 2018 09:21:45 +0000 (09:21 +0000)]
Merge tag '4.0.0'
OpenCV 4.0.0
Alexander Alekhin [Sun, 18 Nov 2018 09:08:36 +0000 (09:08 +0000)]
release: OpenCV 4.0.0 (version++)
Alexander Alekhin [Sun, 18 Nov 2018 09:19:04 +0000 (09:19 +0000)]
Merge tag '4.0.0-openvino'
OpenCV 4.0.0 for Intel(R) OpenVINO(TM) toolkit
Alexander Alekhin [Sun, 18 Nov 2018 01:36:44 +0000 (01:36 +0000)]
Merge pull request #13195 from alalek:legacy_constants
Alexander Alekhin [Sat, 17 Nov 2018 10:59:23 +0000 (10:59 +0000)]
move legacy C-API constants into separate files
Alexander Alekhin [Sat, 17 Nov 2018 13:50:04 +0000 (13:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 17 Nov 2018 13:00:01 +0000 (13:00 +0000)]
Merge tag '3.4.4'
OpenCV 3.4.4
Alexander Alekhin [Thu, 26 Jul 2018 10:16:22 +0000 (13:16 +0300)]
OpenCV version++ (3.4.4)
OpenCV 3.4.4
Alexander Alekhin [Thu, 26 Jul 2018 10:08:08 +0000 (13:08 +0300)]
experimental version++
Alexander Alekhin [Sat, 17 Nov 2018 10:21:37 +0000 (13:21 +0300)]
Merge pull request #13194 from alalek:samples_fix_python_search_win32
Alexander Alekhin [Sat, 17 Nov 2018 10:20:33 +0000 (13:20 +0300)]
Merge pull request #13192 from alalek:fix_valgrind_3.4
berak [Sat, 17 Nov 2018 10:19:42 +0000 (11:19 +0100)]
Merge pull request #13193 from berak:core_copyMakeBorder
Alexander Alekhin [Sat, 17 Nov 2018 09:42:51 +0000 (09:42 +0000)]
samples(run_python): fix registry values querying
Alexander Alekhin [Sat, 17 Nov 2018 07:32:06 +0000 (07:32 +0000)]
core: fix issues from valgrind builder
Alexander Alekhin [Fri, 16 Nov 2018 21:36:15 +0000 (00:36 +0300)]
Merge pull request #13189 from alalek:cmake_options_warnings_update
Alexander Alekhin [Fri, 16 Nov 2018 21:35:05 +0000 (00:35 +0300)]
Merge pull request #13188 from alalek:samples_rename
* samples: rename starter_imagelist.cpp
* samples: rename intelperc_capture.cpp => videocapture_intelperc.cpp
* samples: rename openni_capture.cpp => videocapture_openni.cpp
* samples: rename image_sequence.cpp => videocapture_image_sequence.cpp
* samples: rename gstreamer_pipeline.cpp => videocapture_gstreamer_pipeline.cpp
* samples: rename autofocus.cpp => videocapture_gphoto2_autofocus.cpp
* samples: rename live_detect_qrcode.cpp => qrcode.cpp
Alexander Alekhin [Fri, 16 Nov 2018 20:42:54 +0000 (20:42 +0000)]
Merge pull request #12908 from alexevans:Issue11855
Dmitry Matveev [Fri, 16 Nov 2018 20:38:10 +0000 (23:38 +0300)]
Merge pull request #13176 from dmatveev:gapi_doxygen
G-API: Doxygen class reference
* G-API Doxygen documentation: covered cv::GComputation
* G-API Doxygen documentation: added sections on compile arguments
* G-API Doxygen documentation: restructuring & more text
* Added new sections (organized API reference into it);
* Documented GCompiled, compile args, backends, etc.
* G-API Doxygen documentation: documented GKernelPackage and added group for meta
Alexander Alekhin [Fri, 16 Nov 2018 20:35:51 +0000 (23:35 +0300)]
Merge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray
Alexander Alekhin [Fri, 16 Nov 2018 20:34:22 +0000 (20:34 +0000)]
Merge pull request #13184 from paroj:imshow_cvtscale
Alexander Alekhin [Fri, 16 Nov 2018 20:23:10 +0000 (20:23 +0000)]
cmake: emit warnings about unsupported options if turned ON only
Christopher Gundler [Fri, 16 Nov 2018 19:50:40 +0000 (20:50 +0100)]
Merge pull request #13131 from Christopher22:add_transposedConv_onnx
* Add support for ConvTranspose when parsing ONNX.
* Add support for ConvTranspose when parsing ONNX.
* Add test for Deconvolution
Alexander Alekhin [Fri, 16 Nov 2018 19:46:22 +0000 (22:46 +0300)]
Merge pull request #13178 from alalek:fix_samples_python_video_params
Alexander Alekhin [Fri, 16 Nov 2018 19:45:57 +0000 (22:45 +0300)]
Merge pull request #13177 from alalek:update_win32_scripts
Alexander Alekhin [Fri, 16 Nov 2018 19:45:33 +0000 (22:45 +0300)]
Merge pull request #12977 from alalek:python_package
Alexander Alekhin [Fri, 16 Nov 2018 19:40:49 +0000 (22:40 +0300)]
Merge pull request #12354 from alalek:samples_find_file