Alexander Alekhin
cec7cc037b
Merge pull request #15819 from alalek:ts_unblock_reporting_of_disabled_tests
2019-10-31 20:39:41 +00:00
Alexander Alekhin
5c12bafe80
Merge pull request #15805 from i-murzov:3.4
2019-10-31 20:39:16 +00:00
Ciprian Alexandru Pitis
d2e02779c4
Merge pull request #15799 from Cpitis:feature/parallelization
...
Parallelize pyrDown & calcSharrDeriv
* ::pyrDown has been parallelized
* CalcSharrDeriv parallelized
* Fixed whitespace
* Set granularity based on amount of threads enabled
* Granularity changed to cv::getNumThreads, now each thread should receive 1/n sized stripes
* imgproc: move PyrDownInvoker<CastOp>::operator() implementation
* imgproc(pyramid): remove syloopboundary()
* video: SharrDerivInvoker replace 'Mat*' => 'Mat&' fields
2019-10-31 23:38:49 +03:00
CJ Smith
c2f2ea6b85
Merge pull request #15789 from CJSmith-0141:15779-scale-bug-in-stereo-match-sample
...
* Changes disparity image to float representation
Signed-off-by: Connor James Smith <cjs.connor.smith@gmail.com>
* samples: update disparity multiplier handling in stereo_match.cpp
2019-10-31 22:29:04 +03:00
Oleg Alexandrov
af433d0352
Merge pull request #15780 from oleg-alexandrov:master
...
* Doc bugfix
The documentation page StereoBinaryBM and StereoBinarySGBM says that it returns a disparity that is scaled multiplied by 16. This scaling must be undone before calling reprojectImageTo3D, otherwise the results are wrong. The function reprojectImageTo3D() could do this scaling internally, maybe, but at least the documentation must explain that this has to be done.
* calib3d: update reprojectImageTo3D documentation
* calib3d: add StereoBM/StereoSGBM into notes list
2019-10-31 22:28:01 +03:00
Alexander Alekhin
ee044771a7
Merge pull request #15478 from terfendail:wintr_stereosgbm
2019-10-31 19:24:06 +00:00
Dizhenin Vlad
edc5518f68
Merge pull request #15608 from SimpleVlad:3.4
...
* Add flags for build js
* Add poi.json
* Rebase whitelist into JSON file
* Rework generator of white_list
* Fix small typos
* Transfer opencv_js.josn in opencv_js.config.py
* Edit OPENCV_JS_WHITELIST
* Write comment
* Add description
* Fix typos in desc
* flag's append deleeted
* Fix whitespace
* variable deleted
* fix comment on lines 229 and 235
2019-10-31 22:09:33 +03:00
Alexander Alekhin
79f792ad05
ts: do not block reporting of launched "DISABLED_" tests
...
If tests are run through GTest option `--gtest_also_run_disabled_tests`
2019-10-31 15:13:50 +03:00
Alexander Alekhin
469addeca3
Merge pull request #15763 from akhakim:dynamic_set_kernel_window_size
2019-10-31 11:10:45 +00:00
Anna Khakimova
c394847c35
GAPI Fluid: Dynamic window size
2019-10-30 17:09:54 +03:00
atalaman
ea64bb58a5
Merge pull request #15751 from TolyaTalamanov:at/refactor-render-tests
...
* Refactor render tests
* Fix comment to review
* Move ocv render tests stuff to specific file
* Add OCV prefix for render tests
* Fix comments to review
2019-10-30 13:33:39 +03:00
Igor Murzov
a9d23a6479
Fix wording in some tutorials
2019-10-30 13:27:17 +03:00
Alexander Alekhin
ea5499fa51
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-29 20:46:51 +00:00
Alexander Alekhin
bad4e5c3eb
Merge pull request #15692 from alalek:core_tls_handle_thread_termination
2019-10-29 20:40:35 +00:00
Alexander Alekhin
e86c888a92
Merge pull request #15791 from alalek:android_camera2_issue_14915
2019-10-29 19:10:00 +00:00
Chip Kerchner
a71ff50130
Merge pull request #15623 from ChipKerchner:optimizeHOGpipeline
...
* Use circular lut hustory buffer in computeGradient of HOG
* Initialize prefetch data outside main loop. Avoid code duplication.
2019-10-29 13:42:20 +03:00
Alexander Alekhin
278b4ca40c
Merge pull request #15800 from alalek:issue_15796
2019-10-28 20:11:36 +00:00
Alexander Alekhin
cd6d79d106
gapi: fix opencv_world build
2019-10-28 18:53:14 +00:00
Alexander Alekhin
80c4cedd25
android: use .getRowStride() in JavaCamera2View
2019-10-28 18:45:56 +00:00
Alexander Alekhin
02f4d6ca53
Merge pull request #15777 from dbudniko:dbudniko/add_own_empty
2019-10-28 13:31:16 +00:00
Alexander Alekhin
732657cc46
Merge pull request #15793 from Cherubin7th:3.4
2019-10-27 22:45:19 +00:00
André Lippok
86a8ff6129
Fixed typo in assertion
2019-10-27 17:43:31 +01:00
Alexander Alekhin
d8ab83600b
Merge pull request #15761 from alalek:core_trace_itt_parameter
2019-10-26 21:39:08 +00:00
Alexander Alekhin
6ec5ae0215
core(trace): add ITT control parameter
...
- OPENCV_TRACE_ITT_ENABLE
2019-10-26 15:03:51 +00:00
Dmitry Budnikov
8dfba51884
add empty implementation
2019-10-25 17:50:09 +03:00
Alexander Alekhin
7cf1054d36
Merge pull request #15764 from ChipKerchner:demosaicingToHal
2019-10-25 13:49:46 +00:00
Vitaly Tuzov
42b1d04999
StereoSGBM algorithm updated to use wide universal intrinsics
2019-10-25 16:34:16 +03:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Alexander Alekhin
eabe679f78
Merge pull request #15770 from terfendail:stereobm_fix
2019-10-24 17:58:22 +00:00
Vitaly Tuzov
1ce5a724c7
Fixed StereoBM uniqueness check
2019-10-24 17:54:49 +03:00
Alexander Alekhin
d65fead337
Merge pull request #15752 from dkurt:fix_15750
2019-10-24 07:06:32 +00:00
Alexander Alekhin
17e2bf5717
core(tls): implement releasing of TLS on thread termination
...
- move TLS & instrumentation code out of core/utility.hpp
- (*) TLSData lost .gather() method (to dispose thread data on thread termination)
- use TLSDataAccumulator for reliable collecting of thread data
- prefer using of .detachData() + .cleanupDetachedData() instead of .gather() method
(*) API is broken: replace TLSData => TLSDataAccumulator if gather required
(objects disposal on threads termination is not available in accumulator mode)
2019-10-24 06:36:18 +00:00
Alexander Alekhin
87a692b89e
Merge pull request #15736 from akhakim:fix_for_ADE-859_using_namespace_cv_G_TYPED_KERNEL_fail_c++
2019-10-23 17:07:32 +00:00
Alexander Alekhin
5e8d8df847
Merge pull request #15754 from float13:patch-1
2019-10-23 17:02:22 +00:00
ChipKerchner
c46f119e0e
Convert demosaic functions to HAL
2019-10-23 10:47:07 -05:00
Alexander Alekhin
09619c1c45
Merge pull request #15762 from rgarnov:return_exported_mkdatanode
2019-10-23 12:05:28 +00:00
float13
1accf3b3f4
Tutorial - Make required input args positional.
...
I think it would help to change all 3 of the the input file arguments to be "positional" for consistency with the other tutorials. This also simplifies the command line input to run this tutorial by reducing typing, and helpfully prints the "usage" info if any of the 3 required inputs are missing.
I'm new to OpenCV and working through the tutorials. I kept getting runtime errors with this one until I realized that the arguments weren't positional, and I was missing the "--input1", "--input2, "--input3" flags preceding the filenames. All of the previous tutorials had required filenames as positional arguments and didn't require this.
The original code would require each input to be specified like this:
./compareHist_Demo --input1 filename1 --input2 filename2 --input3 filename3
But with this change, the above command is simplified to:
./compareHist_Demo filename1 filename2 filename3
This avoids a confusing runtime error to make things simpler for newcomers like me :)
2019-10-23 13:07:52 +03:00
Anna Khakimova
8bf5bed0a9
GAPI:Fix for using cv makes G_TYPED_KERNEL fail
2019-10-23 12:17:49 +03:00
Alexander Alekhin
5ffeebabad
Merge pull request #15759 from alalek:issue_15758
2019-10-22 21:40:10 +00:00
Ruslan Garnov
e89c1103ff
Returned GModel::mkDataNode() overload for external backends
2019-10-22 18:57:31 +03:00
Chip Kerchner
5a6a49405d
Merge pull request #15738 from ChipKerchner:bugInt64x2Comparison
...
Fixing bug with comparison of v_int64x2 or v_uint64x2
* Casting v_uint64x2 to v_float64x2 and comparing does NOT work in all cases. Rewrite using epi64 instructions - faster too.
* Fix bad merge.
* Fix equal comparsion for non-SSE4.1. Add test cases for v_int64x2 comparisons.
* Try to fix merge conflict.
* Only test v_int64x2 comparisons if CV_SIMD_64F
* Fix compiler warning.
2019-10-22 16:37:20 +03:00
Alexander Alekhin
fe4f27b99b
gapi: fix build
...
- gcc 4.8.4 (ARMv7)
2019-10-22 16:31:40 +03:00
Alexander Alekhin
1864b64f64
Merge pull request #15739 from dkurt:darknet_shortcut_asymm
2019-10-22 12:52:13 +00:00
Alexander Alekhin
4bd2ad30c4
Merge pull request #15756 from dankamongmen:dankamongmen/stitching_surf_default
2019-10-22 12:51:30 +00:00
nick black
6e9eca29e2
stitching_detailed: use correct match_conf default
...
The usage function states that the default for match_conf is
0.65 if the default SURF feature finder is used, and 0.3 for
orbs. Indeed, if --feature orbs is used, match_conf is set
to 0.3f. This is a NOP, because the real default is also set
to 0.3f. Change it to 0.65f when SURF is in play.
2019-10-22 08:03:46 -04:00
anton-potapov
471b40040a
Merge pull request #15735 from anton-potapov:gapi_async_documentaion
...
* G-API: Doxygen documentatation for Async API
* G-API: Doxygen documentatation for Async API
- renamed local variable (reading parameter async) async ->
asyncNumReq in object_detection DNN sample
to avoid Doxygen erroneous linking the sample to cv::gapi::wip::async
documentation
2019-10-21 22:33:18 +03:00
Dmitry Kurtaev
dfe0368835
Fix custom IE layers in case of no MKLDNN plugin
2019-10-21 19:09:44 +03:00
Yashas Samaga B L
613c12e590
Merge pull request #14827 from YashasSamaga:cuda4dnn-csl-low
...
CUDA backend for the DNN module
* stub cuda4dnn design
* minor fixes for tests and doxygen
* add csl public api directory to module headers
* add low-level CSL components
* add high-level CSL components
* integrate csl::Tensor into backbone code
* switch to CPU iff unsupported; otherwise, fail on error
* add fully connected layer
* add softmax layer
* add activation layers
* support arbitary rank TensorDescriptor
* pass input wrappers to `initCUDA()`
* add 1d/2d/3d-convolution
* add pooling layer
* reorganize and refactor code
* fixes for gcc, clang and doxygen; remove cxx14/17 code
* add blank_layer
* add LRN layer
* add rounding modes for pooling layer
* split tensor.hpp into tensor.hpp and tensor_ops.hpp
* add concat layer
* add scale layer
* add batch normalization layer
* split math.cu into activations.cu and math.hpp
* add eltwise layer
* add flatten layer
* add tensor transform api
* add asymmetric padding support for convolution layer
* add reshape layer
* fix rebase issues
* add permute layer
* add padding support for concat layer
* refactor and reorganize code
* add normalize layer
* optimize bias addition in scale layer
* add prior box layer
* fix and optimize normalize layer
* add asymmetric padding support for pooling layer
* add event API
* improve pooling performance for some padding scenarios
* avoid over-allocation of compute resources to kernels
* improve prior box performance
* enable layer fusion
* add const layer
* add resize layer
* add slice layer
* add padding layer
* add deconvolution layer
* fix channelwise ReLU initialization
* add vector traits
* add vectorized versions of relu, clipped_relu, power
* add vectorized concat kernels
* improve concat_with_offsets performance
* vectorize scale and bias kernels
* add support for multi-billion element tensors
* vectorize prior box kernels
* fix address alignment check
* improve bias addition performance of conv/deconv/fc layers
* restructure code for supporting multiple targets
* add DNN_TARGET_CUDA_FP64
* add DNN_TARGET_FP16
* improve vectorization
* add region layer
* improve tensor API, add dynamic ranks
1. use ManagedPtr instead of a Tensor in backend wrapper
2. add new methods to tensor classes
- size_range: computes the combined size of for a given axis range
- tensor span/view can be constructed from a raw pointer and shape
3. the tensor classes can change their rank at runtime (previously rank was fixed at compile-time)
4. remove device code from tensor classes (as they are unused)
5. enforce strict conditions on tensor class APIs to improve debugging ability
* fix parametric relu activation
* add squeeze/unsqueeze tensor API
* add reorg layer
* optimize permute and enable 2d permute
* enable 1d and 2d slice
* add split layer
* add shuffle channel layer
* allow tensors of different ranks in reshape primitive
* patch SliceOp to allow Crop Layer
* allow extra shape inputs in reshape layer
* use `std::move_backward` instead of `std::move` for insert in resizable_static_array
* improve workspace management
* add spatial LRN
* add nms (cpu) to region layer
* add max pooling with argmax ( and a fix to limits.hpp)
* add max unpooling layer
* rename DNN_TARGET_CUDA_FP32 to DNN_TARGET_CUDA
* update supportBackend to be more rigorous
* remove stray include from preventing non-cuda build
* include op_cuda.hpp outside condition #if
* refactoring, fixes and many optimizations
* drop DNN_TARGET_CUDA_FP64
* fix gcc errors
* increase max. tensor rank limit to six
* add Interp layer
* drop custom layers; use BackendNode
* vectorize activation kernels
* fixes for gcc
* remove wrong assertion
* fix broken assertion in unpooling primitive
* fix build errors in non-CUDA build
* completely remove workspace from public API
* fix permute layer
* enable accuracy and perf. tests for DNN_TARGET_CUDA
* add asynchronous forward
* vectorize eltwise ops
* vectorize fill kernel
* fixes for gcc
* remove CSL headers from public API
* remove csl header source group from cmake
* update min. cudnn version in cmake
* add numerically stable FP32 log1pexp
* refactor code
* add FP16 specialization to cudnn based tensor addition
* vectorize scale1 and bias1 + minor refactoring
* fix doxygen build
* fix invalid alignment assertion
* clear backend wrappers before allocateLayers
* ignore memory lock failures
* do not allocate internal blobs
* integrate NVTX
* add numerically stable half precision log1pexp
* fix indentation, following coding style, improve docs
* remove accidental modification of IE code
* Revert "add asynchronous forward"
This reverts commit 1154b9da9da07e9b52f8a81bdcea48cf31c56f70.
* [cmake] throw error for unsupported CC versions
* fix rebase issues
* add more docs, refactor code, fix bugs
* minor refactoring and fixes
* resolve warnings/errors from clang
* remove haveCUDA() checks from supportBackend()
* remove NVTX integration
* changes based on review comments
* avoid exception when no CUDA device is present
* add color code for CUDA in Net::dump
2019-10-21 14:28:00 +03:00
Alexander Alekhin
8ec6544624
Merge pull request #15747 from TH3CHARLie:imshow-fix
2019-10-20 13:08:40 +00:00
Alexander Alekhin
a8d14e88fe
Merge pull request #15743 from collinbrake:feature_grammar_fixes_2
2019-10-20 13:08:28 +00:00
