Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(5.x) Merge 4.x #20216

Merged
merged 162 commits into from
Jun 4, 2021
Merged

(5.x) Merge 4.x #20216

merged 162 commits into from
Jun 4, 2021

Conversation

alalek
Copy link
Member

@alalek alalek commented Jun 4, 2021

93 PRs

#19689 from andy-held:umeyama
#19755 from mikhail-nikolskiy:ffmpeg-umat
#19778 from damonyu1989:master-riscv-0.7.1
#19780 from HarryDC:feature/index-multiimage-tiff
#19851 from sturkmen72:update_documentation
#19881 from AndreiCostinescu:patch-1
#19883 from jondea:arm-neon-optimised-color-lab-3.4
#19884 from danielenricocahall:fix-prediction-features-bug
#19886 from alalek:issue_19875
#19894 from alalek:fix_ml_tree_legacy_import
#19900 from berak:doc_fix_python_retval
#19901 from alalek:ml_update_checks
#19908 from CSBVision:patch-2
#19913 from mshabunin:fix-san-build
#19917 from AsyaPronina:asyadev/itt_traces_in_gstreamingexecutor
#19923 from dbudniko:dbudniko/G-API_mtcnn_demo_PR
#19928 from alalek:cmake_videoio_fix_handling_of_disabled_plugins
#19931 from lukasalexanderweber:patch-1
#19934 from alalek:videoio_plugin_query_api
#19937 from Mstrodl:fix/cmake-version-change
#19942 from berak:calib3d_fix_usac_mask
#19944 from berak:patch-1
#19951 from stal12:3.4
#19956 from danielenricocahall:fix-edge-case-matcher-loop
#19959 from QuellaZhang:quella/c++20
#19961 from alvoron:dnn_ngraph_int64_fix
#19962 from mshabunin:one-vpl-support
#19967 from HattrickGenerator:master
#19969 from alalek:issue_19850
#19970 from antonio-rojas:master
#19971 from TolyaTalamanov:at/infer-hangs-fix
#19975 from danielenricocahall:fix-template-matcher-sqdiff
#19976 from jiangjiajun:master
#19979 from micha137:patch-3
#19980 from zchrissirhcz:fix-CV_XADD-missing-return-type
#19982 from TolyaTalamanov:at/new-python-operation-api
#19983 from hartmannathan:typo-fix-download
#19984 from sturkmen72:patch-4
#19987 from daksayli:stitching_detailed_branch
#19988 from alexkalmuk:fix-squares-cpp-sample
#19993 from danielenricocahall:fix-compute-ecc-issue
#19998 from asmorkalov:as/openexr_version_check
#20006 from alalek:dnn_ie_gpu_cache_dir
#20010 from fpetrogalli:disable_filesystem
#20011 from Developer-Ecosystem-Engineering:3.4
#20012 from ivashmak:bugfix_solvepnp
#20014 from alalek:fix_core_tls_process_termination
#20018 from lpea:doc_fixes_calib3d
#20019 from r2d3:cudaStreamCreate_bug
#20026 from ilya-lavrenov:inference-engine-version-from-cmake
#20033 from berak:dnn_openpose_py
#20036 from APrigarina:tracking_api
#20045 from blackliner:master
#20049 from jstaahl:jstaahl-static-inits
#20053 from berak:core_mat_ptr_vec
#20054 from danielenricocahall:fix-robertson-calibration-bug
#20065 from dbudniko:dbudniko/G-API_mtcnn_demo_PR_hotfix2
#20068 from TolyaTalamanov:at/disable-iebackend-autofusing
#20071 from rogday:depth_fallback_doc
#20080 from pauljurczak:patch-3
#20082 from jiangjiajun:master
#20085 from changh95:fix_typo_calib3d_sample_code
#20086 from rogday:vtk9_world
#20088 from alalek:cmake_module_linker_flags
#20092 from komakai:disable_swift_build
#20097 from komakai:fix_qrcode_test
#20102 from yo1990:master
#20103 from thezane:make-div-spectrums-public
#20106 from TolyaTalamanov:at/auto-convert-fp16
#20107 from sivanov-work:gapi_transpose_op
#20116 from alalek:highgui_backends
#20119 from TolyaTalamanov:at/compile-arg-for-queue-capacity
#20123 from catree:fix_tsai_park_bib_render
#20135 from mightbxg:bugfix_GaussianBlur
#20137 from fpetrogalli:move-option
#20146 from asmorkalov:as/java_test_filter
#20149 from rogday:on_mouse_floor
#20150 from rogday:svm_detector_test
#20155 from dbudniko:dbudniko/G-API_mtcnn_demo_queue_option
#20157 from mpashchenkov:mp/ocv-gapi-pnetworks
#20158 from hyrodium:fix/latex
#20164 from mshabunin:fix-gtk-check
#20172 from alalek:fixup_19334
#20173 from alalek:videoio_test_vp9_skip
#20174 from alalek:issue_20159
#20175 from rogday:dnn_samples_cuda
#20182 from hanliutong:master
#20187 from alalek:highgui_plugins_cleanup
#20189 from dbudniko:dbudniko/mtcnn_sample_with_regular_transpose_kernel
#20191 from alalek:issue_20032
#20192 from alalek:update_libjpeg-turbo
#20194 from mshabunin:doc-plugins
#20201 from PolarNick239:3.4

