5.x merge 4.x #26404
Merged
5.x merge 4.x #26404
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed "If the pixel value is smaller than the threshold" to "If the pixel value is smaller than or equal to the threshold" to make the line align with the working of the code.
OpenVINO friendly output names from non-compiled Model
Use LMUL=2 in the RISC-V Vector (RVV) backend of Universal Intrinsic. opencv#26318 The modification of this patch involves the RVV backend of Universal Intrinsic, replacing `LMUL=1` with `LMUL=2`. Now each Universal Intrinsic type actually corresponds to two RVV vector registers, and each Intrinsic function also operates two vector registers. Considering that algorithms written using Universal Intrinsic usually do not use the maximum number of registers, this can help the RVV backend utilize more register resources without modifying the algorithm implementation This patch is generally beneficial in performance. We compiled OpenCV with `Clang-19.1.1` and `GCC-14.2.0` , ran it on `CanMV-k230` and `Banana-Pi F3`. Then we have four scenarios on combinations of compilers and devices. In `opencv_perf_core`, there are 3363 cases, of which: - 901 (26.8%) cases achieved more than `5%` performance improvement in all four scenarios, and the average speedup of these test cases (compared to scalar) increased from `3.35x` to `4.35x` - 75 (2.2%) cases had more than `5%` performance loss in all four scenarios, indicating that these cases are better with `LMUL=1` instead of `LMUL=2`. This involves `Mat_Transform`, `hasNonZero`, `KMeans`, `meanStdDev`, `merge` and `norm2`. Among them, `Mat_Transform` only has performance degradation in a few cases (`8UC3`), and the actual execution time of `hasNonZero` is so short that it can be ignored. For `KMeans`, `meanStdDev`, `merge` and `norm2`, we should be able to use the HAL to optimize/restore their performance. (In fact, we have already done this for `merge` opencv#26216 ) ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [ ] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
Update py_thresholding.markdown
WinRT/UWP build: fix some specific warnings
Add the missing license header in hal_rvv.
Fix incorrect string format in js build script opencv#26374 I accidentally met this small problem mentioned in opencv#25084 (comment) when play with wasm build. It seems https://github.com/EDVTAZ didn't fix it yet, so I create this tiny pr. Additionally, I remove a redundant argument in `add_argument` call. `'store_true'` already set the default, see https://docs.python.org/3/library/argparse.html#action. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
Hotfix ie_ngraph.cpp in Debug
WinRT/UWP build: fix more warnings in media part
Fix test typo.
…g versions, e.g. NDK 28b1.
Disable SME2 branches in KleidiCV as it's incompatible with some CLang versions, e.g. NDK 28b1
…neBlocklineNN Use generic SIMD in warpAffineBlocklineNN
Added Universal Windows Package build to CI.
|
@mshabunin @opencv-alalek could you take a look? |
|
@hanliutong I just ignored 4.x changes for RVV and took 5.x version as soon as you provided dedicated patch. Please take a look and let me know, if I miss something important. |
mshabunin
approved these changes
Nov 5, 2024
@asmorkalov Yes, then #26318 should not be merged into 5.x |
asmorkalov
force-pushed
the
5.x-merge-4.x
branch
from
1a231d7 to
0398354
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OpenCV Contrib: opencv/opencv_contrib#3819
OpenCV Extra: no changes
#26203 from FantasqueX:generic-simd-warpAffineBlocklineNN
#26318 from hanliutong:rvv-intrin-m2
#26356 from hardikkamboj:4.x
#26357 from dkurt:dkurt/ov_out_names_from_graph
#26368 from hanliutong:rvv-hal-license
#26370 from mshabunin:fix-winrt-warnings
#26374 from OrkWard:fix-js-build-script
#26381 from dkurt:dk/hotfix_dnn_debug
#26384 from mshabunin:fix-winrt-warnings-2
#26388 from vrabaud:4_8u
#26390 from asmorkalov:as/kleidicv_no_sme2
#26402 from asmorkalov:as/win_uwp_ci
Previous "Merge 4.x": #26358