platform/upstream/opencv.git
2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 11 Dec 2021 15:18:57 +0000 (15:18 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21235 from jonay2000:fix-docs
Alexander Alekhin [Sat, 11 Dec 2021 15:14:43 +0000 (15:14 +0000)]
Merge pull request #21235 from jonay2000:fix-docs

2 years agoUpdate name from Gunner to Gunnar as that's the name he published his
Jonathan Dönszelmann [Sat, 11 Dec 2021 07:03:10 +0000 (08:03 +0100)]
Update name from Gunner to Gunnar as that's the name he published his
paper under.

2 years agoMerge pull request #21193 from alalek:imgproc_test_bitexact_cvtcolor_yuv
Alexander Alekhin [Fri, 10 Dec 2021 16:11:06 +0000 (16:11 +0000)]
Merge pull request #21193 from alalek:imgproc_test_bitexact_cvtcolor_yuv

2 years agoMerge pull request #21228 from alalek:issue_21198
Alexander Alekhin [Fri, 10 Dec 2021 16:07:57 +0000 (16:07 +0000)]
Merge pull request #21228 from alalek:issue_21198

2 years agoMerge pull request #21161 from rogday:elu_alpha_4x
Alexander Alekhin [Fri, 10 Dec 2021 16:04:01 +0000 (16:04 +0000)]
Merge pull request #21161 from rogday:elu_alpha_4x

2 years agoMerge pull request #21086 from hanliutong:rvv-dnn
HAN Liutong [Fri, 10 Dec 2021 16:03:22 +0000 (00:03 +0800)]
Merge pull request #21086 from hanliutong:rvv-dnn

Further optimize DNN for RISC-V Vector.

* Optimize DNN on RVV by using vsetvl.

* Rename vl.

* Update fastConv by using setvl instead of mask.

* Fix fastDepthwiseConv

2 years agoMerge pull request #21222 from asenyaev:asen/replace_distutils_copy_tree
Alexander Alekhin [Fri, 10 Dec 2021 14:12:01 +0000 (14:12 +0000)]
Merge pull request #21222 from asenyaev:asen/replace_distutils_copy_tree

2 years agoMerge pull request #21154 from pccvlab:MatMul_with_two_inputs
Gruhuang [Fri, 10 Dec 2021 11:44:27 +0000 (19:44 +0800)]
Merge pull request #21154 from pccvlab:MatMul_with_two_inputs

Add BatchMatMul layer support for tf_importer

* two inputs

* support batch_matmul

* refactor: remove useless code

* refactor: decrease nesting

2 years agoMerge pull request #21227 from sbwilson:fix_framework_unicode_headers
Simon Wilson [Fri, 10 Dec 2021 11:36:14 +0000 (22:36 +1100)]
Merge pull request #21227 from sbwilson:fix_framework_unicode_headers

* fix unicode errors for framework headers

This would crash if the header file included non-ASCII characters. This change ensures that headers are read and written as UTF-8 encoded files instead of ascii.

* Adds spaces after commas

2 years agoMerge pull request #21194 from whalenpt:qt_opengl_build_fix
Alexander Alekhin [Fri, 10 Dec 2021 11:33:17 +0000 (11:33 +0000)]
Merge pull request #21194 from whalenpt:qt_opengl_build_fix

2 years agoMerge pull request #21074 from vrabaud:3.4_rect
Alexander Alekhin [Fri, 10 Dec 2021 11:32:03 +0000 (11:32 +0000)]
Merge pull request #21074 from vrabaud:3.4_rect

2 years agoMerge pull request #21230 from sivanov-work:gapi_win32_vpl_fix
Sergey Ivanov [Fri, 10 Dec 2021 08:58:59 +0000 (11:58 +0300)]
Merge pull request #21230 from sivanov-work:gapi_win32_vpl_fix

G-API: Fix Win32 build: uint64_t ->size_t

* Fix Win32 build: uint64_t ->size_t

* Fix for MAC

2 years agoReplaced distutils to shutil when copying files in a tree
Andrey Senyaev [Fri, 10 Dec 2021 08:46:27 +0000 (11:46 +0300)]
Replaced distutils to shutil when copying files in a tree

2 years agoFix broken build for Qt6 with options: WITH_QT=ON and WITH_OPENGL=ON
Patrick Whalen [Thu, 2 Dec 2021 19:10:30 +0000 (11:10 -0800)]
Fix broken build for Qt6 with options: WITH_QT=ON and WITH_OPENGL=ON

- QGLWidget changed to QOpenGLWidget in window_QT.h for Qt6 using
  typedef OpenCVQtWidgetBase for handling Qt version

- Implement Qt6/OpenGL functionality in window_QT.cpp

- Swap QGLWidget:: function calls for OpenCVQtWidgetBase:: function calls

- QGLWidget::updateGL deprecated, swap to QOpenGLWidget::update for Qt6

- Add preprocessor definition to detect Qt6 -- HAVE_QT6

- Add OpenGLWidgets to qdeps list in highgui CMakeLists.txt

- find_package CMake command added for locating Qt module OpenGLWidgets

- Added check that Qt6::OpenGLWidgets component is found. Shut off Qt-openGL functionality if not found.

2 years agoimgproc(ocl): fix resizeLN, avoid integer overflow
Alexander Alekhin [Thu, 9 Dec 2021 20:23:35 +0000 (20:23 +0000)]
imgproc(ocl): fix resizeLN, avoid integer overflow

2 years agoMerge pull request #21224 from UncleLLD:fix-cvtColor-error
UncleLLD [Thu, 9 Dec 2021 19:11:05 +0000 (03:11 +0800)]
Merge pull request #21224 from UncleLLD:fix-cvtColor-error

fix cvtColor-error

* fix gray image channel error

* fix gray image channel error

* fix cvtColor error after the video end

* fix cvtColor error after the video end and change next variable

* fix cvtColor error after the video end

* reset next variable

* fix cvtColor error after the video end

* fix cvtColor error after the video end

2 years agoSolve Rect overflow issues.
Vincent Rabaud [Wed, 17 Nov 2021 16:38:21 +0000 (17:38 +0100)]
Solve Rect overflow issues.

Fow now, it is possible to define valid rectangle for which some
functions overflow (e.g. br(), ares() ...).
This patch fixes the intersection operator so that it works with
any rectangle.

2 years agoMerge pull request #21219 from asenyaev:asen/remove_distutils
Andrey Senyaev [Wed, 8 Dec 2021 18:51:34 +0000 (21:51 +0300)]
Merge pull request #21219 from asenyaev:asen/remove_distutils

* Replaced distutils module to sysconfig

* Fixed getting a path to python lib

2 years agoMerge pull request #21218 from alalek:cmake_gapi_gstreamer_option
Alexander Alekhin [Wed, 8 Dec 2021 12:36:10 +0000 (12:36 +0000)]
Merge pull request #21218 from alalek:cmake_gapi_gstreamer_option

2 years agocmake: option to disable GStreamer in G-API
Alexander Alekhin [Wed, 8 Dec 2021 10:45:02 +0000 (10:45 +0000)]
cmake: option to disable GStreamer in G-API

- OPENCV_GAPI_GSTREAMER

2 years agoMerge pull request #21049 from sivanov-work:vpl_dx11_merge
Sergey Ivanov [Wed, 8 Dec 2021 07:09:33 +0000 (10:09 +0300)]
Merge pull request #21049 from sivanov-work:vpl_dx11_merge

G-API: oneVPL merge DX11 acceleration

* Merge DX11 initial

* Fold conditions row in MACRO in utils

* Inject DeviceSelector

* Turn on DeviceSelector in DX11

* Change sharedLock logic & Move FMT checking in FrameAdapter c-tor

* Move out NumSuggestFrame to configure params

* Drain file source fix

* Fix compilation

* Force zero initializetion of SharedLock

* Fix some compiler warnings

* Fix integer comparison warnings

* Fix integers in sample

* Integrate Demux

* Fix compilation

* Add predefined names for some CfgParam

* Trigger CI

* Fix MultithreadCtx bug, Add Dx11 GetBlobParam(), Get rif of ATL CComPtr

* Fix UT: remove unit test with deprecated video from opencv_extra

* Add creators for most usable CfgParam

* Eliminate some warnings

* Fix warning in GAPI_Assert

* Apply comments

* Add VPL wrapped header with MSVC pragma to get rid of global warning masking

2 years agoMerge pull request #21213 from alalek:issue_20850_case1
Alexander Alekhin [Tue, 7 Dec 2021 16:34:54 +0000 (16:34 +0000)]
Merge pull request #21213 from alalek:issue_20850_case1

2 years agocmake: fix OPENGL_LIBRARIES handling
Alexander Alekhin [Tue, 7 Dec 2021 05:47:54 +0000 (05:47 +0000)]
cmake: fix OPENGL_LIBRARIES handling

2 years agoMerge pull request #21208 from rogday:argminmax_dnn
Alexander Alekhin [Tue, 7 Dec 2021 12:11:39 +0000 (12:11 +0000)]
Merge pull request #21208 from rogday:argminmax_dnn

2 years agoMerge pull request #21212 from OrestChura:oc/fix_openvino_standalone_build
Alexander Alekhin [Tue, 7 Dec 2021 11:32:28 +0000 (11:32 +0000)]
Merge pull request #21212 from OrestChura:oc/fix_openvino_standalone_build

2 years agoMerge pull request #21205 from anna-khakimova:ak/fix_for_muldouble_gpu
Alexander Alekhin [Tue, 7 Dec 2021 10:24:49 +0000 (10:24 +0000)]
Merge pull request #21205 from anna-khakimova:ak/fix_for_muldouble_gpu

2 years agoGAPI GPU: fix for tests failure.
Anna Khakimova [Mon, 6 Dec 2021 11:56:20 +0000 (14:56 +0300)]
GAPI GPU: fix for tests failure.

2 years agoBring updates from openvino version of standalone files
OrestChura [Tue, 7 Dec 2021 01:18:36 +0000 (04:18 +0300)]
Bring updates from openvino version of standalone files

2 years agoadd ArgMax and ArgMin layers
Smirnov Egor [Mon, 6 Dec 2021 16:33:59 +0000 (19:33 +0300)]
add ArgMax and ArgMin layers

2 years agoMerge pull request #20709 from AsyaPronina:asyadev/integrate_gstreamer_source
Anastasiya(Asya) Pronina [Mon, 6 Dec 2021 16:54:21 +0000 (19:54 +0300)]
Merge pull request #20709 from AsyaPronina:asyadev/integrate_gstreamer_source

Ported GStreamerSource to OpenCV

* Ported GStreamerSource to OpenCV

* Fixed CI failures

* Whitespaces

* Whitespaces + removed exception from destructors C4722

* Removed assert for Priv's getSS and descr_of

* Removed assert for pull

* Fixed last review comment

Co-authored-by: Pashchenkov Maxim <maxim.pashchenkov@intel.com>
2 years agoMerge pull request #21188 from UncleLLD:fix-markdown-error
UncleLLD [Mon, 6 Dec 2021 16:14:17 +0000 (00:14 +0800)]
Merge pull request #21188 from UncleLLD:fix-markdown-error

fix issue 21187: markdown file: gray image does not have three dimensions

2 years agoMerge pull request #21182 from mshabunin:split-cv2cpp
Maksim Shabunin [Sun, 5 Dec 2021 12:49:36 +0000 (15:49 +0300)]
Merge pull request #21182 from mshabunin:split-cv2cpp

Split cv2.cpp

* split cv2.cpp: util, numpy

* split cv2.cpp: convert

* split cv2.cpp: highgui, more utils

* split cv2.cpp: fix numpy import

2 years agoMerge pull request #21180 from tezz-io:4.x
Tejas M R [Sun, 5 Dec 2021 12:47:44 +0000 (18:17 +0530)]
Merge pull request #21180 from tezz-io:4.x

Added CV_PROP_RW macro to keypoints

* Added CV_PROP_RW macro to keypoints

As outlined in the feature request in the issue https://github.com/opencv/opencv/issues/21171 : the keypoints field has been made parsable by the bindings.

* Added test for keypoints

Added test to check if the CV_PROP_RW macro added in the previous commit makes keypoints public and accessible through the python API.

2 years agoMerge pull request #21167 from alalek:dnn_test_reenable_ov_2021_4
Alexander Alekhin [Sat, 4 Dec 2021 22:12:18 +0000 (22:12 +0000)]
Merge pull request #21167 from alalek:dnn_test_reenable_ov_2021_4

2 years agoMerge pull request #21145 from MaximMilashchenko:AudioUpdate
MaximMilashchenko [Sat, 4 Dec 2021 10:37:10 +0000 (13:37 +0300)]
Merge pull request #21145 from MaximMilashchenko:AudioUpdate

Audio MSMF: added the ability to set sample per second

* Audio MSMF: added the ability to set sample per second

* changed the valid sampling rate check

* fixed docs

* add test

* fixed warning

* fixed error

* fixed error

2 years agocarotene: disable YUV color conversions (bit-exact issue)
Alexander Alekhin [Sat, 4 Dec 2021 07:32:57 +0000 (07:32 +0000)]
carotene: disable YUV color conversions (bit-exact issue)

2 years agoimgproc(test): add bit-exact tests for YUV cvtColor conversions
Alexander Alekhin [Sat, 4 Dec 2021 04:36:01 +0000 (04:36 +0000)]
imgproc(test): add bit-exact tests for YUV cvtColor conversions

2 years agoMerge pull request #21147 from mjmdavis:4.x
Michael Davis [Fri, 3 Dec 2021 16:40:49 +0000 (08:40 -0800)]
Merge pull request #21147 from mjmdavis:4.x

* remove tickmarks on NSSlider

2 years agoMerge pull request #21012 from hanliutong:rvv_clang
HAN Liutong [Fri, 3 Dec 2021 15:13:24 +0000 (23:13 +0800)]
Merge pull request #21012 from hanliutong:rvv_clang

Update RVV backend for using Clang.

* Update cmake file of clang.

* Modify the RVV optimization on DNN to adapt to clang.

* Modify intrin_rvv: Disable some existing types.

* Modify intrin_rvv: Reinterpret instead of load&cast.

* Modify intrin_rvv: Update load&store without cast.

* Modify intrin_rvv: Rename vfredsum to fredosum.

* Modify intrin_rvv: Rewrite Check all/any by using vpopc.

* Modify intrin_rvv: Use reinterpret instead of c-style casting.

* Remove all macros which is not used in v_reinterpret

* Rename vpopc to vcpop according to spec.

2 years agodnn(test): re-enable tests which works with OpenVINO 2021.4.x
Alexander Alekhin [Tue, 30 Nov 2021 12:08:35 +0000 (12:08 +0000)]
dnn(test): re-enable tests which works with OpenVINO 2021.4.x

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 3 Dec 2021 12:32:49 +0000 (12:32 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21177 from anna-khakimova:ak/simd_mulc
Anna Khakimova [Fri, 3 Dec 2021 12:30:39 +0000 (15:30 +0300)]
Merge pull request #21177 from anna-khakimova:ak/simd_mulc

* GAPI Fluid: SIMD for MulC kernel.

* Changes for MulDouble kernel.

2 years agoMerge pull request #21041 from sivanov-work:gin_gout_concept
Sergey Ivanov [Fri, 3 Dec 2021 12:30:05 +0000 (15:30 +0300)]
Merge pull request #21041 from sivanov-work:gin_gout_concept

G-API: GAPI introduce compile guard for some types for gin/gout params passing

* Initial for taged solution

* Move out tags to gtags.hpp & add protection for own::Mat

* Add compile guard to proper place

* Fix MACRO concat

* Add unit tests

* Remove class MACRO injection due to Python3

* Revert back unproper changes

* Apply comments: reuse shape from traits

* Throw away unused gtags

* Apply comments

* Handle own::*

* Fix test

* Fix test(1)

* Fix unix build

* Try on type list

* Apply comments

* Apply comments

* Fix warning

2 years agoMerge pull request #21165 from utibenkei:fix_android_ndk_camera_order_of_u_and_v
Alexander Alekhin [Thu, 2 Dec 2021 17:16:35 +0000 (17:16 +0000)]
Merge pull request #21165 from utibenkei:fix_android_ndk_camera_order_of_u_and_v

2 years agoMerge pull request #21162 from rogday:softmax_simplification
Alexander Alekhin [Thu, 2 Dec 2021 17:14:48 +0000 (17:14 +0000)]
Merge pull request #21162 from rogday:softmax_simplification

2 years agoMerge pull request #21160 from rogday:elu_alpha
Alexander Alekhin [Thu, 2 Dec 2021 17:13:56 +0000 (17:13 +0000)]
Merge pull request #21160 from rogday:elu_alpha

2 years agoMerge pull request #21159 from rogday:ceil_mode
rogday [Thu, 2 Dec 2021 17:11:11 +0000 (20:11 +0300)]
Merge pull request #21159 from rogday:ceil_mode

fix ceil_mode for Average/MaxPooling

* fix ceil_mode

* add a comment

2 years agoMerge pull request #21174 from APrigarina:fix_qr_encoder
Alexander Alekhin [Thu, 2 Dec 2021 16:41:02 +0000 (16:41 +0000)]
Merge pull request #21174 from APrigarina:fix_qr_encoder

2 years agoMerge pull request #21173 from alalek:3.4_dnn_test_reenable_ov_2021_4
Alexander Alekhin [Thu, 2 Dec 2021 16:33:15 +0000 (16:33 +0000)]
Merge pull request #21173 from alalek:3.4_dnn_test_reenable_ov_2021_4

2 years agoqr encoder: fix memory and unused variables issues
APrigarina [Thu, 2 Dec 2021 12:04:04 +0000 (15:04 +0300)]
qr encoder: fix memory and unused variables issues

2 years agoMerge pull request #21172 from alalek:dnn_test_drop_non_cpu_int8
Alexander Alekhin [Thu, 2 Dec 2021 13:50:04 +0000 (13:50 +0000)]
Merge pull request #21172 from alalek:dnn_test_drop_non_cpu_int8

2 years agoMerge pull request #21170 from JJJoonngg:4.x
Jong Sin Kim [Thu, 2 Dec 2021 13:48:11 +0000 (22:48 +0900)]
Merge pull request #21170 from JJJoonngg:4.x

Check buffer size when frameWidth * frameHeight bigger than allocated buffer size

2 years agodnn(test): re-enable tests which works with OpenVINO 2021.4.x (3.4)
Alexander Alekhin [Tue, 30 Nov 2021 12:08:35 +0000 (12:08 +0000)]
dnn(test): re-enable tests which works with OpenVINO 2021.4.x (3.4)

2 years agodnn(test): drop non OCV/CPU cases for Int8
Alexander Alekhin [Thu, 2 Dec 2021 05:52:12 +0000 (05:52 +0000)]
dnn(test): drop non OCV/CPU cases for Int8

- zero code coverage and up to x3-x8 tests slowdown
- implementation executes OCV/CPU in all cases
- wrong skip conditions

2 years agoMerge pull request #21164 from rogday:sum_identity
Alexander Alekhin [Wed, 1 Dec 2021 22:49:02 +0000 (22:49 +0000)]
Merge pull request #21164 from rogday:sum_identity

2 years agoMerge pull request #21163 from rogday:transpose_default
Alexander Alekhin [Wed, 1 Dec 2021 22:47:57 +0000 (22:47 +0000)]
Merge pull request #21163 from rogday:transpose_default

2 years agoMerge pull request #21158 from anna-khakimova:ak/simd_subC
Anna Khakimova [Wed, 1 Dec 2021 21:58:30 +0000 (00:58 +0300)]
Merge pull request #21158 from anna-khakimova:ak/simd_subC

* GAPI Fluid: SIMD for SubC kernel.

* Applied comments

2 years agoMerge pull request #21153 from alalek:build_warnings_msvs2017
Alexander Alekhin [Wed, 1 Dec 2021 12:49:28 +0000 (12:49 +0000)]
Merge pull request #21153 from alalek:build_warnings_msvs2017

2 years agoMerge pull request #21112 from vrabaud:3.4_luv_overflow
Vincent Rabaud [Wed, 1 Dec 2021 12:46:03 +0000 (13:46 +0100)]
Merge pull request #21112 from vrabaud:3.4_luv_overflow

* Fix integer overflow in cv::Luv2RGBinteger::process.

For LL=49, uu=205, vv=23, we end up with x=7373056 and y=458
which overflows y*x.

* imgproc(test): adjust test parameters to cover SIMD code

2 years agoadd sum of 1 input
Smirnov Egor [Tue, 30 Nov 2021 12:42:20 +0000 (15:42 +0300)]
add sum of 1 input

2 years agoadd default order to transpose
Smirnov Egor [Tue, 30 Nov 2021 12:34:34 +0000 (15:34 +0300)]
add default order to transpose

2 years agoadd new (Log)SoftMax simplification passes
Smirnov Egor [Tue, 30 Nov 2021 12:20:52 +0000 (15:20 +0300)]
add new (Log)SoftMax simplification passes

2 years agoadd alpha parameter to ELU
Smirnov Egor [Tue, 30 Nov 2021 11:43:18 +0000 (14:43 +0300)]
add alpha parameter to ELU

2 years agoadd alpha parameter to ELU layer
Smirnov Egor [Tue, 30 Nov 2021 09:20:35 +0000 (12:20 +0300)]
add alpha parameter to ELU layer

2 years agobuild: eliminate C4309 warning from protobuf files with MSVS2017
Alexander Alekhin [Tue, 30 Nov 2021 04:27:39 +0000 (04:27 +0000)]
build: eliminate C4309 warning from protobuf files with MSVS2017

2 years agoMerge pull request #21152 from rogday:fix_defaults
Alexander Alekhin [Mon, 29 Nov 2021 22:39:27 +0000 (22:39 +0000)]
Merge pull request #21152 from rogday:fix_defaults

2 years agoMerge pull request #21142 from alalek:dnn_two_inputs_ocl_fp16_3.4
Alexander Alekhin [Mon, 29 Nov 2021 21:44:59 +0000 (21:44 +0000)]
Merge pull request #21142 from alalek:dnn_two_inputs_ocl_fp16_3.4

2 years agoMerge pull request #20658 from smbz:lstm_optimisation
Andrew Ryrie [Mon, 29 Nov 2021 21:43:00 +0000 (21:43 +0000)]
Merge pull request #20658 from smbz:lstm_optimisation

* dnn: LSTM optimisation

This uses the AVX-optimised fastGEMM1T for matrix multiplications where available, instead of the standard cv::gemm.

fastGEMM1T is already used by the fully-connected layer.  This commit involves two minor modifications:
 - Use unaligned access.  I don't believe this involves any performance hit in on modern CPUs (Nehalem and Bulldozer onwards) in the case where the address is actually aligned.
 - Allow for weight matrices where the number of columns is not a multiple of 8.

I have not enabled AVX-512 as I don't have an AVX-512 CPU to test on.

* Fix warning about initialisation order

* Remove C++11 syntax

* Fix build when AVX(2) is not available

In this case the CV_TRY_X macros are defined to 0, rather than being undefined.

* Minor changes as requested:

 - Don't check hardware support for AVX(2) when dispatch is disabled for these
 - Add braces

* Fix out-of-bounds access in fully connected layer

The old tail handling in fastGEMM1T implicitly rounded vecsize up to the next multiple of 8, and the fully connected layer implements padding up to the next multiple of 8 to cope with this.  The new tail handling does not round the vecsize upwards like this but it does require that the vecsize is at least 8.  To adapt to the new tail handling, the fully connected layer now rounds vecsize itself at the same time as adding the padding(which makes more sense anyway).

This also means that the fully connected layer always passes a vecsize of at least 8 to fastGEMM1T, which fixes the out-of-bounds access problems.

* Improve tail mask handling

 - Use static array for generating tail masks (as requested)
 - Apply tail mask to the weights as well as the input vectors to prevent spurious propagation of NaNs/Infs

* Revert whitespace change

* Improve readability of conditions for using AVX

* dnn(lstm): minor coding style changes, replaced left aligned load

2 years agofix Clip, LeakyReLU, LRN, Split defaults
Smirnov Egor [Mon, 29 Nov 2021 16:56:23 +0000 (19:56 +0300)]
fix Clip, LeakyReLU, LRN, Split defaults

2 years agofix_android_ndk_camera_order_of_u_and_v
utibenkei [Mon, 29 Nov 2021 13:43:29 +0000 (22:43 +0900)]
fix_android_ndk_camera_order_of_u_and_v

2 years agoMerge pull request #21119 from anna-khakimova:ak/simd_addc
Anna Khakimova [Mon, 29 Nov 2021 11:20:53 +0000 (14:20 +0300)]
Merge pull request #21119 from anna-khakimova:ak/simd_addc

* GAPI Fluid: SIMD for AddC kernel

* Final version

* Applied comments.

2 years agoMerge pull request #20733 from rogday:argmaxnd
rogday [Sun, 28 Nov 2021 16:17:46 +0000 (19:17 +0300)]
Merge pull request #20733 from rogday:argmaxnd

Implement ArgMax and ArgMin

* add reduceArgMax and reduceArgMin

* fix review comments

* address review concerns

2 years agoMerge pull request #20957 from sturkmen72:update-documentation
Suleyman TURKMEN [Sun, 28 Nov 2021 12:56:28 +0000 (15:56 +0300)]
Merge pull request #20957 from sturkmen72:update-documentation

Update documentation

* Update DNN-based Face Detection And Recognition tutorial

* samples(dnn/face): update face_detect.cpp

* final changes

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2 years agoMerge pull request #20933 from shubham-shahh:master
Supernovae [Sun, 28 Nov 2021 12:54:29 +0000 (18:24 +0530)]
Merge pull request #20933 from shubham-shahh:master

Improved overall readability of the code

* grid_nms.cu: minor fix-ups

* Update grid_stride_range.hpp

* Update tf_importer.cpp

2 years agodnn(DataLayer): fix CPU/OpenCL code paths for FP16 handling
Alexander Alekhin [Sun, 28 Nov 2021 04:29:54 +0000 (04:29 +0000)]
dnn(DataLayer): fix CPU/OpenCL code paths for FP16 handling

2 years agodnn(test): add two_inputs test with FP32/U8 data types
Alexander Alekhin [Sat, 27 Nov 2021 02:51:57 +0000 (02:51 +0000)]
dnn(test): add two_inputs test with FP32/U8 data types

- remove similar test from IE scope under HAVE_INF_ENGINE

2 years agoMerge pull request #21126 from alalek:dnn_test_ie_update_4.x
Alexander Alekhin [Sat, 27 Nov 2021 19:27:59 +0000 (19:27 +0000)]
Merge pull request #21126 from alalek:dnn_test_ie_update_4.x

2 years agoMerge pull request #21107 from take1014:remove_assert_21038
yuki takehara [Sat, 27 Nov 2021 18:34:52 +0000 (03:34 +0900)]
Merge pull request #21107 from take1014:remove_assert_21038

resolves #21038

* remove C assert

* revert C header

* fix several points in review

* fix test_ds.cpp

2 years agodnn(test): update InferenceEngine tests (4.x)
Alexander Alekhin [Thu, 25 Nov 2021 19:56:27 +0000 (19:56 +0000)]
dnn(test): update InferenceEngine tests (4.x)

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 27 Nov 2021 13:17:44 +0000 (13:17 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21134 from alalek:gapi_fix_build_ie_msvs2015
Alexander Alekhin [Sat, 27 Nov 2021 12:59:45 +0000 (12:59 +0000)]
Merge pull request #21134 from alalek:gapi_fix_build_ie_msvs2015

2 years agoMerge pull request #21133 from alalek:dnn_test_ie_update_3.4
Alexander Alekhin [Fri, 26 Nov 2021 20:35:58 +0000 (20:35 +0000)]
Merge pull request #21133 from alalek:dnn_test_ie_update_3.4

2 years agogapi: fix build with MSVS2015 (with IE)
Alexander Alekhin [Fri, 26 Nov 2021 19:34:52 +0000 (19:34 +0000)]
gapi: fix build with MSVS2015 (with IE)

2 years agodnn(test): update InferenceEngine tests
Alexander Alekhin [Thu, 25 Nov 2021 19:56:27 +0000 (19:56 +0000)]
dnn(test): update InferenceEngine tests

2 years agoMerge pull request #21131 from cclauss:codespell
Alexander Alekhin [Fri, 26 Nov 2021 18:32:54 +0000 (18:32 +0000)]
Merge pull request #21131 from cclauss:codespell

2 years agoMerge pull request #21130 from cclauss:print-function
Alexander Alekhin [Fri, 26 Nov 2021 18:31:31 +0000 (18:31 +0000)]
Merge pull request #21130 from cclauss:print-function

2 years agoMerge pull request #21121 from cclauss:patch-2
Christian Clauss [Fri, 26 Nov 2021 18:18:48 +0000 (19:18 +0100)]
Merge pull request #21121 from cclauss:patch-2

* GitHub Action to lint Python code

* Move from automatic events to manual ones

* flake8: Do not look for undefined names

2 years agoMerge pull request #21103 from OrestChura:oc/fix_1D_Mat_RMat_View_issue
Orest Chura [Fri, 26 Nov 2021 16:42:12 +0000 (19:42 +0300)]
Merge pull request #21103 from OrestChura:oc/fix_1D_Mat_RMat_View_issue

[G-API] Fix issue of getting 1D Mat out of RMat::View

* Fix issue of getting 1D Mat out of RMat::View
 - added test
 - fixed for standalone too (removed Assert(dims.empty()))

* Fixed asVeiw() function for standalone

* Put more detailed comment

2 years agoMerge pull request #21083 from OrestChura:oc/fix_coverity_vino_issues
Orest Chura [Fri, 26 Nov 2021 16:40:36 +0000 (19:40 +0300)]
Merge pull request #21083 from OrestChura:oc/fix_coverity_vino_issues

[G-API] Fixed Coverity issues

* Fixed Coverity issues
 - VectorRef&OpaqueRef m_kind = CV_UNKNOWN
 - added same-type overload for saturate()
 - sanitized resize value in ByteMemoryInStream::operator>> (std::string& str)
 - handled throws from ~GStreamingExecutor()

* Catching exception by const ref

* Addressing Sergey's comments

* Applied enable_if semanitcs to saturate(x, round) too

* Removed uncaught_exception, made destructor noexcept back

* Split Fluid ConvertTo to multiple functions to avoid ifs; added CV_ALWAYS_INLINE

* Added FIXME to address throwings from stop()

* Fix standalone

* Addressing comments

* Guarded SIMD optimizations properly

* Removed excess parameter from simd_impl functions

2 years agoMerge pull request #21106 from mpashchenkov:mp/ocv-gapi-clean-samples
Maxim Pashchenkov [Fri, 26 Nov 2021 11:31:15 +0000 (14:31 +0300)]
Merge pull request #21106 from mpashchenkov:mp/ocv-gapi-clean-samples

G-API: Cleaning samples

* parseSSD + removed render details from gcpukernel

* self-rev

* Applying comment

* Added operators

* warnings

2 years agoFix typos discovered by codespell
Christian Clauss [Fri, 26 Nov 2021 11:29:56 +0000 (12:29 +0100)]
Fix typos discovered by codespell

2 years agoMerge pull request #21128 from cclauss:patch-3
Alexander Alekhin [Fri, 26 Nov 2021 11:11:58 +0000 (11:11 +0000)]
Merge pull request #21128 from cclauss:patch-3

2 years agoUse print() function in both Python 2 and Python 3
Christian Clauss [Fri, 26 Nov 2021 10:57:54 +0000 (11:57 +0100)]
Use print() function in both Python 2 and Python 3

2 years agoCMakeLists.txt: Fix typo discovered by codespell
Christian Clauss [Fri, 26 Nov 2021 10:07:14 +0000 (11:07 +0100)]
CMakeLists.txt: Fix typo discovered by codespell

https://pypi.org/project/codespell/

2 years agoMerge pull request #21123 from cclauss:patch-3
Alexander Alekhin [Thu, 25 Nov 2021 18:06:33 +0000 (18:06 +0000)]
Merge pull request #21123 from cclauss:patch-3

2 years agoUse ==/!= to compare constant literals (str, bytes, int, float, tuple)
Christian Clauss [Thu, 25 Nov 2021 11:44:21 +0000 (12:44 +0100)]
Use ==/!= to compare constant literals (str, bytes, int, float, tuple)

Avoid `SyntaxWarning` on Python >= 3.8
```
>>> "convolutional" == "convolutional"
True
>>> "convolutional" is "convolutional"
<stdin>:1: SyntaxWarning: "is" with a literal. Did you mean "=="?
True
```
Related to #21121

2 years agoMerge pull request #21108 from ShuangLiu1992:patch-1
Alexander Alekhin [Wed, 24 Nov 2021 20:10:37 +0000 (20:10 +0000)]
Merge pull request #21108 from ShuangLiu1992:patch-1

2 years agoMerge pull request #21110 from alalek:update_libjpeg-turbo
Alexander Alekhin [Wed, 24 Nov 2021 20:08:27 +0000 (20:08 +0000)]
Merge pull request #21110 from alalek:update_libjpeg-turbo

2 years ago3rdparty: libjpeg-turbo 2.1.0 => 2.1.2
Alexander Alekhin [Wed, 24 Nov 2021 03:43:55 +0000 (03:43 +0000)]
3rdparty: libjpeg-turbo 2.1.0 => 2.1.2

https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.2