Vadim Pisarevsky [Wed, 28 Jun 2017 08:15:22 +0000 (11:15 +0300)]
another round of dnn optimization (#9011)
* another round of dnn optimization:
* increased malloc alignment across OpenCV from 16 to 64 bytes to make it AVX2 and even AVX-512 friendly
* improved SIMD optimization of pooling layer, optimized average pooling
* cleaned up convolution layer implementation
* made activation layer "attacheable" to all other layers, including fully connected and addition layer.
* fixed bug in the fusion algorithm: "LayerData::consumers" should not be cleared, because it desctibes the topology.
* greatly optimized permutation layer, which improved SSD performance
* parallelized element-wise binary/ternary/... ops (sum, prod, max)
* also, added missing copyrights to many of the layer implementation files
* temporarily disabled (again) the check for intermediate blobs consistency; fixed warnings from various builders
Alexander Alekhin [Tue, 27 Jun 2017 14:53:25 +0000 (14:53 +0000)]
Merge pull request #8990 from mshabunin:fix-static-2
Maksim Shabunin [Tue, 27 Jun 2017 14:38:43 +0000 (14:38 +0000)]
Merge pull request #9007 from alalek:issue_9001
Maksim Shabunin [Tue, 27 Jun 2017 14:19:07 +0000 (14:19 +0000)]
Merge pull request #9006 from alalek:videoio_synchronize_ffmpeg_open
Vadim Pisarevsky [Tue, 27 Jun 2017 14:05:23 +0000 (14:05 +0000)]
Merge pull request #9004 from alalek:fix_build_flann_sdl
Alexander Alekhin [Tue, 27 Jun 2017 14:05:15 +0000 (17:05 +0300)]
dispatch: added CV_TRY_${OPT} macro, fix dnn build
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
Alexander Alekhin [Tue, 27 Jun 2017 13:32:32 +0000 (16:32 +0300)]
videoio: synchronize ffmpeg open() call
Alexander Alekhin [Tue, 27 Jun 2017 12:25:19 +0000 (15:25 +0300)]
flann: fix build with MSVC /sdl option
Alexander Alekhin [Tue, 27 Jun 2017 11:57:13 +0000 (11:57 +0000)]
Merge pull request #8963 from likan999:fix-java-camera-view
Maksim Shabunin [Mon, 26 Jun 2017 11:09:21 +0000 (14:09 +0300)]
Fixing some static analysis issues
Alexander Alekhin [Tue, 27 Jun 2017 11:10:46 +0000 (11:10 +0000)]
Merge pull request #9000 from alalek:fix_winpack_build
Alexander Alekhin [Tue, 27 Jun 2017 09:57:38 +0000 (09:57 +0000)]
Merge pull request #8997 from alalek:fix_build_warnings
Alexander Alekhin [Tue, 27 Jun 2017 09:57:20 +0000 (09:57 +0000)]
Merge pull request #8996 from alalek:fix_viz_build
Alexander Alekhin [Tue, 27 Jun 2017 06:04:50 +0000 (09:04 +0300)]
dnn: fix build
- winpack
- opencv_world
Alexander Alekhin [Tue, 27 Jun 2017 05:16:40 +0000 (08:16 +0300)]
build: eliminate warning
Alexander Alekhin [Tue, 27 Jun 2017 05:01:40 +0000 (08:01 +0300)]
build: fix viz tests
removed test_precomp.cpp
Vadim Pisarevsky [Mon, 26 Jun 2017 21:58:26 +0000 (21:58 +0000)]
Merge pull request #8988 from sovrasov:repeat_src_eq_dst_fix
Vadim Pisarevsky [Mon, 26 Jun 2017 21:57:25 +0000 (21:57 +0000)]
Merge pull request #8989 from alalek:move_dnn_module
Alexander Alekhin [Mon, 26 Jun 2017 16:27:05 +0000 (19:27 +0300)]
dnn: fix failed Torch tests
"Torch invalid argument 2: position must be smaller than LLONG_MAX"
These conditions are always true for "long position" argument.
Alexander Alekhin [Mon, 26 Jun 2017 18:47:31 +0000 (18:47 +0000)]
Merge pull request #8995 from savuor:fix/trace_ovx_build
Rostislav Vasilikhin [Mon, 26 Jun 2017 17:19:18 +0000 (20:19 +0300)]
fixed typo
Alexander Alekhin [Mon, 26 Jun 2017 15:52:09 +0000 (18:52 +0300)]
dnn: AVX2 fix invalid unaligned read
Alexander Alekhin [Mon, 26 Jun 2017 13:22:50 +0000 (16:22 +0300)]
dnn: fix build warnings
Alexander Alekhin [Mon, 26 Jun 2017 16:03:43 +0000 (16:03 +0000)]
Merge pull request #8766 from alalek:trace
Alexander Alekhin [Thu, 25 May 2017 15:59:01 +0000 (18:59 +0300)]
trace: initial support for code trace
Alexander Alekhin [Mon, 22 May 2017 07:40:58 +0000 (07:40 +0000)]
3rdparty: add ittnotify sources
https://github.com/01org/IntelSEAPI/tree/master/ittnotify
Alexander Alekhin [Fri, 26 May 2017 14:05:46 +0000 (17:05 +0300)]
viz: fix tests build
Alexander Alekhin [Mon, 26 Jun 2017 12:13:00 +0000 (15:13 +0300)]
dnn: fix dnn python test files
Alexander Alekhin [Mon, 26 Jun 2017 12:12:00 +0000 (15:12 +0300)]
dnn: remove obsolete "build opencv_contrib with dnn module" tutorial
Alexander Alekhin [Mon, 26 Jun 2017 12:01:30 +0000 (15:01 +0300)]
dnn: fix documentation links
Alexander Alekhin [Mon, 26 Jun 2017 11:36:40 +0000 (14:36 +0300)]
dnn: move samples
Alexander Alekhin [Mon, 26 Jun 2017 11:42:38 +0000 (14:42 +0300)]
dnn: remove unused README
Alexander Alekhin [Mon, 26 Jun 2017 11:21:33 +0000 (14:21 +0300)]
dnn: fix public headers guards
Vladislav Sovrasov [Mon, 26 Jun 2017 09:30:03 +0000 (12:30 +0300)]
core: forbid handling of the case when src=dst in cv::repeat
Alexander Alekhin [Mon, 26 Jun 2017 10:35:51 +0000 (13:35 +0300)]
dnn: move module from opencv_contrib
https://github.com/opencv/opencv_contrib/tree/
e6f63c7a38ca40c5dc33e38736e3027e3528d6cb/modules/dnn
Vadim Pisarevsky [Mon, 26 Jun 2017 10:27:40 +0000 (10:27 +0000)]
Merge pull request #8966 from alalek:protobuf_sources
Maksim Shabunin [Mon, 26 Jun 2017 09:26:49 +0000 (09:26 +0000)]
Merge pull request #8986 from alalek:build_disable_avx512
Maksim Shabunin [Mon, 26 Jun 2017 09:25:23 +0000 (09:25 +0000)]
Merge pull request #8981 from alalek:port_8979
Maksim Shabunin [Mon, 26 Jun 2017 09:22:44 +0000 (09:22 +0000)]
Merge pull request #8985 from alalek:update_videoio
Maksim Shabunin [Mon, 26 Jun 2017 09:18:33 +0000 (09:18 +0000)]
Merge pull request #8984 from alalek:update_videowriter_apipreference
Alexander Alekhin [Sun, 25 Jun 2017 21:31:24 +0000 (00:31 +0300)]
build: disable AVX512
Currently it is not supported.
All builds are broken with enabled AVX512 option.
Alexander Alekhin [Sun, 25 Jun 2017 20:27:33 +0000 (23:27 +0300)]
videoio: do not mix `CV_CAP` and `CAP_` APIs enum values
Alexander Alekhin [Sun, 25 Jun 2017 20:05:07 +0000 (23:05 +0300)]
videoio: drop changes from legacy C-API header
Alexander Alekhin [Sun, 25 Jun 2017 19:53:11 +0000 (22:53 +0300)]
videoio: update VideoWriter apiPreference parameter position
Alexander Alekhin [Sun, 25 Jun 2017 11:13:49 +0000 (11:13 +0000)]
Merge pull request #8982 from catree:morphologyEx_iterations_doc
catree [Sat, 24 Jun 2017 22:16:16 +0000 (00:16 +0200)]
Add a note to morphologyEx documentation to clarify the behavior when iterations > 1.
Alexander Alekhin [Sat, 24 Jun 2017 08:07:57 +0000 (11:07 +0300)]
videoio(macosx): fix array access exception in AVFoundation
Alexander Alekhin [Fri, 23 Jun 2017 15:51:48 +0000 (15:51 +0000)]
Merge pull request #8976 from jrtc27:fast-math-asm
James Clarke [Fri, 23 Jun 2017 14:28:09 +0000 (15:28 +0100)]
fast_math.hpp: Use __asm__ rather than asm; fixes including with -std=c99
Vadim Pisarevsky [Fri, 23 Jun 2017 10:58:52 +0000 (10:58 +0000)]
Merge pull request #8900 from alalek:update_android_build
Alexander Alekhin [Thu, 22 Jun 2017 16:32:12 +0000 (19:32 +0300)]
Merge pull request #8969 from alalek:fix_typo
Alexander Alekhin [Thu, 22 Jun 2017 16:21:59 +0000 (19:21 +0300)]
cmake: fix typo
Alexander Alekhin [Thu, 22 Jun 2017 13:39:48 +0000 (16:39 +0300)]
3rdparty: update CMake scripts for protobuf
Alexander Alekhin [Thu, 22 Jun 2017 13:37:49 +0000 (16:37 +0300)]
3rdparty: protobuf 3.1.0 sources
without tests, testdata, .proto files
Maksim Shabunin [Thu, 22 Jun 2017 11:45:52 +0000 (11:45 +0000)]
Merge pull request #8856 from mshabunin:media-tests-upgrade
Maksim Shabunin [Thu, 22 Jun 2017 11:40:07 +0000 (11:40 +0000)]
Merge pull request #8965 from mshabunin:fix-vs-issue-tiff
Maksim Shabunin [Thu, 22 Jun 2017 11:04:30 +0000 (14:04 +0300)]
Fix possible uninitialized memory in libtiff
Alexander Alekhin [Thu, 22 Jun 2017 09:28:16 +0000 (09:28 +0000)]
Merge pull request #8958 from alalek:update_download
likan999 [Thu, 22 Jun 2017 07:47:15 +0000 (00:47 -0700)]
More accurate condition to detect emulator
Previous commit, 6f39f9a, tries to fix the color issue for emulator. But the condition for detecting emulator is incomplete, e.g. it stops working for emulators using Google Play, whose Build.BRAND=="google". https://stackoverflow.com/a/
21505193 shows a more accurate condition for this.
Alexander Alekhin [Wed, 21 Jun 2017 19:56:40 +0000 (19:56 +0000)]
Merge pull request #8960 from dkurt:halide_support_opencl
dkurt [Wed, 21 Jun 2017 18:30:52 +0000 (21:30 +0300)]
Catch SkipTestException in performance tests
Alexander Alekhin [Wed, 21 Jun 2017 16:04:27 +0000 (19:04 +0300)]
cmake: additional messages on download errors
Alexander Alekhin [Wed, 21 Jun 2017 16:03:17 +0000 (19:03 +0300)]
.gitignore: added ".cache" directory back
It is necessary for proper work of "git clean" command
Dmitry Kurtaev [Wed, 21 Jun 2017 11:33:47 +0000 (14:33 +0300)]
cmake: add Halide support (#8794)
Jiri Horner [Wed, 21 Jun 2017 11:33:09 +0000 (13:33 +0200)]
Merge pull request #8869 from hrnr:akaze_part1
[GSOC] Speeding-up AKAZE, part #1 (#8869)
* ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS
added protective macros to always force macro expansion of arguments. This allows using CV_ENUM and CV_FLAGS with macro arguments.
* feature2d: unify perf test
use the same test for all detectors/descriptors we have.
* added AKAZE tests
* features2d: extend perf tests
* add BRISK, KAZE, MSER
* run all extract tests on AKAZE keypoints, so that the test si more comparable for the speed of extraction
* feature2d: rework opencl perf tests
use the same configuration as cpu tests
* feature2d: fix descriptors allocation for AKAZE and KAZE
fix crash when descriptors are UMat
* feature2d: name enum to fix build with older gcc
* Revert "ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS"
This reverts commit
19538cac1e45b0cec98190cf06a5ecb07d9b596e.
This wasn't a great idea after all. There is a lot of flags implemented as #define, that we don't want to expand.
* feature2d: fix expansion problems with CV_ENUM in perf
* expand arguments before passing them to CV_ENUM. This does not need modifications of CV_ENUM.
* added include guards to `perf_feature2d.hpp`
* feature2d: fix crash in AKAZE when using KAZE descriptors
* out-of-bound access in Get_MSURF_Descriptor_64
* this happened reliably when running on provided keypoints (not computed by the same instance)
* feature2d: added regression tests for AKAZE
* test with both MLDB and KAZE keypoints
* feature2d: do not compute keypoints orientation twice
* always compute keypoints orientation, when computing keypoints
* do not recompute keypoint orientation when computing descriptors
this allows to test detection and extraction separately
* features2d: fix crash in AKAZE
* out-of-bound reads near the image edge
* same as the bug in KAZE descriptors
* feature2d: refactor invariance testing
* split detectors and descriptors tests
* rewrite to google test to simplify debugging
* add tests for AKAZE and one test for ORB
* stitching: add tests with AKAZE feature finder
* added basic stitching cpu and ocl tests
* fix bug in AKAZE wrapper for stitching pipeline causing lots of
! OPENCV warning: getUMat()/getMat() call chain possible problem.
! Base object is dead, while nested/derived object is still alive or processed.
! Please check lifetime of UMat/Mat objects!
Vadim Pisarevsky [Wed, 21 Jun 2017 11:23:10 +0000 (11:23 +0000)]
Merge pull request #8949 from alalek:fix_sortIdx
Alexander Alekhin [Mon, 12 Jun 2017 16:10:13 +0000 (16:10 +0000)]
android: make optional "cpufeatures", build fixes for NDK r15
Vadim Pisarevsky [Wed, 21 Jun 2017 09:33:51 +0000 (09:33 +0000)]
Merge pull request #8947 from alalek:vs_version
Vadim Pisarevsky [Wed, 21 Jun 2017 09:32:01 +0000 (09:32 +0000)]
Merge pull request #8950 from alalek:cmake_mkl_detection
Alexander Alekhin [Wed, 21 Jun 2017 01:59:51 +0000 (01:59 +0000)]
core: fix IPP optimization for sortIdx
Alexander Alekhin [Wed, 21 Jun 2017 01:59:07 +0000 (01:59 +0000)]
core(test): added cv::sortIdx accuracy tests
Alexander Alekhin [Wed, 21 Jun 2017 02:35:06 +0000 (02:35 +0000)]
cmake: guard scanning of default MKL system-wide paths
- WITH_MKL option is enabled
- user doesn't specify MKLROOT/MKL_ROOT_DIR variables
Maksim Shabunin [Tue, 6 Jun 2017 17:22:30 +0000 (20:22 +0300)]
Rewritten some tests in videoio and imgcodecs modules
general:
- all iterative tests have been replaced with parameterized tests
- old-style try..catch tests have been modified to use EXPECT_/ASSERT_ gtest macros
- added temporary files cleanup
- modified MatComparator error message formatting
imgcodecs:
- test_grfmt.cpp split to test_jpg.cpp, test_png.cpp, test_tiff.cpp, etc.
videoio:
- added public HAVE_VIDEO_INPUT, HAVE_VIDEO_OUTPUT definitions to cvconfig.h
- built-in MotionJPEG codec could not be tested on some platforms (read_write test was disabled if ffmpeg is off, encoding/decoding was handled by ffmpeg otherwise).
- image-related tests moved to imgcodecs (Videoio_Image)
- several property get/set tests have been combined into one
- added MotionJPEG test video to opencv_extra
Maksim Shabunin [Tue, 20 Jun 2017 15:15:51 +0000 (15:15 +0000)]
Merge pull request #8825 from mshabunin:media-sdk-support
Alexander Alekhin [Tue, 20 Jun 2017 15:12:50 +0000 (15:12 +0000)]
Merge pull request #8864 from sovrasov:calib_flags_update
Alexander Alekhin [Tue, 20 Jun 2017 12:19:43 +0000 (15:19 +0300)]
build: update modules descriptions
Alexander Alekhin [Tue, 20 Jun 2017 10:55:17 +0000 (13:55 +0300)]
build: added VERSIONINFO resource
Alexander Alekhin [Tue, 20 Jun 2017 10:57:17 +0000 (10:57 +0000)]
Merge pull request #8942 from zwsu:master
Maksim Shabunin [Thu, 23 Mar 2017 08:55:43 +0000 (11:55 +0300)]
Initial version of MediaSDK integration:
- cmake dependencies search (WITH_MFX option)
- raw H264, H265, MPEG2 encoding and decoding
- tests for supported formats
Maksim Shabunin [Tue, 20 Jun 2017 09:05:53 +0000 (09:05 +0000)]
Merge pull request #8883 from abratchik:DNN.java.wrappers.fix
Zhiwei Su [Mon, 19 Jun 2017 12:30:28 +0000 (20:30 +0800)]
Fixed gray window for gpu stereo BP and CSBP
compute() for BP and CSBP output 32-bit floating-point mat, and in cv::imshow() 32-bit floating-point is recognized as [0,1] and maped to [0,255], that causes gray window for BP and CSBP.
Maksim Shabunin [Mon, 19 Jun 2017 10:52:34 +0000 (10:52 +0000)]
Merge pull request #8920 from sovrasov:video_vriter_ext
Vladislav Sovrasov [Wed, 14 Jun 2017 14:09:32 +0000 (17:09 +0300)]
video: add one more constructor for VideoWriter
abratchik [Sat, 10 Jun 2017 05:57:10 +0000 (09:57 +0400)]
Refactor OpenCV Java Wrapping
Alexander Alekhin [Thu, 15 Jun 2017 16:12:30 +0000 (16:12 +0000)]
Merge pull request #8925 from savuor:fix/softfloat_comments
Alexander Alekhin [Thu, 15 Jun 2017 16:11:18 +0000 (16:11 +0000)]
Merge pull request #8924 from tomoaki0705:fixWarningResize
Alexander Alekhin [Thu, 15 Jun 2017 16:09:35 +0000 (16:09 +0000)]
Merge pull request #8922 from tomoaki0705:fixWarningJetsonTK1
Rostislav Vasilikhin [Thu, 15 Jun 2017 12:10:41 +0000 (15:10 +0300)]
float constant replaced by int hex representations
Tomoaki Teshima [Thu, 15 Jun 2017 09:59:48 +0000 (18:59 +0900)]
suppress warning
- check if compiler is Intel compiler
- remove not referenced variables
Tomoaki Teshima [Thu, 15 Jun 2017 09:28:13 +0000 (18:28 +0900)]
suppress warning on Jetson TK1
Alexander Alekhin [Wed, 14 Jun 2017 19:17:28 +0000 (19:17 +0000)]
Merge pull request #8915 from sovrasov:deniose_add_assert
Alexander Alekhin [Wed, 14 Jun 2017 19:15:21 +0000 (19:15 +0000)]
Merge pull request #8912 from alalek:fix_cxx11_mac_flann
Alexander Alekhin [Wed, 14 Jun 2017 18:49:09 +0000 (18:49 +0000)]
Merge pull request #8832 from terfendail:perf_accumulate_fix
Rostislav Vasilikhin [Wed, 14 Jun 2017 18:20:10 +0000 (21:20 +0300)]
licence updated
Rostislav Vasilikhin [Wed, 14 Jun 2017 18:00:06 +0000 (21:00 +0300)]
removed MSVC warning suppression
Alexander Alekhin [Wed, 14 Jun 2017 12:00:58 +0000 (12:00 +0000)]
Merge pull request #8911 from alalek:fix_vsum4
Vladislav Sovrasov [Wed, 14 Jun 2017 10:57:07 +0000 (13:57 +0300)]
photo: add assertion on empty image in denoising
Alexander Alekhin [Tue, 13 Jun 2017 22:24:46 +0000 (22:24 +0000)]
build: fix v_reduce_sum4 (requires SSE3)
Vadim Pisarevsky [Wed, 14 Jun 2017 07:30:14 +0000 (07:30 +0000)]
Merge pull request #8890 from alalek:remove_3rdparty_jinja2_sources
Alexander Alekhin [Wed, 14 Jun 2017 01:07:47 +0000 (01:07 +0000)]
Merge pull request #8899 from tomoaki0705:fixSuppressWarningsUnreachable