-
-
Notifications
You must be signed in to change notification settings - Fork 56.4k
5.x merge 4.x #25305
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 #25305
Conversation
…_removal Partially backport C API removal in imgproc module to reduce conflicts with 5.x
See issue opencv#25112
Update net_impl.cpp and net.cpp to fix the first part of opencv#25112
* follow the message
Use std::priority_queue in inpaint function for performance improvement opencv#25122 In `cv::inpaint` implementation, it uses a priority queue with O(n) time linear search. For large images it is very slow. I replaced it with C++'s standard library `std::priority_queue`, that uses O(log(n)) algorithm. In my use case, it is x10 faster than the original. ### 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 - [ ] There is a reference to the original bug report and related work - [x] 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
Fixed ReduceMean layer behaviour opencv#25120 ### 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 https://github.com/microsoft/onnxruntime/blob/a93c31e3c9971063d8dfe45a627a80cbdcf99ed9/onnxruntime/core/providers/cpu/reduction/reduction_ops.cc#L433-L443
build: suppress warning ARM64 + Visual Studio build
A small rectification space mistake in README.md
Zlib upgrade to version 1.3.1 opencv#25123 Upgrade zlib dependency from 1.3.0 to 1.3.1 - [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 - [ ] 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 Co-authored-by: Misha Klatis <[email protected]>
…port Partially back-port opencv#25075 to 4.x
Documentation transition to fresh Doxygen opencv#25042 * current Doxygen version is 1.10, but we will use 1.9.8 for now due to issue with snippets (doxygen/doxygen#10584) * Doxyfile adapted to new version * MathJax updated to 3.x * `@relates` instructions removed temporarily due to issue in Doxygen (to avoid warnings) * refactored matx.hpp - extracted matx.inl.hpp * opencv_contrib - opencv/opencv_contrib#3638
calib3d: doc: remove C API link (For 4.x) opencv#25141 Related to opencv#25140 (for 4.x) ### 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
…2754 Backport some highgui changes from opencv#22754
doc: removed duplicated markdown file
Avoid copy of ONNX graph during import
…pproximations-in-ChessBoardDetector-generateQuads-2 Improve contours approximations in ChessBoardDetector::generateQuads
G-API: A quick value-initialization support GMat opencv#25055 This PR enables `GMat` objects to be value-initialized in the same way as it was done for `GScalar`s (and, possibly, other types). - Added some helper methods in backends to distinguish if a certain G-type value initialization is supported or not; - Added tests, including negative. Where it is needed: - Further extension of the OVCV backend (opencv#24379 - will be refreshed soon); - Further experiments with DNN module; - Further experiments with "G-API behind UMat" sort of aggregation. In the current form, PR can be reviewed & merged (@TolyaTalamanov please have a look) ### 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 - [ ] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
doc: auto-enabling DOT support in documentation if dot executable has been found
imgcodecs: jpeg: (test) fix condition to compare rgb and cmyk jpeg
Optimize int8 layers in DNN modules by using RISC-V Vector intrinsic. opencv#25230 This patch optimize 3 functions in the int8 layer by using RVV Native Intrinsic. This patch was tested on QEMU using VLEN=128 and VLEN=256 on `./bin/opencv_test_dnn --gtest_filter="*Int8*"`; On the real device (k230, VLEN=128), `EfficientDet_int8` in `opencv_perf_dnn` showed a performance improvement of 1.46x. | Name of Test | Original | optimized | Speed-up | | ------------------------------------------ | -------- | ---------- | -------- | | EfficientDet_int8::DNNTestNetwork::OCV/CPU | 2843.467 | 1947.013 | 1.46 | ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [ ] I agree to contribute to the project under Apache 2 License. - [ ] 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
fix download file hash value mismatch issue
88994fb to
47ddbb9
Compare
|
@mshabunin @opencv-alalek @fengyuentau @dkurt Could you take a look? |
47ddbb9 to
cace6e9
Compare
cace6e9 to
84b32fa
Compare
opencv-alalek
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea how these mistakes come here - please follow git merge process with minimal set of file replacements.
Use this command to check changes on 4.x:
git diff 5.x-merge-4.x-origin..4.x -- <file or directory on 4.x>
(branch 5.x-merge-4.x-origin is described in the maintainers document)
GHA infra needs stabilization:
Error: The action 'Build OpenCV Contrib' has timed out after 100 minutes.
https://github.com/opencv/opencv/actions/runs/8520933844/job/23338087203?pr=25305
84b32fa to
5b8a155
Compare
5b8a155 to
cb6d295
Compare
Contrib: opencv/opencv_contrib#3710
Extra: opencv/opencv_extra#1164
#24415 from thewoz:imread
#24724 from tomoaki0705:carotene_warnings
#24877 from zzuliys:feature/mac
#24893 from chacha21:cart_polar_inplace
#25042 from mshabunin:doc-upgrade
#25055 from dmatveev:dm/value_initialized_gmat
#25092 from klatism:libjpeg-upgrade
#25096 from klatism:libtiff-upgrade
#25120 from LaurentBerger:I25103
#25122 from unnonouno:pqueue
#25123 from klatism:zlib-upgrade
#25125 from asmorkalov:as/backport_imgproc_c_removal
#25130 from CSBVision:patch-6
#25141 from Kumataro:fix25140_4.x
#25143 from Aman-Vishwakarma1729:4.x
#25145 from MaximSmolskiy:improve-contours-approximations-in-ChessBoardDetector-generateQuads-2
#25149 from asmorkalov:as/error_cleanup_backport
#25160 from asmorkalov:as/backport_highgui_22754
#25162 from mshabunin:doc-upgrade-fix
#25163 from dkurt:onnx_graph_ref
#25166 from fengyuentau:fix_cann_gemm
#25171 from mshabunin:doc-auto-dot
#25176 from cabelo:4.x
#25177 from MaximSmolskiy:speed-up-adaptive-image-binary-threshold-in-findChessboardCorners
#25180 from mshabunin:doc-fix-javadoc
#25181 from dkurt:release_conv_weights
#25182 from MaximSmolskiy:increase-decomposeProjectionMatrix-precision-for-small-scales
#25183 from MaximSmolskiy:fix-bug-in-maskBoundingRect
#25184 from dkurt:avoid_extra_memset
#25189 from klatism:ios-build-fixes
#25190 from klatism:android-config-flags-enhancement
#25199 from olpipi:fix_openvino_2024_0
#25203 from mshabunin:fix-scalable-intrin-test
#25204 from mshabunin:fix-rvv-vne
#25213 from mshabunin:fix-doc-buttons
#25217 from fengyuentau:float16_datatype_renaming
#25229 from giokara-oqton:fix_jpegturbo_win64
#25230 from hanliutong/rvv-conv
#25237 from YusukeKameda:4.x
#25238 from fengyuentau:optimized_const
#25249 from carabsc:cara_changes
#25255 from Kumataro:refactor_imgcodec_tiff_add_imwrite_tiff
#25257 from Kumataro:fix25256
#25258 from AleksandrPanov:fix_rotated_symmetric_grid
#25264 from lpylpy0514:4.x
#25269 from RoboSchmied:RoboSchmied-AGfixT56
#25271 from fengyuentau:matmul_bias
#25273 from dkurt:tflite_new_layers
#25280 from Kumataro:fix25274
#25282 from asmorkalov:as/deterministic_undistort_test
#25285 from johnteslade:cgroupsv2-support
#25291 from dkurt:einsum_openvino
#25293 from asmorkalov:as/dct_hal_fix
#25294 from asmorkalov:as/InferROI_TestStreamingInfer_supress
#25299 from Kumataro:add_fix25274
#25301 from zzuliys:feature/mismatch_hashcode
Previous "Merge 4.x": #25119