Li Peng [Mon, 12 Feb 2018 14:52:37 +0000 (22:52 +0800)]
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>
Li Peng [Sun, 11 Feb 2018 10:12:25 +0000 (18:12 +0800)]
ocl fix for detection_output and prior_box layer
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Mon, 12 Feb 2018 15:39:24 +0000 (15:39 +0000)]
Merge pull request #10845 from alalek:cpu_dispatch_fix_file_generation
Alexander Alekhin [Mon, 12 Feb 2018 14:30:53 +0000 (17:30 +0300)]
cmake: reset __content variable if file doesn't exist
Resolves CMake error after relaunch with updated source code:
Cannot find source file:
modules/dnn/layers/layers_common.avx512_skx.cpp
Alexander Alekhin [Mon, 12 Feb 2018 13:49:53 +0000 (13:49 +0000)]
Merge pull request #10797 from mshabunin:split-convert
Alexander Alekhin [Mon, 12 Feb 2018 13:49:41 +0000 (13:49 +0000)]
Merge pull request #10798 from mshabunin:split-stat
Alexander Alekhin [Mon, 12 Feb 2018 13:48:06 +0000 (13:48 +0000)]
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd
Alexander Alekhin [Mon, 12 Feb 2018 13:47:12 +0000 (13:47 +0000)]
Merge pull request #10843 from luzpaz:misc-modules-typos
Sui Libin [Mon, 12 Feb 2018 13:07:56 +0000 (21:07 +0800)]
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
Maksim Shabunin [Tue, 6 Feb 2018 12:02:51 +0000 (15:02 +0300)]
Split convert.cpp into smaller pieces
luz.paz [Mon, 12 Feb 2018 12:07:39 +0000 (07:07 -0500)]
Misc. modules/ typos
Found via `codespell`
Rémi Ratajczak [Mon, 12 Feb 2018 11:51:07 +0000 (12:51 +0100)]
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
Alexander Alekhin [Mon, 12 Feb 2018 11:48:20 +0000 (14:48 +0300)]
cmake: update reporting of excluded dispatching files (#10711)
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
Namgoo Lee [Mon, 12 Feb 2018 11:41:23 +0000 (20:41 +0900)]
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
Vadim Pisarevsky [Mon, 12 Feb 2018 11:39:59 +0000 (11:39 +0000)]
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
yuki takehara [Mon, 12 Feb 2018 11:36:54 +0000 (20:36 +0900)]
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
Maksim Shabunin [Tue, 6 Feb 2018 12:54:14 +0000 (15:54 +0300)]
Split stat.cpp into smaller pieces
Alexander Alekhin [Fri, 9 Feb 2018 15:22:08 +0000 (18:22 +0300)]
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
Alexander Alekhin [Mon, 12 Feb 2018 09:24:28 +0000 (09:24 +0000)]
Merge pull request #10839 from csukuangfj:fix-9486
Alexander Alekhin [Mon, 12 Feb 2018 09:23:55 +0000 (09:23 +0000)]
Merge pull request #10836 from csukuangfj:fix-10826
Alexander Alekhin [Mon, 12 Feb 2018 09:19:51 +0000 (09:19 +0000)]
Merge pull request #10835 from csukuangfj:fix-10827
Alexander Alekhin [Mon, 12 Feb 2018 09:19:25 +0000 (09:19 +0000)]
Merge pull request #10834 from csukuangfj:fix-issue-9387
Alexander Alekhin [Mon, 12 Feb 2018 09:12:39 +0000 (09:12 +0000)]
Merge pull request #10833 from csukuangfj:improve-viz3d
Fangjun Kuang [Sun, 11 Feb 2018 07:49:33 +0000 (15:49 +0800)]
fix issue #9387 and #9575.
Fangjun Kuang [Sun, 11 Feb 2018 12:08:53 +0000 (20:08 +0800)]
fix issue #9486.
Fangjun Kuang [Sun, 11 Feb 2018 06:15:50 +0000 (14:15 +0800)]
improve the doc for the viz module.
Fangjun Kuang [Sun, 11 Feb 2018 08:01:21 +0000 (16:01 +0800)]
Fix issue 10826.
Fangjun Kuang [Sun, 11 Feb 2018 07:54:36 +0000 (15:54 +0800)]
Fix issue 10827.
Alexander Alekhin [Sat, 10 Feb 2018 12:26:59 +0000 (12:26 +0000)]
Merge pull request #10813 from alalek:cmake_cxx_flags
Alexander Alekhin [Fri, 9 Feb 2018 15:32:50 +0000 (15:32 +0000)]
Merge pull request #10820 from alalek:python_isystem
Alexander Alekhin [Fri, 9 Feb 2018 15:24:33 +0000 (15:24 +0000)]
Merge pull request #10819 from alalek:ocl_fix_dgpu_locks
Alexander Alekhin [Fri, 9 Feb 2018 14:10:02 +0000 (17:10 +0300)]
cmake: use -isystem for Python/numpy include directories
Alexander Alekhin [Thu, 8 Feb 2018 15:21:46 +0000 (18:21 +0300)]
build: eliminate c++17 Python build warning
Alexander Alekhin [Wed, 7 Feb 2018 16:15:47 +0000 (19:15 +0300)]
cmake: update adding of extra compiler flags
Read flags from 'cache' instead of resetting them
Alexander Alekhin [Fri, 9 Feb 2018 10:58:29 +0000 (13:58 +0300)]
ocl: allow recursive UMatData lock() calls with the same objects
OpenCLAllocator::copy() may call upload()/download() methods
Dmitry Kurtaev [Wed, 7 Feb 2018 08:28:45 +0000 (11:28 +0300)]
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
take1014 [Thu, 8 Feb 2018 19:54:43 +0000 (04:54 +0900)]
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
Alexander Alekhin [Thu, 8 Feb 2018 19:14:30 +0000 (19:14 +0000)]
Merge pull request #10814 from luzpaz:opencv-misc-apps-docs-platforms-typos
luz.paz [Thu, 8 Feb 2018 18:04:25 +0000 (13:04 -0500)]
Misc. ./apps ./doc ./platoforms typos
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
Alexander Alekhin [Thu, 8 Feb 2018 12:07:14 +0000 (12:07 +0000)]
Merge pull request #10812 from luzpaz:opencv-misc-samples-dir-typos
luz.paz [Thu, 8 Feb 2018 10:51:54 +0000 (05:51 -0500)]
Misc. ./samples typos
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
Vadim Pisarevsky [Wed, 7 Feb 2018 13:43:09 +0000 (13:43 +0000)]
Merge pull request #10807 from luzpaz:misc-typos
Vadim Pisarevsky [Wed, 7 Feb 2018 13:42:08 +0000 (13:42 +0000)]
Merge pull request #10799 from dkurt:dnn_inference_engine_face_detection
Vadim Pisarevsky [Wed, 7 Feb 2018 13:28:22 +0000 (13:28 +0000)]
Merge pull request #10806 from alalek:build_cxx17
luz.paz [Wed, 7 Feb 2018 11:59:15 +0000 (06:59 -0500)]
Some mist. typo fixes
Found via `codespell -i 3 -w --skip="./3rdparty" -I ../opencv-whitelist.txt`
Alexander Alekhin [Tue, 6 Feb 2018 16:05:34 +0000 (19:05 +0300)]
build: eliminate calls of removed functionality from C++17
Most part is deprecated since C++11
Alexander Alekhin [Tue, 6 Feb 2018 17:56:33 +0000 (17:56 +0000)]
Merge pull request #10800 from alalek:parallel_for_update
Alexander Alekhin [Tue, 6 Feb 2018 14:56:58 +0000 (17:56 +0300)]
core(parallel_for): fix data race
Dmitry Kurtaev [Tue, 6 Feb 2018 13:23:18 +0000 (16:23 +0300)]
OpenCV face detection network using Inference Engine backend
Alexander Alekhin [Tue, 6 Feb 2018 14:37:09 +0000 (14:37 +0000)]
Merge pull request #10787 from dkurt:dnn_tutorial_face_detection
Alexander Alekhin [Tue, 6 Feb 2018 13:10:41 +0000 (16:10 +0300)]
core(parallel_for): cleanup
remove 'dont_wait' (can be replaced with has_wake_signal)
Dmitry Kurtaev [Mon, 5 Feb 2018 15:10:18 +0000 (18:10 +0300)]
Test for FP16 version of OpenCV face detection network
Alexander Alekhin [Tue, 6 Feb 2018 10:04:29 +0000 (10:04 +0000)]
Merge pull request #10795 from pengli:dnn
Li Peng [Tue, 6 Feb 2018 12:47:00 +0000 (20:47 +0800)]
check vector emptiness before access it
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 1 Feb 2018 17:24:27 +0000 (01:24 +0800)]
slice layer ocl update
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 6 Feb 2018 09:33:57 +0000 (09:33 +0000)]
Merge pull request #9770 from alalek:refactor_test_files
Maksim Shabunin [Tue, 6 Feb 2018 08:59:32 +0000 (11:59 +0300)]
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
Dmitry Kurtaev [Tue, 6 Feb 2018 08:57:35 +0000 (11:57 +0300)]
Intel Inference Engine deep learning backend (#10608)
* Intel Inference Engine deep learning backend.
* OpenFace network using Inference Engine backend
Vadim Pisarevsky [Tue, 6 Feb 2018 08:54:16 +0000 (08:54 +0000)]
Merge pull request #10789 from mshabunin:split-matrix
Maksim Shabunin [Mon, 5 Feb 2018 16:16:33 +0000 (19:16 +0300)]
Split matrix.cpp into smaller pieces
Alexander Alekhin [Mon, 5 Feb 2018 14:07:40 +0000 (14:07 +0000)]
Merge pull request #10764 from sturkmen72:update_cmake
Suleyman TURKMEN [Fri, 2 Feb 2018 11:19:29 +0000 (14:19 +0300)]
update CMakeList.txt
berak [Mon, 5 Feb 2018 12:07:40 +0000 (13:07 +0100)]
Merge pull request #10777 from berak:dnn_colorize_cpp
* dnn: add colorization.cpp
* Update arguments of dnn/colorization.py
Vadim Pisarevsky [Mon, 5 Feb 2018 10:10:16 +0000 (10:10 +0000)]
Merge pull request #10782 from csukuangfj:patch-1
Dmitry Kurtaev [Mon, 5 Feb 2018 10:00:43 +0000 (13:00 +0300)]
Tool to generate text graphs for SSD models from TensorFlow (#10723)
* Added tool to generate text graph for SSD models from TensorFlow
* Update tf_text_graph_ssd.py
Alexander Alekhin [Mon, 5 Feb 2018 09:33:03 +0000 (09:33 +0000)]
Merge pull request #10759 from mshabunin:fix-msvc-lto-debug
csukuangfj [Mon, 5 Feb 2018 03:26:25 +0000 (11:26 +0800)]
Fix issue #10781
Fix issue #10781.
Alexander Alekhin [Sun, 4 Feb 2018 13:52:09 +0000 (13:52 +0000)]
Merge pull request #10775 from alalek:update_valgrind_suppression
Alexander Alekhin [Sat, 3 Feb 2018 22:59:45 +0000 (22:59 +0000)]
valgrind: update suppression rules
Alexander Alekhin [Sat, 3 Feb 2018 19:48:19 +0000 (19:48 +0000)]
Merge pull request #10769 from mshabunin:add-tbb-cmake-support
Alexander Alekhin [Sat, 3 Feb 2018 18:51:22 +0000 (18:51 +0000)]
cuda: don't use std::numeric_limits
CUDA code uses own implementation in cuda/limits.hpp
Alexander Alekhin [Fri, 2 Feb 2018 20:45:38 +0000 (20:45 +0000)]
cudev(test): avoid namespace check
Alexander Alekhin [Sun, 5 Nov 2017 13:48:40 +0000 (13:48 +0000)]
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
Maksim Shabunin [Sat, 3 Feb 2018 11:27:46 +0000 (14:27 +0300)]
TBB: added workaround for linking issue with conflicting system and custom libraries
Maksim Shabunin [Sat, 3 Feb 2018 10:51:54 +0000 (13:51 +0300)]
cmake: support searching for TBB via cmake package mechanism
Alexander Alekhin [Tue, 3 Oct 2017 15:26:14 +0000 (18:26 +0300)]
ts: fix missing std::tr1 (C++17)
Alexander Alekhin [Fri, 2 Feb 2018 19:26:48 +0000 (19:26 +0000)]
Merge pull request #10767 from alalek:fix_cmake
Alexander Alekhin [Fri, 2 Feb 2018 18:52:54 +0000 (21:52 +0300)]
cmake: fix includes processing
Rostislav Vasilikhin [Fri, 2 Feb 2018 18:35:44 +0000 (21:35 +0300)]
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
Alexander Alekhin [Fri, 2 Feb 2018 16:25:17 +0000 (16:25 +0000)]
Merge pull request #10766 from mshabunin:fix-world-interface-include
Alexander Alekhin [Fri, 2 Feb 2018 16:07:48 +0000 (16:07 +0000)]
Merge pull request #10758 from mshabunin:allow-many-contrib
Alexander Alekhin [Fri, 2 Feb 2018 16:03:15 +0000 (16:03 +0000)]
Merge pull request #10765 from BelBES:sb/findContours_fix
Maksim Shabunin [Fri, 2 Feb 2018 15:14:25 +0000 (18:14 +0300)]
Fixed components INTERFACE_INCLUDE_DIRECTORY property in "world" builds
Harshal Nishar [Fri, 2 Feb 2018 14:00:11 +0000 (19:30 +0530)]
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
sergeybe [Fri, 2 Feb 2018 13:46:05 +0000 (16:46 +0300)]
fix FindContours default offset for CV_LINK_RUNS method
Vadim Pisarevsky [Fri, 2 Feb 2018 11:27:26 +0000 (11:27 +0000)]
Merge pull request #10761 from seiko2plus:issue10753
Alexander Alekhin [Fri, 2 Feb 2018 10:48:49 +0000 (10:48 +0000)]
Merge pull request #10751 from nglee:dev
Ya-Chiu Wu [Fri, 2 Feb 2018 10:20:46 +0000 (18:20 +0800)]
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
Alexander Alekhin [Fri, 2 Feb 2018 09:34:59 +0000 (12:34 +0300)]
Merge pull request #10763 from alalek:issue_10760
Alexander Alekhin [Fri, 2 Feb 2018 09:26:22 +0000 (12:26 +0300)]
js: filterout OpenCL headers
Sayed Adel [Fri, 2 Feb 2018 03:31:25 +0000 (03:31 +0000)]
core:ppc Fix compile issue with Eigen
Alexander Alekhin [Thu, 1 Feb 2018 18:34:56 +0000 (18:34 +0000)]
Merge pull request #10756 from terfendail:orb_firstlevel
Alexander Alekhin [Thu, 1 Feb 2018 18:32:13 +0000 (18:32 +0000)]
Merge pull request #10706 from alalek:exception_opencv_version
Alexander Alekhin [Thu, 1 Feb 2018 18:31:52 +0000 (18:31 +0000)]
Merge pull request #10705 from alalek:opencv_version_update
Maksim Shabunin [Thu, 1 Feb 2018 16:22:48 +0000 (19:22 +0300)]
Do not enable LTO flags for MSVC debug configuration
Maksim Shabunin [Thu, 1 Feb 2018 14:08:01 +0000 (17:08 +0300)]
cmake: allow providing list of extra modules paths
Vitaly Tuzov [Thu, 1 Feb 2018 13:58:35 +0000 (16:58 +0300)]
Fixed assertion in ORB::setFirstLevel()
Vadim Pisarevsky [Thu, 1 Feb 2018 13:41:29 +0000 (13:41 +0000)]
Merge pull request #10690 from terfendail:orb_firstlevel
Maksim Shabunin [Thu, 1 Feb 2018 13:30:23 +0000 (16:30 +0300)]
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
Vadim Pisarevsky [Thu, 1 Feb 2018 13:28:10 +0000 (13:28 +0000)]
Merge pull request #10730 from dkurt:dnn_faster_rcnn_rfcn_tests