mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,697 Commits 6 Branches 126 Tags 3 GiB
09fa758725
Commit Graph

17582 Commits

Author SHA1 Message Date
Alexander Alekhin
3f302cabb8 core(test): intrinsic tests for all dispatched CPU optimizations 
- tests for both SIMD128 / SIMD256
- different dispatched + baseline(SIMD128) intrinsics
 2018-08-01 13:50:42 +03:00
Dmitry Kurtaev
8e034053af Faster-RCNN from TensorFlow on CPU with Intel's Inference Engine backend 2018-08-01 11:29:58 +03:00
luz.paz
1e1a1855ae Source typo fixes 2018-07-31 18:44:23 +03:00
luz.paz
2003eb1b9b Misc. typos 
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
 2018-07-31 18:44:23 +03:00
Alexander Alekhin
7e71b1079e Merge pull request #12103 from alalek:ocl_fix_crash 2018-07-31 14:55:43 +00:00
Alexander Alekhin
814ebe39ae Merge pull request #12113 from dkurt:dnn_fix_ssd_on_myriad 2018-07-31 14:55:18 +00:00
Alexander Alekhin
61c870ae09 Merge pull request #12080 from mshabunin:fix-static-3 2018-07-31 14:53:28 +00:00
Maksim Shabunin
7cf52de47e dnn: modified IE search, R2 compatibility fixed 2018-07-31 14:48:06 +03:00
Dmitry Kurtaev
ed0e79cb61 Add missing parameter to DetectionOutput layer from Intel's Inference Engine 2018-07-31 11:37:45 +03:00
Sayed Adel
bb82cdc928 core:test Fix fp16 build if AVX2 sets as baseline 2018-07-31 10:02:20 +02:00
Alexander Alekhin
28d0e97c09 Merge pull request #12004 from mshabunin:more-asserts 2018-07-30 16:42:09 +00:00
Alexander Alekhin
5bde800ee3 Merge pull request #12088 from alalek:ocl_callback_catch_exceptions 2018-07-30 16:33:41 +00:00
Alexander Alekhin
29a1dc5719 Merge pull request #12087 from alalek:docs_videowriter_write_bgr_input 2018-07-30 16:33:23 +00:00
Alexander Alekhin
dbf3362c4d Merge pull request #12056 from seiko2plus:coreExpandTests 2018-07-30 16:23:11 +00:00
Alexander Alekhin
c4e0f4b2b5 Merge pull request #12102 from csukuangfj:patch_3 2018-07-30 12:48:06 +00:00
Alexander Alekhin
e90e398e7a core(ocl): do not split refcount operations / compare 
- check result from CV_XADD() directly
- decrease urefcount after unmap() call only
 2018-07-30 15:42:09 +03:00
miaow1988
2988260107 Fixed the int size overflow bug of cv::Mat.push_back(). 
Changed the type of variable *r* from int to size_t.
This change makes sure that a valid result of std::max(r + delta,
(r*3+1)/2) can be passed into the reserve function.
 2018-07-30 18:36:19 +08:00
Kuang Fangjun
83039c8752 fix a typo. 2018-07-30 18:18:18 +08:00
Sayed Adel
6499263b41 core:test Expand hal_intrin tests to support SIMD256 2018-07-30 08:50:50 +02:00
Sayed Adel
47202b3349 core:avx2 fix unaligned store for v_store_interleave v_uint32x8-3ch 2018-07-29 18:22:46 +02:00
Alexander Alekhin
9076bb6089 Merge pull request #12081 from mshabunin:fix-ie-build 2018-07-28 20:34:19 +00:00
Alexander Alekhin
89528d7c3a core(ocl): don't expose exceptions from OpenCL callback 
to avoid silent crashes of OpenCL worker threads.
 2018-07-28 10:29:26 +00:00
Alexander Alekhin
0bef42ba12 videoio: add note about image BGR format VideoWriter::write() 2018-07-28 09:08:09 +00:00
Alexander Alekhin
b41bc0ae59 Merge pull request #12067 from mshabunin:clean-test-case-list 2018-07-28 06:21:53 +00:00
Maksim Shabunin
fb1f12021b Fixed build with latest IE version 2018-07-27 19:56:35 +03:00
Maksim Shabunin
dd8e990451 Fixed several issues found by static analysis, GStreamer backend 2018-07-27 18:41:39 +03:00
Maksim Shabunin
e031bada7d Fixed several issues found by static analysis, Windows-specific 2018-07-27 18:25:55 +03:00
Alexander Alekhin
b597c87bed dnn(ocl): avoid memory access violation 2018-07-27 15:35:11 +03:00
Maksim Shabunin
0aded5aae6 cmake: fixed builds in directories containing plus sign 2018-07-27 15:05:56 +03:00
Alexander Alekhin
2f0fc920dd Merge pull request #12061 from alalek:dnn_test_skip_checks_only 2018-07-26 15:15:32 +00:00
Alexander Alekhin
9137e2d635 Merge pull request #12060 from alalek:dnn_debug_layers 2018-07-26 15:14:32 +00:00
Alexander Alekhin
c37d1a53b5 Merge pull request #12025 from Triplesalt:tfimport-relu 2018-07-26 15:08:05 +00:00
Maksim Shabunin
1165fdd0f5 Added more strict checks for empty inputs to compare, meanStdDev and RNG::fill 2018-07-26 18:06:38 +03:00
Maksim Shabunin
597db69151 ts: test case list is printed after cmd line parsing, refactored 2018-07-26 16:43:43 +03:00
Triplesalt
9eb79926df Allow a different input order for Mul+Maximum. 
Squashed : ReLU operand order tests.
 2018-07-26 14:19:11 +02:00
