Alexander Alekhin
2dc5e245d0
Merge pull request #13350 from alalek:fix_kw_gapi
2018-12-03 15:16:45 +00:00
Alexander Alekhin
ea3a5950a3
Merge pull request #13346 from alalek:fix_kw_persistence
2018-12-03 15:16:31 +00:00
Alexander Alekhin
4e8311085f
core(persistence): fix KW issues
2018-12-03 17:10:20 +03:00
Alexander Alekhin
c577c2cc6a
gapi: eliminate KW issues
2018-12-03 15:20:47 +03:00
Maksim Shabunin
905d96dd4a
Restored 500ms delay in highgui test
2018-12-03 14:34:29 +03:00
Alexander Alekhin
197285d12a
Merge pull request #13331 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming_patch
2018-11-29 15:39:14 +00:00
Evgeny Latkin
ab430b8c87
Merge pull request #13329 from elatkin:el/gapi_perf_medblur
...
GAPI (fluid): Median blur optimization (#13329 )
* GAPI (fluid): Median blur optimization: reference 3x3
* GAPI (fluid): Median blur optimization: CPU dispatcher
* GAPI (fluid): Median blur optimization: manual CV_SIMD
2018-11-29 18:02:29 +03:00
Dmitry Budnikov
d1029faa90
patch removes gpu mention from ocl backend
2018-11-29 17:05:41 +03:00
Dmitry Budnikov
6374b99a1a
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
2018-11-29 16:29:11 +03:00
Alexander Alekhin
4fb9bce79f
Merge pull request #13264 from mshabunin:fix-windows
2018-11-28 20:00:04 +00:00
Evgeny Latkin
c928c21fe7
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
2018-11-28 19:50:39 +03:00
Evgeny Latkin
992d5b8bcd
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
2018-11-28 18:20:31 +03:00
Evgeny Latkin
6808d33b2f
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
2018-11-27 19:12:14 +03:00
Maksim Shabunin
966f27df34
Merge pull request #13293 from dkurt:dnn_add_extra_ie_net_method
2018-11-27 12:26:09 +00:00
Dmitry Kurtaev
4ba4901ca9
Add serialize method for IE net wrapper
2018-11-27 12:02:00 +03:00
Maksim Shabunin
9de63c1edd
Made FileNode::operator string inline
2018-11-27 11:47:23 +03:00
Dmitry Budnikov
51cc78b2a2
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
2018-11-26 17:44:46 +03:00
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
Alexander Alekhin
223893ea5a
Merge pull request #13242 from terfendail:contours_wintr
2018-11-26 12:29:31 +00:00
Maksim Shabunin
db1c8b3f9e
Restored function to rescale pixel values before imshow
2018-11-26 15:25:05 +03:00
Evgeny Latkin
f07856eab9
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
2018-11-26 15:05:35 +03:00
Dmitry Kurtaev
84ce2cc211
Enable some dnn tests according to the new Intel's Inference Engine release (R4)
2018-11-26 13:02:24 +03:00
Wu Zhiwen
4e65283081
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>
2018-11-26 14:08:37 +08:00
Alexander Alekhin
ca5455c592
Merge pull request #13270 from 1over:flann_dist_fix
2018-11-25 18:27:42 +00:00
Alexander Alekhin
82f4322d18
Merge pull request #13269 from alalek:ocl_fix_kernels_with_use_host_mem
2018-11-25 18:27:01 +00:00
Alexander Alekhin
36b6bcb674
Merge pull request #13268 from alalek:core_findfile_linux_use_dladdr
2018-11-25 18:26:28 +00:00
Alexander Alekhin
5a804e3c74
Merge pull request #13254 from alalek:update_python_install_path
2018-11-25 18:25:48 +00:00
1over
5ff76088b9
fixed memory issue in flann
2018-11-25 01:31:54 +01:00
Alexander Alekhin
9fd822f97e
ocl: fix kernels launching with USE_HOST_PTR UMat
...
created from RAW memory buffers (without proper lifetime management)
2018-11-24 15:37:16 +00:00
Alexander Alekhin
3c49b1dbbe
core: use dladdr() instead of parsing /proc/self/maps
2018-11-24 15:22:54 +00:00
Alexander Alekhin
ad35b79e3f
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
2018-11-24 13:55:46 +00:00
Alexander Alekhin
c6daa4aa16
Merge pull request #13260 from alalek:cmake_ade_12856
2018-11-23 17:09:47 +00:00
Alexander Alekhin
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201
...
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
2018-11-23 20:02:46 +03:00
Dmitry Kurtaev
2f6f52d644
Fix ONNX's emotion_ferplus model.
...
Reduce input size for OpenPose tests
2018-11-23 19:00:17 +03:00
Dmitry Budnikov
a518e7063d
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
2018-11-23 17:51:15 +03:00
Alexander Alekhin
de8696aa43
cmake: allow to disable ADE build too (BUILD_opencv_gapi=OFF is not enough)
...
CMake option: WITH_ADE=OFF
2018-11-23 12:52:41 +03:00
WuZhiwen
02cc1cd6e6
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>
2018-11-22 19:46:30 +03:00
Alexander Alekhin
dc80f9d0fb
Merge pull request #13243 from etienne02:3.4
2018-11-22 16:05:14 +00:00
Alexander Alekhin
ad0d812aa0
Merge pull request #13239 from bramton:freebsd-build-fix
2018-11-22 14:17:35 +00:00
Bram
724620b476
Fixed build on FreeBSD
2018-11-22 09:23:09 +01:00
Etienne Brateau
736683ce2f
Fix missing check part (defined(__cplusplus)) in header types_c.h
2018-11-22 01:39:09 +01:00
pascal
7579cd8068
updated documentation for imread and imwrite (added pfm image format)
2018-11-21 17:59:37 +01:00
Vitaly Tuzov
e9e8bf4b81
Added performance tests for findContours
2018-11-21 19:57:02 +03:00
Vitaly Tuzov
e1a2c034e8
Updated findContours to use wide universal intrinsics
2018-11-21 19:57:02 +03:00
Alexander Alekhin
6b346c92be
Merge pull request #13236 from tomoaki0705:featureHighguiGetProp
2018-11-21 15:55:00 +00:00
Alexander Alekhin
b6a447798a
Merge pull request #13235 from berak:highgui_window_w32
2018-11-21 15:54:42 +00:00
Tomoaki Teshima
a1c073d289
add missing API cvGetPropVisible_W32
2018-11-21 23:04:23 +09:00
berak
9344d0d0e3
highgui: restore convertscale semantics in window_w32.cpp
2018-11-21 11:05:24 +01:00
Alexander Alekhin
7fa7fa0226
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-21 08:33:39 +00:00
Alexander Alekhin
45d2e18808
Merge pull request #13232 from huangqinjin:openmp
2018-11-21 08:32:14 +00:00