Skip to content

Commit

Permalink
Update submodules to 4.10.0-pre for testing. (#990)
Browse files Browse the repository at this point in the history
* Submodules update to tag 4.10.0.
* Update donation link.
* Use 4 digits in OpenCV version since 4.10.0
* Add OrbbecSDK library to package for MacOS ARM. It's aways enabled during library build.
  • Loading branch information
asmorkalov authored Jun 3, 2024
1 parent 5f132ad commit 63eed93
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion opencv
Submodule opencv updated 1305 files
2 changes: 1 addition & 1 deletion opencv_contrib
Submodule opencv_contrib updated 236 files
2 changes: 1 addition & 1 deletion opencv_extra
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 setup.py
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

0 comments on commit 63eed93

Please sign in to comment.