Vadim Pisarevsky
fa466b022d Merge pull request #12052 from dkurt:dnn_ie_torch_tests 2018-07-26 09:09:35 +00:00
Vadim Pisarevsky
43820d89b4
further improvements in split & merge; started using non-temporary store instructions (#12063) 
* 1. changed static const __m128/256 to const __m128/256 to avoid wierd instructions and calls inserted by compiler.
2. added universal intrinsics that wrap MOVNTPS and other such (non-temporary or "no cache" store) instructions. v_store_interleave() and v_store() got respective flags/overloaded variants
3. rewrote split & merge to use the "no cache" store instructions. It resulted in dramatic performance improvement when processing big arrays

* hopefully, fixed some test failures where 4-channel v_store_interleave() is used

* added missing implementation of the new universal intrinsics (v_store_aligned_nocache() etc.)

* fixed silly typo in the new intrinsics in intrin_vsx.hpp

* still trying to fix VSX compiler errors

* still trying to fix VSX compiler errors

* still trying to fix VSX compiler errors

* still trying to fix VSX compiler errors
 2018-07-26 12:04:28 +03:00
Dmitry Kurtaev
faa6c4e1e1 Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend. 
Enable Torch layers tests with Intel's Inference Engine backend.
 2018-07-25 19:04:55 +03:00
Alexander Alekhin
dd8701c1a0 dnn(test): skip checks only for unstable tests 
but execute tested functions in Layer_Test_Halide/Convolution.Accuracy
 2018-07-25 16:55:21 +03:00
Alexander Alekhin
74cf48b5d7 dnn(test): use Backend/Target enums 
instead of 'int'
 2018-07-25 16:55:21 +03:00
Alexander Alekhin
45b5b3c13a dnn: check layer output for NaN/Inf 2018-07-25 16:25:18 +03:00
Alexander Alekhin
5336b9ad19 Merge pull request #12048 from mshabunin:fix-static-2 2018-07-24 19:45:27 +00:00
Alexander Alekhin
a16254de2b Merge pull request #12047 from alalek:issue_12045 2018-07-24 19:44:25 +00:00
Alexander Alekhin
8a2ce75d96 Merge pull request #12020 from alalek:videoio_backends_query_api 2018-07-24 19:43:49 +00:00
Vadim Pisarevsky
9c7040802c
converted split() & merge() to wide univ intrinsics (#12044) 
* fixed/updated v_load_deinterleave and v_store_interleave intrinsics; modified split() and merge() functions to use those intrinsics

* fixed a few compile errors and bug in v_load_deinterleave(ptr, v_uint32x4& a, v_uint32x4& b)

* fixed few more compile errors
 2018-07-24 17:27:56 +03:00
Maksim Shabunin
cbb1e867e5 More issues found by static analysis 2018-07-24 16:04:42 +03:00
Alexander Alekhin
8de08e0463 Merge pull request #12021 from dkurt:dnn_ie_tf_ssd 2018-07-24 13:03:41 +00:00
Alexander Alekhin
236f383969 Merge pull request #12037 from dkurt:test_openvino_models 2018-07-24 12:34:04 +00:00
Alexander Alekhin
8f80565d9c objdetect(qr): update test code 
improve error checks
 2018-07-24 13:56:55 +03:00
Alexander Alekhin
4283309daa dnn: update tests for OpenVINO models 2018-07-24 09:41:14 +03:00
Alexander Alekhin
6e767e2376 ts: add findDataDirectory() function 2018-07-24 09:40:58 +03:00
Dmitry Kurtaev
28e08ae0bd Add a sample which tests OpenVINO models 2018-07-23 19:08:51 +03:00
Maksim Shabunin
e0603bb45f Fixed several issues found by static analysis tools 2018-07-23 17:22:47 +03:00
Alexander Alekhin
7d40fcead5 Merge pull request #12031 from alalek:dnn_ocl_eliminate_getUMat_with_bad_lifetime 2018-07-23 07:52:42 +00:00
Alexander Alekhin
b117302bca Merge pull request #12016 from tyl12:fix_videoio_static_para 2018-07-21 03:50:58 +00:00
Alexander Alekhin
e1205d046a Merge pull request #12003 from mshabunin:avi-error-messages 2018-07-21 03:30:55 +00:00
Teng Yiliang
dadde75ef0 use struct member width_set/height_set to replace static width/height. 
the static variables will cause race-condition when operating in
multithread scenarios.

Signed-off-by: Teng Yiliang <ylteng@outlook.com>
Signed-off-by: Teng Yiliang <yiliang.teng@weimob.com>
 2018-07-21 07:27:17 +08:00
Alexander Alekhin
ee743afebe dnn(ocl): don't use getUMat() for long live objects 2018-07-20 17:53:55 +03:00
Alexander Alekhin
767b31cfbf Merge pull request #12029 from tomoaki0705:fixBuildVS2013BinarySuffix 2018-07-20 11:27:27 +00:00
Tomoaki Teshima
18abe54497 fix build error on Visual Studio 2013 
* replace binary literal prefix to hexadecimal literal prefix
 2018-07-20 18:09:17 +09:00
Alexander Alekhin
05f0cb16de Merge pull request #12022 from mshabunin:fix-ie-build 2018-07-19 20:50:42 +00:00
Maksim Shabunin
a4060e15a4 dnn, IE backend: updated to match new interface 2018-07-19 19:22:23 +03:00
Alexander Alekhin
7198b9e461 Merge pull request #12019 from mshabunin:static-debug-assert 2018-07-19 15:50:33 +00:00
Alexander Alekhin
ab9b6e806c Merge pull request #11781 from dkurt:dnn_uint8_inputs 2018-07-19 14:38:46 +00:00
Alexander Alekhin
270cc3bcbc videoio: add routines to query information about backends API 
into cv::videoio_registry namespace
 2018-07-19 17:27:37 +03:00
Dmitry Kurtaev
c213a3823e Run entire SSDs from TensorFlow using Intel's Inference Engine 2018-07-19 17:05:56 +03:00
Alexander Alekhin
51074b9743 Merge pull request #12007 from alalek:fix_ts_perf_test_macro 2018-07-19 12:09:48 +00:00
Dmitry Kurtaev
070393dfda uint8 inputs for deep learning networks 2018-07-19 14:37:33 +03:00
Alexander Alekhin
f4df537e27 ts: fix PERF_TEST() macro to allow test_case name reusing 
Example (reuse 'Transform' test case):
PERF_TEST(Transform, getPerspectiveTransform_1000) { ... }
PERF_TEST(Transform, getPerspectiveTransform_QR_1000) { ... }
 2018-07-19 13:20:54 +03:00
Alexander Alekhin
e526c4bfe4 core(test): remove verbose messages 2018-07-18 16:09:27 +03:00
Maksim Shabunin
fe806878be Enable debug assertions for static analysis builds 2018-07-18 15:53:16 +03:00
Maksim Shabunin
a2a9a01e05 AVI container: verbose error messages 2018-07-18 15:22:42 +03:00
Alexander Alekhin
6c4f618db5 Merge pull request #11104 from asciian:reading_from_stream 2018-07-17 16:24:06 +00:00
Alexander Alekhin
f3ee07ca11 Merge pull request #11986 from alalek:build_eliminate_gcc8_warnings 2018-07-17 15:41:36 +00:00
Alexander Alekhin
7cc84ce8ab Merge pull request #11984 from mshabunin:fix-static-1 2018-07-17 15:40:48 +00:00
Alexander Alekhin
40b8ca2eed Merge pull request #11968 from allnes:detect_qr_code 2018-07-17 15:38:46 +00:00
Alexander Alekhin
4dcef28023 Merge pull request #11964 from mshabunin:avi-container-fixes 2018-07-17 15:35:07 +00:00
Alexander Alekhin
0a41b3df45 Merge pull request #11990 from alalek:clone_nodiscard_attribute 2018-07-17 15:34:08 +00:00
Maksim Shabunin
c473718bc2 Check for empty Mat in compare, operator= and RNG::fill, fixed related tests 2018-07-17 17:50:50 +03:00
Maksim Shabunin
1da46fe6fb Fixed issues found by static analysis (mostly DBZ) 2018-07-17 16:14:54 +03:00
Alexander Alekhin
78d07e841d Merge pull request #11959 from pengli:3.4 2018-07-17 11:20:02 +00:00
Dmitry Kurtaev
f38808a39f Add Java overloads for each default argument (#11940) 
* Add Java overloads for each default argument

* Add "fisheye_" prefix for cv::fisheye:: functions and enums
 2018-07-17 13:41:46 +03:00
Alexander Alekhin
540415dc5e Merge pull request #11989 from csukuangfj:patch_2 2018-07-17 10:27:21 +00:00
Li Peng
f0cadaa6e3 enable concat layer fuse for OCL target 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-07-17 12:46:16 +08:00
Vadim Pisarevsky
f058b5fb1e
Wide univ intrinsics (#11953) 
* core:OE-27 prepare universal intrinsics to expand (#11022)

* core:OE-27 prepare universal intrinsics to expand (#11022)

* core: Add universal intrinsics for AVX2

* updated implementation of wide univ. intrinsics; converted several OpenCV HAL functions: sqrt, invsqrt, magnitude, phase, exp to the wide universal intrinsics.

* converted log to universal intrinsics; cleaned up the code a bit; added v_lut_deinterleave intrinsics.

* core: Add universal intrinsics for AVX2

* fixed multiple compile errors

* fixed many more compile errors and hopefully some test failures

* fixed some more compile errors

* temporarily disabled IPP to debug exp & log; hopefully fixed Doxygen complains

* fixed some more compile errors

* fixed v_store(short*, v_float16&) signatures

* trying to fix the test failures on Linux

* fixed some issues found by alalek

* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested

* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested
 2018-07-16 18:57:24 +03:00
Alexander Alekhin
481829a81b Merge pull request #11957 from alalek:issue_11956 2018-07-16 15:54:34 +00:00
Alexander Alekhin
c9439476da Merge pull request #11970 from dkurt:dnn_enable_tf_tests 2018-07-16 15:51:27 +00:00
Alexander Alekhin
b0ee5d9023 core: CV_NODISCARD macro with semantic of [[nodiscard]] attr 
[[nodiscard]] is defined in C++17.
There is fallback alias for modern GCC / Clang compilers.
 2018-07-16 18:03:32 +03:00
Kuang Fangjun
84f2f37680 remove a useless statement. 2018-07-16 22:44:11 +08:00
Alexander Alekhin
d5951bc033 build: eliminate GCC8 warnings 2018-07-16 17:24:12 +03:00
Alexander Alekhin
a5e8ae2183 Merge pull request #11969 from alalek:core_Matx_inv_solve_templates 2018-07-16 14:18:12 +00:00
Alexander Alekhin
d6c669f5cf Merge pull request #11963 from dkurt:dnn_cl_fix_matmul 2018-07-16 11:10:32 +00:00
Maksim Shabunin
53eb27f508 AVI container: use C++ streams for file operations, check some operations for overflow 2018-07-16 13:46:28 +03:00
Alexander Alekhin
4a3dfffd46 Merge pull request #11965 from alalek:issue_11944 2018-07-16 09:48:33 +00:00
Alexander Alekhin
50751ae6ff Merge pull request #11967 from catree:add_tutorial_ml_java_python 2018-07-16 09:24:32 +00:00
Alexander Nesterov
dee5f9a67b Update qrcode algorithm: fix seg. fault with kmeans 2018-07-14 21:51:21 +03:00
Kuang Fangjun
2b6aa50b81 avoid negative index. 2018-07-14 16:05:29 +08:00
Alexander Alekhin
3c74fde349 core: eliminate 'if' logic from Matx::inv()/solve() 
- 'if' logic is moved into templates.
- removed unnecessary cv::Mat objects creation.
- fixed inv() test (invA * A == eye)
- added more Matx tests to cover all defined template specializations
 2018-07-13 20:09:01 +03:00
Dmitry Kurtaev
6eb8faea85 Enable TensorFlow networks tests for different backends and targets 2018-07-13 19:58:56 +03:00
Alexander Alekhin
23fc96e98f Merge pull request #11955 from terfendail:matx_solve_fix2 2018-07-13 15:15:03 +00:00
Vadim Pisarevsky
abceae1ac0 Merge pull request #11921 from allnes:detect_qr_code 2018-07-13 14:26:17 +00:00
Alexander Alekhin
eed1130327 Merge pull request #11966 from alalek:core_solve_method_check 2018-07-13 14:25:42 +00:00
Dmitry Kurtaev
de6f0a537d Fix fully-connected layer in case of number of rows less than 4 2018-07-13 16:35:37 +03:00
catree
4dc7e617a4 Add overloaded cv::PCACompute() that returns also the eigenvalues. Useful for Java and Python OpenCV where PCA is not available. 2018-07-13 15:05:54 +02:00
Alexander Alekhin
0155851929 imgproc(getPerspectiveTransform): add configuration parameter 2018-07-13 15:31:33 +03:00
Alexander Alekhin
71c6cb9c22 imgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU) 2018-07-13 15:31:33 +03:00
Alexander Alekhin
2170811e48 imgproc(perf): update getPerspectiveTransform perf test 
Function is very fast, so 0.000 ms results are useless.
1000 runs requires 25ms on i7-6700K.
 2018-07-13 15:31:33 +03:00
Alexander Alekhin
5385086fef core: solve(): add check for passed 'method' values 2018-07-13 15:15:48 +03:00
Dmitry Kurtaev
dcc1beb1f8 Clip kernel for OpenCL PriorBox layer 2018-07-13 14:49:13 +03:00
Alexander Nesterov
e38ea3a888 Update detect QRCode algorithm 2018-07-12 18:18:57 -03:00
Alexander Alekhin
33b7028be2 core: use "explicit" for Matx() ctor 2018-07-12 19:50:56 +00:00
Vitaly Tuzov
850a8577b2 Fixed unreachable code warnings for Matx::solve() 2018-07-12 19:19:51 +03:00
Alexander Alekhin
9c3ec05825 Merge pull request #11941 from alalek:dnn_ocl_fix_verify_umat_mapping 2018-07-12 07:37:55 +00:00
Vitaly Tuzov
d0a3686812 Merge pull request #11904 from terfendail/matx_solve_fix 
Fixed Matx::solve function for non-square matrixes (#11904)
 2018-07-11 22:00:57 +03:00
Alexander Alekhin
2508f7f971 dnn(ocl): fix wrong usage of stalled .getMat() pointers 
Temporary object lifetime must be greater than pointer usage.
 2018-07-11 19:11:36 +03:00
Dmitry Kurtaev
8b5f061dae Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers 2018-07-11 18:58:56 +03:00
Alexander Alekhin
999aba3807 Merge pull request #11936 from berak:dnn_shufflelayer_name 2018-07-11 12:01:31 +00:00
Alexander Alekhin
82c7ab0231 Merge pull request #11927 from pengli:3.4 2018-07-11 09:33:24 +00:00
Li Peng
4c5a86828a Fix gemmlike convolution input reading 
use vload3 for half3 or float3 input vector reading,
also check read position to see if it exceed input width

Signed-off-by: Li Peng <peng.li@intel.com>
 2018-07-11 15:25:21 +08:00
berak
a7b502f04a dnn: preserve name, type strings for ShuffleLayer 2018-07-11 08:19:23 +02:00
Alexander Alekhin
e4b5e9b9c9 Merge pull request #11931 from catree:add_doc_eye_ones 2018-07-10 15:43:32 +00:00
catree
d7bd662c95 Add a note in the documentation about Mat::ones and mat::eye. With multi-channels type (e.g. CV_8UC3), only the first channel is treated. 2018-07-10 15:35:46 +02:00
Alexander Alekhin
452fa3011c dnn(test): drop CV_ENUM for DNNBackend / DNNTarget 2018-07-10 15:12:01 +03:00
Dmitry Kurtaev
d57e5406f0 Add readNet* functions which parse models from byte arrays 2018-07-10 11:12:01 +03:00
Alexander Alekhin
7fe0727930 Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward 2018-07-09 16:25:34 +00:00
Alexander Alekhin
529d38613b Merge pull request #11923 from alalek:dnn_external_protobuf 2018-07-09 16:07:42 +00:00
Alexander Alekhin
88d56dc700 Merge pull request #11922 from alalek:dnn_test_myriad_check 2018-07-09 16:07:18 +00:00
Alexander Alekhin
7ba66a1682 Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector 2018-07-09 15:37:26 +00:00
Alexander Alekhin
b6255ab9e7 dnn(ocl4dnn): fix args for 'max_pool_forward' kernel 2018-07-09 18:02:20 +03:00
Alexander Alekhin
924ff903ad Merge pull request #11903 from alalek:issue_9002 2018-07-09 14:49:37 +00:00
Alexander Alekhin
e2b5d11290 dnn: allow to use external protobuf 
"custom layers" feature will not work properly in these builds.
 2018-07-09 17:28:45 +03:00
Alexander Alekhin
e41f19d2f3 Merge pull request #11919 from dkurt:dnn_replace_convert_fp16 2018-07-09 14:07:37 +00:00
Alexander Alekhin
52b151dceb dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test 2018-07-09 16:20:46 +03:00
Dmitry Kurtaev
362d4f5395 Replace convertFp16 from dnn::Net::setInput() 2018-07-09 14:35:54 +03:00
Alexander Alekhin
a29d11240e Merge pull request #11906 from berak:fix_qrcode 2018-07-09 09:36:41 +00:00
asciian
61d8719b8d Reading net from std::ifstream 
Remove some assertions

Replace std::ifstream to std::istream

Add test for new importer

Remove constructor to load file

Rename cfgStream and darknetModelStream to ifile

Add error notification to inform pathname to user

Use FileStorage instead of std::istream

Use FileNode instead of FileStorage

Fix typo
 2018-07-09 10:02:05 +03:00
Alexander Alekhin
0fd74fa177 Merge pull request #11911 from berak:core_fix_autobuffer_opengl 2018-07-08 13:50:35 +00:00
berak
45677819e8 core: fix autobuffer usage in opengl.cpp 2018-07-08 09:51:06 +02:00
berak
e14b2ba43c objdetect: validate input in qrcode 2018-07-07 16:56:40 +02:00
Alexander Alekhin
81325a3fa0 highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable 2018-07-06 17:35:47 +03:00
Alexander Alekhin
aa0c6ddb4c highgui: fix GTK issues with external UI thread 2018-07-06 17:35:47 +03:00
Alexander Alekhin
5e6a3f1f6c Merge pull request #11901 from alalek:fix_cuda_build 2018-07-06 14:07:50 +00:00
Vadim Pisarevsky
523b6f32ba Merge pull request #11867 from dkurt:dnn_ie_layers 2018-07-06 13:13:20 +00:00
Alexander Alekhin
fc59498b2b cuda: fix build 
use cv::AutoBuffer::data() to get data pointer
 2018-07-06 15:32:36 +03:00
Alexander Alekhin
3b01777c98 Merge pull request #11895 from alalek:fix_fn_types 2018-07-06 12:01:31 +00:00
Alexander Alekhin
06fc77610b core(hal): eliminate build warnings 2018-07-06 13:00:41 +03:00
Dmitry Kurtaev
019c2f2115 Enable more deep learning tests 2018-07-05 14:23:15 +03:00
Alexander Alekhin
4bc080dc50 fix function signatures, drop invalid casts 2018-07-05 13:55:26 +03:00
Alexander Alekhin
c7fc563dc0 calib3d: chessboard detector - replace OpenCV C API 2018-07-05 13:09:10 +03:00
Alexander Alekhin
0bb2c115aa Merge pull request #11719 from alalek:update_autobuffer_api 2018-07-05 10:01:15 +00:00
Alexander Alekhin
ccd2370bb7 Merge pull request #11890 from dkurt:keras_resize_nearest 2018-07-05 09:57:24 +00:00
Alexander Alekhin
c0d0cf5e74 Merge pull request #11893 from dkurt:fix_11884 2018-07-05 09:56:50 +00:00
Alexander Alekhin
b09a4a98d4 opencv: Use cv::AutoBuffer<>::data() 2018-07-04 19:11:29 +03:00
Alexander Alekhin
135ea264ef core: align cv::AutoBuffer API with std::vector/std::array 
- added .data() methods
- added operator[] (int i)
- extend checks support to generic and debug-only cases
- deprecate existed operator* ()
 2018-07-04 19:10:38 +03:00
Dmitry Kurtaev
f25a01bb5a Disable fusion to output layers 2018-07-04 15:53:47 +03:00
Alexander Alekhin
bd8c8e720e Merge tag '3.4.2' 2018-07-04 14:08:11 +03:00
Alexander Alekhin
9e1b1e5389 OpenCV 3.4.2 2018-07-04 14:05:47 +03:00
Dmitry Kurtaev
36288eebe7 Nearest neighbor resize from Keras 2018-07-04 11:53:24 +03:00
Vadim Pisarevsky
a0baae8a55 Merge pull request #11875 from dkurt:dnn_fix_reshape 2018-07-04 08:08:04 +00:00
Alexander Alekhin
9a66331984 Merge pull request #11882 from alalek:videoio_vfw_lower_priority 2018-07-03 14:54:54 +00:00
Alexander Alekhin
f545aee66d videoio(VFW): lower priority (after DSHOW) 2018-07-03 15:54:45 +03:00
Alexander Alekhin
b3578710cf videoio(MSMF): fix 32-bit build crash 2018-07-03 15:28:55 +03:00
ilovezfs
0c4328fbf3 Python 3.7 compatability 
The result of PyUnicode_AsUTF8() is now of type const char * rather of 
char *.
 2018-07-03 00:38:59 -07:00
Dmitry Kurtaev
7ed5d85f25 Add Reshape layer tests 2018-07-03 08:26:43 +03:00
Alexander Alekhin
5557474467 imgcodecs(sunras): avoid buffer overrun 
`src_pitch` may be large than data `step`
 2018-07-02 12:56:50 +03:00
Alexander Alekhin
5a27f7c81f Merge pull request #11856 from alalek:videoio_msmf_fix_check 2018-06-30 04:52:36 +00:00
Alexander Alekhin
6ce26b72b1 Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code 2018-06-30 04:51:20 +00:00
Alexander Alekhin
2dbaba077a videoio(msmf): avoid using of C++11 code 
build fails with MSVS 2012 without additional flags
 2018-06-29 20:48:58 +00:00
Alexander Alekhin
7a2448672c videoio(MSMF): avoid OpenCV load failure on Win7 machines 
OpenCV binaries are compiled on Win10 environment
 2018-06-29 20:22:26 +00:00
Alexander Alekhin
9be3f7d41a Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2 2018-06-29 15:02:22 +00:00
Alexander Alekhin
f40231af5d Merge pull request #11851 from pengli:3.4 2018-06-29 15:01:20 +00:00
Alexander Alekhin
c3a90ccbad videoio(MSMF): remove "always true" check 2018-06-29 15:23:48 +03:00
Li Peng
145eae321e pooling ocl kernel optimization 
set global size with real output size, also optimize

max pooling index computation if necessary.

Signed-off-by: Li Peng <peng.li@intel.com>
 2018-06-29 15:22:49 +08:00
Dmitry Kurtaev
d971678add Add a planar data layout tracking for TensorFlow importer 2018-06-29 09:50:14 +03:00
Dmitry Kurtaev
346871e27f Set output layers names and types for models in DLDT's intermediate representation 2018-06-28 10:21:45 +03:00
Vadim Pisarevsky
67259d7082 Merge pull request #11768 from alalek:videoio_msmf_async_live_capture 2018-06-27 18:12:10 +00:00
Vadim Pisarevsky
75ee536d6d
Filter homography decomp: updated PR #7153 (#11846) 
* Add functionality to filter homography decompositions

* documentation + small refactor

* fix comparing int to size_t (compiler warning)

* fix whitespace issues

* clarification of function return values in documentation

* refactor of function parameters and change in loop nesting

* cleanup useless .h, fix size_t to int compare, small refactor

* fix documentation and whitespace

* change output from return value to outputarray parameter

* update function docs to reflect changes in parameters

* whitespace

* failing test

* fixed warnings related to extended initialisers and improper types

* initialize vectors from arrays

* initialize vectors from arrays part 2

* fix whitespace

* fix trailing whitespace

* Include <inttypes.h> in test_filter_homography_decomp.cpp, should fix 'uint8_t' : undeclared identifier error

* updated the test (made it shorter and providing better diagnostic) and significantly improved implementation (get rid of heavy repeated and/or unnecessary operations)

* fixed compile warning; removed trailing whitespace
 2018-06-27 16:47:35 +03:00
Nesterov Alexander
0081dc478f Init qrcode algo (#11829) 2018-06-27 16:37:10 +03:00
Vadim Pisarevsky
5dc0e51682 Merge pull request #11839 from dkurt:dnn_ie_r2 2018-06-27 09:56:02 +00:00
Vadim Pisarevsky
ba1a6ad4cc Merge pull request #11840 from dkurt:dnn_tf_nchw 2018-06-26 19:27:25 +00:00
branka-plateiq
34ad9b8a42 Pass RANSAC parameters as function input (#10569) 
* Pass RANSAC parameters as function input

* Clean up unnecessary code

* Keep the original function signature

* Clean up based on PR comments

Replace array with vector.

Correct naming convention for input variables.

Add checks on input variables.

* Use vector instead of array for dynamic size

* Revert change.

* Use dynamic array

* Fix wrong syntax in array allocation

* Undo change

* Fix variable name

* Use vector and not array

* fixed compile warning on Windows
 2018-06-26 16:40:28 +03:00
Dmitry Kurtaev
dbeb4a11be Parse strides and convolution kernel shapes considering data layout 2018-06-26 16:18:21 +03:00
Dmitry Kurtaev
b11e22c25b Update Inference Engine tests 2018-06-26 15:38:08 +03:00
Vadim Pisarevsky
53a475d63c Merge pull request #11836 from terfendail:msmf_camfallback 2018-06-26 12:17:55 +00:00
Vadim Pisarevsky
e87425f047 Merge pull request #11835 from dkurt:dnn_tf_two_inputs 2018-06-26 12:12:24 +00:00
Vitaly Tuzov
67b67003c5 Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range. 2018-06-26 14:04:02 +03:00
Dmitry Kurtaev
9510551c63 Multiple inputs for TensorFlow models 2018-06-26 14:03:59 +03:00
Vadim Pisarevsky
b80c7bca0d Merge pull request #11826 from dkurt:dnn_tf_data_layouts 2018-06-26 06:36:27 +00:00
Vadim Pisarevsky
dc27d52221
temporarily disabled OpenCL use in DNN module on Mac (#11828) 
* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail

* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)
 2018-06-26 09:35:18 +03:00
Dmitry Kurtaev
715f40a48d Use layers consumers to predict data layout 2018-06-25 18:25:40 +03:00
Li, Peng
ab8022f74e update convolution opencl kernels in dnn module (#11762) 
* optimize ocl kernel enqueue in fc layer

Signed-off-by: Li Peng <peng.li@intel.com>

* use CV_LOG_INFO in convolution auto tuning

Signed-off-by: Li Peng <peng.li@intel.com>

* update convolution IDLF kernel

extend parameter tuning range, also cleanup
ocl kernel implementation

Signed-off-by: Li Peng <peng.li@intel.com>

* update in-memory convolution cache config

fp16 and fp32 cache config are stored separately

Signed-off-by: Li Peng <peng.li@intel.com>
 2018-06-25 17:06:18 +03:00
Rostislav Vasilikhin
18bc2a1a93 Kinect2 support added to OpenNI2 backend (#11794) 
* Kinect2 support added to OpenNI2 backend

* more fixes for OpenNI2 backend

* whitespace fixed

* libfreenect2 support added

* const cast added

* mutable removed
 2018-06-25 13:19:20 +03:00
Dmitry Kurtaev
e8e9d1d021 Implement Interp layer using Resize layer 2018-06-22 19:26:47 +03:00
Alexander Alekhin
1894f1a37f Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag 2018-06-22 05:23:55 +00:00
Alexander Alekhin
50c607d206 dnn(ocl): fix external / predefined builtin configuration behavior 
OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)

Prefer external configuration over builtin.
 2018-06-21 20:59:03 +03:00
Dmitry Kurtaev
4626246087 Add ShuffleChannel layer 2018-06-21 19:10:42 +03:00
Dmitry Kurtaev
40b85c1cd9 Remove undocumented feature to retreive layers outputs by indices 2018-06-20 14:44:21 +03:00
Alexander Alekhin
eed43a231b Merge pull request #11775 from alalek:issue_11771 2018-06-17 13:25:44 +00:00
Alexander Alekhin
8622b1254e Merge pull request #11774 from adamrankin:cap_dshow_autofocus 2018-06-16 14:11:44 +00:00
Alexander Alekhin
5e2c112697 photo: remove redundant broken check 
`dest(roi_d)` operation contains similar check inside.
 2018-06-16 11:36:51 +03:00
Adam Rankin
ecf4b639e1 Adding the ability to toggle autofocus on/off for DirectShow webcams 2018-06-15 12:32:12 -04:00
Alexander Alekhin
9629af1aa9 videoio: MSMF async reader for camera stream 
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.

This mode is applied to cameras only (opened by 'index').
 2018-06-14 18:37:05 +03:00
Alexander Alekhin
30d4e0261a Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax 2018-06-14 13:18:30 +00:00
Alexander Alekhin
001f5faa0d Merge pull request #11763 from dkurt:dnn_keras_relu6_v2 2018-06-14 13:17:54 +00:00
Dmitry Kurtaev
bd87eb6e66 Import average pooling and softmax layers from Darknet 2018-06-14 15:22:08 +03:00
Alexander Alekhin
2bb5d1bca3 videoio(msmf): cleanup unused methods from ComPtr wrapper 
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
 2018-06-14 14:15:09 +03:00
Dmitry Kurtaev
693a7663e7 Import ClipByValue from Keras 2018-06-14 13:30:30 +03:00
Alexander Alekhin
8f24db048c Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition 2018-06-14 09:57:39 +00:00
Alexander Alekhin
5fd7cfbcad dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT 
to control DNN_BACKEND_DEFAULT enumeration value behavior
 2018-06-13 19:00:04 +03:00
Alexander Alekhin
1c2ee8a5f1 Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print 2018-06-13 13:31:31 +00:00
Alexander Alekhin
09c63e4f00 videoio(msmf): fix reopen condition in configureHW() 
`camid` value is always -1 after close().
 2018-06-13 16:29:45 +03:00
Alexander Alekhin
f040282bf8 Merge pull request #11739 from dkurt:more_ie_models 2018-06-13 13:26:50 +00:00
yuki takehara
4fe648b15c Merge pull request #11706 from take1014:setTo_Nan_10507 
* setTo_#10507

* setTo_Nan_10507

* setTo: update check / test for NaNs
 2018-06-12 18:05:44 +00:00
Alexander Alekhin
d69a327d6d OpenCV version++ 
OpenCV 3.4.2
 2018-06-10 10:20:38 +03:00
Alexander Alekhin
ab11b17d4b experimental version++ 2018-06-10 10:20:38 +03:00
Dmitry Kurtaev
7d727ac2fb Fuse top layers to batch normalization 2018-06-09 18:06:53 +03:00
Alexander Alekhin
0d249c7448 videoio(msmf): replace custom debug print function 2018-06-09 17:38:32 +03:00
Dmitry Kurtaev
2c291bc2fb Enable FastNeuralStyle and OpenFace networks with IE backend 2018-06-09 15:57:12 +03:00
Alexander Alekhin
34fc8e9260 Merge pull request #11714 from alalek:win32_waitKey_accuracy 2018-06-09 12:10:24 +00:00
Alexander Alekhin
929d39f69a Merge pull request #11728 from dkurt:dnn_update_tf_ssd 2018-06-08 19:04:28 +00:00
Alexander Alekhin
f72633b9f5 Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D 2018-06-08 19:01:40 +00:00
Alexander Alekhin
c05180ccce Merge pull request #11702 from terfendail:msmf_sizefix 2018-06-08 18:56:31 +00:00
Vitaly Tuzov
cb4b6bb2dc Fixed setting of frame size properties for MSMF-based VideoCapture 2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22 videoio(MSMF): refactor grabFrame() / retrieveFrame() methods 
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
 2018-06-08 17:20:47 +03:00
Dmitry Kurtaev
40765c5f8d Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine 2018-06-08 16:55:21 +03:00
gnthibault
b46fef327e Fixed Assertin error due to Size.area() overflowing 2018-06-08 11:22:36 +02:00
Alexander Alekhin
8620bd5a84 highgui(win32): improve waitKey() timeout condition 
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
 2018-06-07 19:31:08 +03:00
rockzhan
1187a7fa34 Merge pull request #11649 from rockzhan:dnn_dw_prelu 
dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu]  (#11649)

* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift

* add TEST to show the output mismatch in [DWconv+Prelu]

* fix typo

* change loading image to init cvMat directly

* build runtime model, without loading external model

* remove whitespace

* change way to create a cvmat

* add bias_term, add target output

* fix [dwconv + prelu] value mismatch when no optimizations

* fix Test error when change output channels

* add parametric test

* change num_output to group value

* change conv code and change test back
 2018-06-07 13:45:54 +00:00
David
7175f257b5 Added ResizeBilinear op for tf (#11050) 
* Added ResizeBilinear op for tf

Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).

Minor changes to tf_importer and resize layer to save some code lines

Minor changes in init.cpp

Minor changes in tf_importer.cpp

* Replaced implementation of a custom ResizeBilinear layer to all layers

* Use Mat::ptr. Replace interpolation flags
 2018-06-07 16:29:04 +03:00
Maksim Shabunin
60fa6bea70 Merge pull request #11711 from alalek:python_standalone 2018-06-07 13:27:19 +00:00
Alexander Alekhin
dd7f88bd68 python: support standalone Python bindings build 
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
 2018-06-07 15:16:39 +03:00
Vadim Pisarevsky
5e5d997dff Merge pull request #11620 from terfendail:hmmorph_fix 2018-06-07 11:19:21 +00:00
Sayed Adel
e0d28aa893 core:ppc Fix java CoreTest/testMahalanobis (#11677) 
* core:ppc Fix java CoreTest/testMahalanobis

* core:ppc Fix warning unused variable on clang
 2018-06-07 14:16:48 +03:00
Vadim Pisarevsky
828f33311f Merge pull request #11700 from dkurt:dnn_ie_try_catch 2018-06-07 11:09:00 +00:00
Dmitry Kurtaev
f3a6ae5f00 Wrap Inference Engine init to try-catch 2018-06-07 12:55:52 +03:00
Vitaly Tuzov
2e22f8e790 Fix for morphologyEx MORPH_HITMISS mode 2018-06-06 21:04:17 +03:00
Vadim Pisarevsky
7c3090ddcf Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code 2018-06-06 12:21:00 +00:00
Vadim Pisarevsky
3cbd2e2764 Merge pull request #11650 from dkurt:dnn_default_backend 2018-06-06 09:30:39 +00:00
Alexander Alekhin
afaf5f940e Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings 2018-06-05 20:07:39 +00:00
Alexander Alekhin
31a1df0fae Merge pull request #11692 from alalek:default_log_level_warnings 2018-06-05 20:07:15 +00:00
Alexander Alekhin
b0ae357cfb Merge pull request #11687 from alalek:gstreamer_write_pipeline 2018-06-05 20:06:55 +00:00
Alexander Alekhin
4091ced5ab core: set default logger level to 'warning' in Release builds 
should hide unnecessary 'info' messages
 2018-06-05 18:39:47 +03:00
Alexander Alekhin
6816495bee dnn(test): reuse test/test_common.hpp, eliminate dead code warning 2018-06-05 12:52:53 +03:00
Alexander Alekhin
277e9279cc videoio(gstreamer): support dumping of VideoWriter pipeline 2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599 videoio: fix capture modes 2018-06-04 19:48:51 +03:00
Alexander Alekhin
b2cff44084 Merge pull request #11682 from alalek:fix_pylint 2018-06-04 16:16:08 +00:00
Alexander Alekhin
2628662586 videoio(ffmpeg): cleanup, remove dead code 2018-06-04 19:07:22 +03:00
Dmitry Kurtaev
b781ac7346 Make Intel's Inference Engine backend is default if no preferable backend is specified. 2018-06-04 18:31:46 +03:00
Alexander Alekhin
15130f4f43 Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace 2018-06-04 15:27:33 +00:00
Alexander Alekhin
dcb9bc2544 python: eliminate pylint warnings 
Tested with:
- pylint 1.9.1
 2018-06-04 17:58:06 +03:00