Previous "Merge 4.x": #19885

Xci_branch=5.x-merge-4.x
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#build_image:Custom=ubuntu-openvino-2021.1.0:20.04
#build_image:Custom=ubuntu-openvino-2021.2.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04
Xbuildworker:Custom=linux-1
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
build_image:Custom Mac=openvino-2021.3.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
build_image:Custom Win=openvino-2021.3.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules:Custom Win=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

test_bigdata:Custom=1
test_filter:Custom=*
test_modules:Custom=dnn,python2,python3,java
test_opencl:Custom=OFF
build_contrib:Custom=OFF

sturkmen72 and others added 30 commits April 8, 2021 22:29
…n-features-bug

Fix bug with predictions in RTrees/Boost

* address bug where predict functions with invalid feature count in rtrees/boost models

* compact matrix rep in tests

* check 1..n-1 and n+1 in feature size validation test
Currently, the LOADER_DIR is set as os.path.dirname(os.path.abspath(__file__)). This does not point to the true library path if the cv2 folder is symlinked into the Python package directory such that importing cv2 under Python fails. The proposed change only resolves symbolic links correctly by calling os.path.realpath(__file__) first and does not change anything if __file__ contains no symbolic link.
fix a build warning:

```
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(289): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(361): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
```

(from https://build.opencv.org.cn/job/precommit/job/windows10/1633/console)
Explicit usage of int64_t in CropAndResizeLayer (IE backend)

* Update crop_and_resize_layer.cpp
hanliutong and others added 25 commits May 30, 2021 16:00
…-calibration-bug

Fix Robertson Calibration NaN Bug

* add epsilon value for numerical stability in robertson merge

* update test to use range based for loop

* add comment to test

* move the epsilon

* address test comments

fix windows build warnings

fix vector type for tests

update tests

make threshold float

address test comments

fix tests and move epsilon again

* use scalar::all, move epsilon, and remove print
Tracking API: added DaSiamRPN tracker

* added dasiamrpn tracker

* dasiamrpn: add test, rewrite sample

* change python samples

* fix tests

* fix params
Improve performance on Arm64

* Improve performance on Apple silicon

This patch will
- Enable dot product intrinsics for macOS arm64 builds
- Enable for macOS arm64 builds
- Improve HAL primitives
  - reduction (sum, min, max, sad)
  - signmask
  - mul_expand
  - check_any / check_all

Results on a M1 Macbook Pro

* Updates to opencv#20011 based on feedback

  - Removes Apple Silicon specific workarounds
  - Makes #ifdef sections smaller for v_mul_expand cases
  - Moves dot product optimization to compiler optimization check
  - Adds 4x4 matrix transpose optimization

* Remove dotprod and fix v_transpose

Based on the latest, we've removed dotprod entirely and will revisit in a future PR.

Added explicit cats with v_transpose4x4()

This should resolve all opens with this PR

* Remove commented out lines

Remove two extraneous comments
add cuda and vulkan backends to dnn samples
G-API: Python. Wrapper for networks.

* Python networks

* Added pyopencv_to

* Changed work with pyopencv_to
…ith_regular_transpose_kernel

Remove custom transpose kernel from MTCNN sample
* Update dnn.hpp

getPerfProfile is not supported by the CUDA backend, see opencv#20077

* dnn.hpp: fix doxygen formatting
@alalek alalek merged commit b91e0dc into opencv:next Jun 4, 2021
@alalek alalek mentioned this pull request Jun 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet