Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update submodules to 4.10.0-pre for testing. #990

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Jun 3, 2024
Merged

Update submodules to 4.10.0-pre for testing. #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
375b19b
Update submodules to 4.10.0-pre for testing.
asmorkalov May 30, 2024
4cd2687
Update donation link.
asmorkalov May 30, 2024
30ee36b
Use 4 digits in OpenCV version since 4.10.0
asmorkalov May 31, 2024
882af5b
Add OrbbecSDK library to package for MacOS ARM. It's aways enabled du…
asmorkalov May 31, 2024
22c0895
Alternative solution for Orbbec on MacOS
asmorkalov May 31, 2024
7638be6
Bug fixes.
asmorkalov Jun 2, 2024
6839a27
Abs file names for OrbbecSDK.
asmorkalov Jun 2, 2024
bb7ad9b
Restored Darwin check.
asmorkalov Jun 2, 2024
fcbd6dd
Another try
asmorkalov Jun 2, 2024
da63b3d
Syntax fix.
asmorkalov Jun 2, 2024
215cda6
Fix mac intel.
asmorkalov Jun 2, 2024
b56e0f5
Typo
asmorkalov Jun 2, 2024
12bf0c3
Submodules update to tag 4.10.0.
asmorkalov Jun 3, 2024
9c3fee1
Typo fix.
asmorkalov Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 opencv
Open in desktop
Submodule opencv updated 1305 files
2 changes: 1 addition & 1 deletion 2 opencv_contrib
Open in desktop
Submodule opencv_contrib updated 236 files
2 changes: 1 addition & 1 deletion 2 opencv_extra
Open in desktop
Submodule opencv_extra updated 76 files
+ − testdata/cv/aruco/chocclusion_original.jpg
+ − testdata/cv/aruco/choriginal.jpg
+30 −0 testdata/cv/aruco/detector_params.yml
+ − testdata/cv/aruco/diamondmarkers.jpg
+ − testdata/cv/aruco/gboriginal.jpg
+ − testdata/cv/aruco/singlemarkersoriginal.jpg
+38 −0 testdata/cv/aruco/tutorial_dict.yml
+ − testdata/cv/cameracalibration/circles/circles_24964.png
+ − testdata/cv/cameracalibration/fisheye/stereo_pair_014.png
+ − testdata/cv/imgproc/adaptive_threshold1.png
+ − testdata/cv/imgproc/adaptive_threshold2.png
+ − testdata/cv/mcc/mcc_ccm_test.jpg
+91 −0 testdata/cv/mcc/mcc_ccm_test.yml
+ − testdata/cv/mcc/mcc_ccm_test_res.png
+ − testdata/cv/qrcode/issue_22892.png
+ − testdata/cv/qrcode/issue_24011.jpg
+ − testdata/cv/qrcode/issue_24450.png
+ − testdata/cv/qrcode/issue_24679.png
+94 −6 testdata/dnn/download_models.py
+ − testdata/dnn/onnx/conformance/node/test_group_normalization_epsilon/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_epsilon/test_data_set_0/input_0.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_epsilon/test_data_set_0/input_1.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_epsilon/test_data_set_0/input_2.pb
+ − testdata/dnn/onnx/conformance/node/test_group_normalization_epsilon/test_data_set_0/output_0.pb
+ − testdata/dnn/onnx/conformance/node/test_group_normalization_example/model.onnx
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_example/test_data_set_0/input_0.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_example/test_data_set_0/input_1.pb
+1 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_example/test_data_set_0/input_2.pb
+2 −0 testdata/dnn/onnx/conformance/node/test_group_normalization_example/test_data_set_0/output_0.pb
+ − testdata/dnn/onnx/data/input_biased_matmul.npy
+ − testdata/dnn/onnx/data/input_clip_div_shared_constant.npy
+ − testdata/dnn/onnx/data/input_layer_norm_no_fusion.npy
+ − testdata/dnn/onnx/data/input_range_float.npy
+ − testdata/dnn/onnx/data/input_range_float_negative.npy
+ − testdata/dnn/onnx/data/output_biased_matmul.npy
+ − testdata/dnn/onnx/data/output_clip_div_shared_constant.npy
+ − testdata/dnn/onnx/data/output_layer_norm_no_fusion.npy
+ − testdata/dnn/onnx/data/output_range_float.npy
+ − testdata/dnn/onnx/data/output_range_float_negative.npy
+29 −0 testdata/dnn/onnx/generate_onnx_models.py
+72 −2 testdata/dnn/onnx/generate_onnx_models_with_onnxscript.py
+ − testdata/dnn/onnx/models/biased_matmul.onnx
+ − testdata/dnn/onnx/models/clip_div_shared_constant.onnx
+ − testdata/dnn/onnx/models/layer_norm_no_fusion.onnx
+ − testdata/dnn/onnx/models/range_float.onnx
+ − testdata/dnn/onnx/models/range_float_negative.onnx
+ − testdata/dnn/segmentation_exp.png
+ − testdata/dnn/tflite/fully_connected.tflite
+ − testdata/dnn/tflite/fully_connected_inp.npy
+ − testdata/dnn/tflite/fully_connected_out_Identity.npy
+76 −4 testdata/dnn/tflite/generate.py
+ − testdata/dnn/tflite/global_average_pooling_2d.tflite
+ − testdata/dnn/tflite/global_average_pooling_2d_inp.npy
+ − testdata/dnn/tflite/global_average_pooling_2d_out_Identity.npy
+ − testdata/dnn/tflite/global_max_pooling_2d.tflite
+ − testdata/dnn/tflite/global_max_pooling_2d_inp.npy
+ − testdata/dnn/tflite/global_max_pooling_2d_out_Identity.npy
+ − testdata/dnn/tflite/permutation_3d.tflite
+ − testdata/dnn/tflite/permutation_3d_inp.npy
+ − testdata/dnn/tflite/permutation_3d_out_Identity.npy
+ − testdata/dnn/tflite/permutation_4d_0132.tflite
+ − testdata/dnn/tflite/permutation_4d_0132_inp.npy
+ − testdata/dnn/tflite/permutation_4d_0132_out_Identity.npy
+ − testdata/dnn/tflite/permutation_4d_0213.tflite
+ − testdata/dnn/tflite/permutation_4d_0213_inp.npy
+ − testdata/dnn/tflite/permutation_4d_0213_out_Identity.npy
+ − testdata/dnn/tflite/permutation_4d_0231.tflite
+ − testdata/dnn/tflite/permutation_4d_0231_inp.npy
+ − testdata/dnn/tflite/permutation_4d_0231_out_Identity.npy
+ − testdata/dnn/tflite/split.tflite
+ − testdata/dnn/tflite/split_inp.npy
+ − testdata/dnn/tflite/split_out_Identity.npy
+ − testdata/gapi/gapi_logo.jpg
+ − testdata/gapi/ov/identity_net_100x100.bin
+185 −0 testdata/gapi/ov/identity_net_100x100.xml
+ − testdata/highgui/readwrite/test_1_c4.jpg
10 changes: 8 additions & 2 deletions 10 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,17 @@ def main():
# Path regexes with forward slashes relative to CMake install dir.
rearrange_cmake_output_data = {
"cv2": (
[r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if is64 else "")]
[r"bin/opencv_videoio_ffmpeg\d{4}%s\.dll" % ("_64" if is64 else "")]
if os.name == "nt"
else []
)
+
(
[r"lib/libOrbbecSDK.dylib", r"lib/libOrbbecSDK.\d.\d.dylib", r"lib/libOrbbecSDK.\d.\d.\d.dylib"]
if platform.system() == "Darwin" and platform.machine() == "arm64"
else []
)
+
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
# Naming conventions vary so widely between versions and OSes
# had to give up on checking them.
Expand Down Expand Up @@ -310,7 +316,7 @@ def main():
cmake_source_dir=cmake_source_dir,
)

print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on IndieGoGo:\nhttps://www.indiegogo.com/projects/opencv-5-support-non-profit-open-source-cv-ai#/")
print("OpenCV is raising funds to keep the library free for everyone, and we need the support of the entire community to do it. Donate to OpenCV on GitHub:\nhttps://github.com/sponsors/opencv\n")

class RearrangeCMakeOutput:
"""
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.