Li Peng
5992c46606
add fallback case for ocl convolution
...
The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 00:04:38 +08:00
Li Peng
00d2f34888
ocl fix for detection_output and prior_box layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-13 23:09:14 +08:00
Alexander Alekhin
a91a11e533
Merge pull request #10818 from mshabunin:install-samples-src
2018-02-13 14:37:38 +00:00
Alexander Alekhin
eb54e5c55c
core: generalize and fix x86 'cpuid' calls
2018-02-13 15:35:04 +03:00
Dmitry Kurtaev
514e6df460
Refactored deep learning layers fusion
2018-02-13 14:35:58 +03:00
Tomoaki Teshima
94253e8b83
fix build error on Visual Studio 2013 and earlier
2018-02-13 18:30:02 +09:00
Dmitry Kurtaev
a6baedd02c
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.
2018-02-13 11:00:27 +03:00
Maksim Shabunin
8393d755f6
Fixed OpenGL-specific compilation warning (unused function)
2018-02-12 18:42:36 +03:00
luz.paz
e805a55a5b
Misc. modules/ typos (cont.)
...
Found via `codespell`
2018-02-12 10:15:36 -05:00
Alexander Alekhin
17233c687e
Merge pull request #10797 from mshabunin:split-convert
2018-02-12 13:49:53 +00:00
Alexander Alekhin
57cbde3393
Merge pull request #10798 from mshabunin:split-stat
2018-02-12 13:49:41 +00:00
Alexander Alekhin
579781e35e
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd
2018-02-12 13:48:06 +00:00
Alexander Alekhin
66f3c1ae79
Merge pull request #10843 from luzpaz:misc-modules-typos
2018-02-12 13:47:12 +00:00
Sui Libin
1ad814a191
fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). ( #10724 )
...
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.
* find_odj onmouse bug about find matched point status.
* reverted AutoBuffer back to std::vector
2018-02-12 16:07:56 +03:00
Maksim Shabunin
221342fb25
Split convert.cpp into smaller pieces
2018-02-12 15:17:19 +03:00
luz.paz
5718d09e39
Misc. modules/ typos
...
Found via `codespell`
2018-02-12 07:09:43 -05:00
Rémi Ratajczak
b67523550f
dnn : Added an imagesFromBlob method to the dnn module ( #10607 )
...
* Added the imagesFromBlob method to the dnn module.
* Rewritten imagesFromBlob based on first dkurt comments
* Updated code with getPlane()
* Modify comment of imagesFromBlob() in dnn module
* modified comments, removed useless assertions & added OutputArrayOfArray
* replaced tabs with whitespaces & put vectorOfChannels instantiation outside the loop
* Changed pre-commit.sample to pre-commit in .git/hooks/
* Added a test for imagesFromBlob in test_misc.cpp (dnn)
* Changed nbOfImages, robustified test with cv::randu, modified assertion
2018-02-12 14:51:07 +03:00
Alexander Alekhin
5a791e6e06
cmake: update reporting of excluded dispatching files ( #10711 )
...
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
2018-02-12 14:48:20 +03:00
Namgoo Lee
61e76e767d
Update BufferReader documentation with some example code ( #10803 )
...
* Update BufferReader documentation with some example code
* Add warning to BufferPool doc regarding deallocation of StackAllocator
* Added a sample code that satisfies LIFO rule for StackAllocator
2018-02-12 14:41:23 +03:00
Vadim Pisarevsky
51b5fdba25
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
2018-02-12 11:40:00 +00:00
yuki takehara
379ea15d16
Add new Mat constructor ( #10808 )
...
* Add new Mat constructor
* Fix build error
* Fix build error
* Fixed the code about 4 comments
* Fixed three comments
* delete previous local declaration
* fix build error
2018-02-12 14:36:54 +03:00
Maksim Shabunin
4437e0c3b9
Split stat.cpp into smaller pieces
2018-02-12 14:14:08 +03:00
Alexander Alekhin
fad3a6bf15
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
2018-02-12 14:06:57 +03:00
Alexander Alekhin
ab0f0f26a1
Merge pull request #10839 from csukuangfj:fix-9486
2018-02-12 09:24:29 +00:00
Alexander Alekhin
b7ad95beaa
Merge pull request #10836 from csukuangfj:fix-10826
2018-02-12 09:23:55 +00:00
Alexander Alekhin
2c8da29f3a
Merge pull request #10835 from csukuangfj:fix-10827
2018-02-12 09:19:52 +00:00
Alexander Alekhin
efd3fafa25
Merge pull request #10834 from csukuangfj:fix-issue-9387
2018-02-12 09:19:25 +00:00
Alexander Alekhin
d61528b2d5
Merge pull request #10833 from csukuangfj:improve-viz3d
2018-02-12 09:12:39 +00:00
Fangjun Kuang
e8b2c5682e
fix issue #9387 and #9575 .
2018-02-11 21:04:20 +08:00
Fangjun Kuang
ce2a65db85
fix issue #9486 .
2018-02-11 20:08:53 +08:00
Fangjun Kuang
2f3d4df2f2
improve the doc for the viz module.
2018-02-11 16:14:09 +08:00
Fangjun Kuang
6205981235
Fix issue 10826.
2018-02-11 16:01:21 +08:00
Fangjun Kuang
28a78003f0
Fix issue 10827.
2018-02-11 15:54:36 +08:00
Alexander Alekhin
e2a99d24ec
Merge pull request #10813 from alalek:cmake_cxx_flags
2018-02-10 12:27:00 +00:00
Alexander Alekhin
601e3aaf98
Merge pull request #10820 from alalek:python_isystem
2018-02-09 15:32:50 +00:00
Alexander Alekhin
dd2fd39c05
Merge pull request #10819 from alalek:ocl_fix_dgpu_locks
2018-02-09 15:24:33 +00:00
Alexander Alekhin
84887d3011
cmake: use -isystem for Python/numpy include directories
2018-02-09 17:10:02 +03:00
Alexander Alekhin
9e298ea1bb
build: eliminate c++17 Python build warning
2018-02-09 17:09:36 +03:00
Alexander Alekhin
42e1fe301c
ocl: allow recursive UMatData lock() calls with the same objects
...
OpenCLAllocator::copy() may call upload()/download() methods
2018-02-09 14:19:10 +03:00
Dmitry Kurtaev
7fe97376c2
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
2018-02-09 13:45:45 +03:00
take1014
03407a9da0
Merge pull request #10646 from take1014:master
...
* Add a new interface for hough transform
* Fixed warning code
* Fix HoughLinesUsingSetOfPoints based on HoughLinesStandard
* Delete memset
* Rename HoughLinesUsingSetOfPoints and add common function
* Fix test error
* Change static function name
* Change using CV_Assert instead of if-block and add integer test case
* I solve the conflict and delete 'std :: tr1' and changed it to use 'tuple'
* I deleted std::tr1::get and changed int to use 'get'
* Fixed sample code
* revert test_main.cpp
* Delete sample code in comment and add snippets
* Change file name
* Delete static function
* Fixed build error
2018-02-08 22:54:43 +03:00
Vadim Pisarevsky
835acd3f31
Merge pull request #10799 from dkurt:dnn_inference_engine_face_detection
2018-02-07 13:42:08 +00:00
Alexander Alekhin
44d7435a48
build: eliminate calls of removed functionality from C++17
...
Most part is deprecated since C++11
2018-02-07 12:00:33 +03:00
Alexander Alekhin
f77f2876ff
Merge pull request #10800 from alalek:parallel_for_update
2018-02-06 17:56:33 +00:00
Alexander Alekhin
914f57f28d
core(parallel_for): fix data race
2018-02-06 18:19:50 +03:00
Dmitry Kurtaev
ed94136548
OpenCV face detection network using Inference Engine backend
2018-02-06 17:53:24 +03:00
Alexander Alekhin
c973aaabc5
Merge pull request #10787 from dkurt:dnn_tutorial_face_detection
2018-02-06 14:37:09 +00:00
Vitaly Tuzov
3267fb90c6
Updated check on OutputArray to allow recreation of fixed_size for 1-d sizes array
2018-02-06 17:07:36 +03:00
Alexander Alekhin
b10fedde56
core(parallel_for): cleanup
...
remove 'dont_wait' (can be replaced with has_wake_signal)
2018-02-06 16:10:41 +03:00
Dmitry Kurtaev
8817907647
Test for FP16 version of OpenCV face detection network
2018-02-06 13:16:07 +03:00
Alexander Alekhin
398ebbac98
Merge pull request #10795 from pengli:dnn
2018-02-06 10:04:29 +00:00
Li Peng
c43498c6ad
check vector emptiness before access it
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:51 +08:00
Li Peng
389fa5d38e
slice layer ocl update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-06 22:59:47 +08:00
Alexander Alekhin
2a1f46c42d
Merge pull request #9770 from alalek:refactor_test_files
2018-02-06 09:33:58 +00:00
Maksim Shabunin
e225850cc6
Split persistence.cpp into smaller pieces ( #10788 )
...
* Extracted base64 persistence functionality
* Extracted YML persistence functionality
* Extracted JSON persistence functionality
* Extracted XML persistence functionality
* Extracted public C and C++ interfaces implementation in persistence
* Persistence: cleanup and fixes
* fixup! Persistence: cleanup and fixes
2018-02-06 11:59:32 +03:00
Dmitry Kurtaev
10e1de74d2
Intel Inference Engine deep learning backend ( #10608 )
...
* Intel Inference Engine deep learning backend.
* OpenFace network using Inference Engine backend
2018-02-06 11:57:35 +03:00
Vadim Pisarevsky
292dfc2d72
Merge pull request #10789 from mshabunin:split-matrix
2018-02-06 08:54:16 +00:00
denmatfoton
b085158d59
Fix unstable work of stereoRectify function. Issue description: https://github.com/opencv/opencv/issues/10791
2018-02-05 15:30:26 -05:00
Maksim Shabunin
904640c9ae
Split matrix.cpp into smaller pieces
2018-02-05 19:16:33 +03:00
Alexander Alekhin
06455fc0cd
Merge pull request #10764 from sturkmen72:update_cmake
2018-02-05 14:07:40 +00:00
Suleyman TURKMEN
3b191bf2dd
update CMakeList.txt
2018-02-05 16:23:52 +03:00
csukuangfj
f1c91a8d34
Fix issue #10781
...
Fix issue #10781 .
2018-02-05 11:26:25 +08:00
Alexander Alekhin
0d01b97b75
cuda: don't use std::numeric_limits
...
CUDA code uses own implementation in cuda/limits.hpp
2018-02-03 19:43:05 +00:00
Alexander Alekhin
7fedfa0380
cudev(test): avoid namespace check
2018-02-03 19:39:47 +00:00
Alexander Alekhin
4a297a2443
ts: refactor OpenCV tests
...
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
2018-02-03 19:39:47 +00:00
Alexander Alekhin
f1e50ecab3
ts: fix missing std::tr1 (C++17)
2018-02-02 20:02:45 +00:00
Alexander Alekhin
a0ce12f8ba
Merge pull request #10767 from alalek:fix_cmake
2018-02-02 19:26:49 +00:00
Alexander Alekhin
3d6659112f
cmake: fix includes processing
2018-02-02 21:52:54 +03:00
Rostislav Vasilikhin
1055f9d208
Merge pull request #10757 from savuor:test_hist_renew
...
* old types removed
* QueryHist tests: new types
* ThreshHist tests: new types
* CalcHist tests: new types
* CalcBackProject tests: new types
* CalcBackProjectPatch tests: new types
* const ref added
2018-02-02 21:35:44 +03:00
Alexander Alekhin
877b175565
Merge pull request #10758 from mshabunin:allow-many-contrib
2018-02-02 16:07:48 +00:00
Alexander Alekhin
82f889d9b8
Merge pull request #10765 from BelBES:sb/findContours_fix
2018-02-02 16:03:15 +00:00
Harshal Nishar
384fa95680
Fix in Canny when Sobel apertureSize is 7 ( #10743 )
...
* Fixing a bug in Canny implemetation when Sobel aperture size is 7.
* Fixing the bug in Canny accross variants and in test_canny.cpp
* Replacing a tab with white space
2018-02-02 17:00:11 +03:00
sergeybe
2266a8c85f
fix FindContours default offset for CV_LINK_RUNS method
2018-02-02 16:46:05 +03:00
Vadim Pisarevsky
83761d5f8e
Merge pull request #10761 from seiko2plus:issue10753
2018-02-02 11:27:26 +00:00
Alexander Alekhin
ecbd5b0574
Merge pull request #10751 from nglee:dev
2018-02-02 10:48:50 +00:00
Ya-Chiu Wu
c8d8b1fbcd
Merge pull request #10553 from GlueCrow:bgfg_knn_opencl
...
Add ocl version BackgroundSubtractorKNN (#10553 )
* Add ocl version bgfg_knn
* Add ocl KNN perf test
* ocl KNN: Avoid unnecessary initializing when non-UMat parameters are used
* video: turn off OpenCL for color KNN on Intel devices
due performance degradation
* video: turn off KNN OpenCL on Apple devices with Intel iGPU
due process freeze during clBuildProgram() call
2018-02-02 13:20:46 +03:00
Alexander Alekhin
02bc17be6f
js: filterout OpenCL headers
2018-02-02 12:26:22 +03:00
Sayed Adel
534dcbe017
core:ppc Fix compile issue with Eigen
2018-02-02 03:31:25 +00:00
Alexander Alekhin
12cd3b55ec
Merge pull request #10756 from terfendail:orb_firstlevel
2018-02-01 18:34:57 +00:00
Alexander Alekhin
bbfa239036
Merge pull request #10706 from alalek:exception_opencv_version
2018-02-01 18:32:13 +00:00
Alexander Alekhin
c96630c9f0
Merge pull request #10705 from alalek:opencv_version_update
2018-02-01 18:31:52 +00:00
Maksim Shabunin
82aff110b7
cmake: allow providing list of extra modules paths
2018-02-01 19:02:02 +03:00
Vitaly Tuzov
26321795f7
Fixed assertion in ORB::setFirstLevel()
2018-02-01 16:58:35 +03:00
Vadim Pisarevsky
f780ee12a0
Merge pull request #10690 from terfendail:orb_firstlevel
2018-02-01 13:41:29 +00:00
Maksim Shabunin
e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
Vadim Pisarevsky
36222c9eed
Merge pull request #10730 from dkurt:dnn_faster_rcnn_rfcn_tests
2018-02-01 13:28:10 +00:00
Vadim Pisarevsky
8436dac090
Merge pull request #10742 from alalek:fix_winrt_fs_build
2018-02-01 13:23:49 +00:00
Vadim Pisarevsky
713ec7be45
Merge pull request #10746 from dkurt:dnn_batch_norm_from_nvidia_caffe
2018-02-01 13:22:09 +00:00
Alexander Alekhin
42569cfd61
Merge pull request #10748 from dkurt:fix_dnn_slice_layer
2018-02-01 13:21:17 +00:00
Alexander Alekhin
9d25bd583f
Merge pull request #10754 from dkurt:dnn_ocl_gemv_min_globalsize
2018-02-01 12:39:27 +00:00
Aditya Rohan
ccea0a831a
Merge pull request #10732 from Riyuzakii:10598
...
* Introduces error throw for line drawn with THICKNESS=0
2018-02-01 15:21:00 +03:00
Dmitry Kurtaev
65a6674c6e
ocl4dnnGEMV in case of row_size < 4
2018-02-01 14:06:47 +03:00
Alexander Alekhin
9698b93d10
Merge pull request #10717 from pengli:dnn
2018-02-01 10:49:54 +00:00
Li Peng
6aec71d7ee
mvn layer ocl update
...
it fuse ocl kernels to reduce kernel enqueue
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:48:12 +08:00
Li Peng
83b16ab7b7
fix extra spaces in build option
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:11 +08:00
Li Peng
54c81cbde4
eltwise layer SUM op update
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-01 17:46:06 +08:00
Namgoo Lee
3cf535926a
cuda_stream: do not allocate GPU memory by default ( fixes #8725 )
2018-02-01 03:55:52 +09:00
Dmitry Kurtaev
184862582c
Fix slice layer from TensorFlow
2018-01-31 19:12:37 +03:00
Arjan van de Ven
a75840d19c
Merge pull request #10468 from fenrus75:avx512-2
...
* Add a 512 bit codepath to the AVX512 fastConv function
this patch adds a 512 wide codepath to the fastConv() function for
AVX512 use.
The basic idea is to process the first N * 16 elements of the vector
with avx512, and then run the rest of the vector using the traditional
AVX2 codepath.
* dnn: use unaligned AVX512 load (OpenCV aligns data on 32-byte boundary)
* dnn: change "vecsize" condition for AVX512
* dnn: fix indentation
2018-01-31 16:34:12 +03:00
Alexander Alekhin
f06c44f1f1
Merge pull request #10701 from dkurt:tf_ave_pooling
2018-01-31 13:28:09 +00:00