Merge branch 'develop' into dev_update_detection_parser

Author: aljazkonec1

.github/workflows/python-main.yml

@@ -300,7 +300,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.9, '3.10', '3.11', '3.12', '3.13', '3.14']
-        os: [macos-13, macos-14]
+        os: [macos-15-intel, macos-14]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     env:
@@ -371,7 +371,7 @@ jobs:
     needs: build-macos
     strategy:
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-15-intel, macos-14]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:

bindings/python/ci/combine_wheels.py

@@ -9,6 +9,8 @@
 import tempfile
 import subprocess
 import sys
+import re
+import random
 
 from collections import defaultdict
 
@@ -25,6 +27,45 @@ class WheelInfo:
     abi_tag: str
     platform_tag: str
 
+def _python_tag_sort_key(tag: str):
+    key_parts = []
+    for component in tag.split("."):
+        match = re.match(r"([a-zA-Z]+)(\d+)$", component)
+        if match:
+            prefix, numeric = match.groups()
+            key_parts.append((prefix, int(numeric)))
+        else:
+            key_parts.append((component, 0))
+    return tuple(key_parts)
+
+def _run_self_test():
+    logger.info("Running combine_wheels self-test")
+    simple_tags = ["cp39", "cp310", "cp311", "cp38"]
+    expected_simple = ["cp38", "cp39", "cp310", "cp311"]
+    actual_simple = sorted(simple_tags, key=_python_tag_sort_key)
+    assert actual_simple == expected_simple, f"Simple ordering failed: {actual_simple}"
+
+    composite_tags = ["cp39.cp310", "cp39.cp312", "cp38.cp310", "cp310.cp311", "cp39.cp311"]
+    expected_composite = ["cp38.cp310", "cp39.cp310", "cp39.cp311", "cp39.cp312", "cp310.cp311"]
+    actual_composite = sorted(composite_tags, key=_python_tag_sort_key)
+    assert actual_composite == expected_composite, f"Composite ordering failed: {actual_composite}"
+
+    wheels = [
+        WheelInfo(
+            wheel_name=f"depthai-foo-{tag}-abi-{idx}",
+            wheel_path=f"/tmp/{tag}-{idx}.whl",
+            wheel_dvb="depthai-foo",
+            python_tag=tag,
+            abi_tag=f"abi{idx}",
+            platform_tag="plat",
+        )
+        for idx, tag in enumerate(composite_tags)
+    ]
+    random.shuffle(wheels)
+    wheels.sort(key=lambda info: _python_tag_sort_key(info.python_tag))
+    assert [w.python_tag for w in wheels] == expected_composite, "WheelInfo sorting failed"
+    logger.info("Self-test passed")
+
 def combine_wheels_linux(args, wheel_infos):
 
     logger.info("Combining wheels for Linux!")
@@ -295,6 +336,11 @@ def main(args: argparse.Namespace):
         format=FORMAT,
         datefmt=DATEFMT
     )
+    if args.self_test:
+        _run_self_test()
+        return
+    if not args.input_folder:
+        raise ValueError("--input_folder is required unless --self-test is specified")
     ## Get a list of all wheels in the input folder
     wheels = glob.glob(os.path.join(args.input_folder, "*.whl"))
 
@@ -315,7 +361,8 @@ def main(args: argparse.Namespace):
             abi_tag=abi_tag, 
             platform_tag=platform_tag
         ))
-    
+    wheel_infos.sort(key=lambda info: _python_tag_sort_key(info.python_tag))
+
     if sys.platform == "linux":
         combine_wheels_linux(args, wheel_infos)
     elif sys.platform == "win32":
@@ -329,9 +376,10 @@ def main(args: argparse.Namespace):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument("--input_folder", type=str, required=True, help="Path to the folder containing already repaired wheels for individual python versions that are to be combined into a single wheel")
+    parser.add_argument("--input_folder", type=str, help="Path to the folder containing already repaired wheels for individual python versions that are to be combined into a single wheel")
     parser.add_argument("--output_folder", type=str, default=".", help="Path to the folder where the combined wheel will be saved")
     parser.add_argument("--strip_unneeded", action="store_true", help="Strip the libraries to reduce size")
     parser.add_argument("--log_level", type=str, default="INFO", help="Log level")
+    parser.add_argument("--self-test", action="store_true", help="Run internal tests and exit")
     args = parser.parse_args()
-    main(args)
+    main(args)

bindings/python/setup.py

@@ -63,9 +63,31 @@
 long_description = open("README.md", "r", encoding="utf-8").read()
 
 ## Early settings
-MACOS_ARM64_WHEEL_NAME_OVERRIDE = 'macosx-11.0-arm64'
-if sys.platform == 'darwin' and platform.machine() == 'arm64':
-    os.environ['_PYTHON_HOST_PLATFORM'] = MACOS_ARM64_WHEEL_NAME_OVERRIDE
+MACOSX_DEPLOYMENT_TARGETS = {
+    "arm64": "11.0",
+    "x86_64": "11.0",
+}
+MACOS_SETTINGS = {}
+
+def _configure_macos_build_settings():
+    arch = platform.machine().lower()
+    arch = "arm64" if arch == "arm64" else "x86_64"
+    default_target = MACOSX_DEPLOYMENT_TARGETS[arch]
+    deployment_target = os.environ.get("MACOSX_DEPLOYMENT_TARGET", default_target)
+    os.environ["MACOSX_DEPLOYMENT_TARGET"] = deployment_target
+
+    wheel_tag = f"macosx-{deployment_target}-{arch}"
+    os.environ["_PYTHON_HOST_PLATFORM"] = wheel_tag
+    os.environ.setdefault("ARCHFLAGS", f"-arch {arch}")
+    os.environ.setdefault("CMAKE_OSX_ARCHITECTURES", arch)
+    return {
+        "arch": arch,
+        "deployment_target": deployment_target,
+        "wheel_tag": wheel_tag,
+    }
+
+if sys.platform == "darwin":
+    MACOS_SETTINGS = _configure_macos_build_settings()
 
 class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
@@ -206,12 +228,19 @@ def build_extension(self, ext):
         else:
             # if macos add some additional env vars
             if sys.platform == 'darwin':
-                from distutils import util
-                if platform.machine() == 'arm64':
-                    # Build ARM64 wheels explicitly instead of universal2
-                    env['_PYTHON_HOST_PLATFORM'] = MACOS_ARM64_WHEEL_NAME_OVERRIDE
-                else:
-                    env['_PYTHON_HOST_PLATFORM'] = re.sub(r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1', util.get_platform())
+                mac_arch = MACOS_SETTINGS.get('arch', platform.machine())
+                deployment_target = MACOS_SETTINGS.get('deployment_target')
+                wheel_tag = MACOS_SETTINGS.get('wheel_tag')
+                if wheel_tag:
+                    env['_PYTHON_HOST_PLATFORM'] = wheel_tag
+                if deployment_target:
+                    env['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+                env.setdefault('ARCHFLAGS', os.environ.get('ARCHFLAGS', f'-arch {mac_arch}'))
+                cmake_arch = os.environ.get('CMAKE_OSX_ARCHITECTURES', mac_arch)
+                if not any(arg.startswith('-DCMAKE_OSX_ARCHITECTURES=') for arg in cmake_args):
+                    cmake_args += [f'-DCMAKE_OSX_ARCHITECTURES={cmake_arch}']
+                if deployment_target and not any(arg.startswith('-DCMAKE_OSX_DEPLOYMENT_TARGET=') for arg in cmake_args):
+                    cmake_args += [f'-DCMAKE_OSX_DEPLOYMENT_TARGET={deployment_target}']
 
             # Specify how many threads to use when building, depending on available memory
             max_threads = os.cpu_count()

tests/CMakeLists.txt

@@ -227,6 +227,12 @@ private_data(
     FILE "construction_vest.mp4"
     LOCATION construction_vest
 )
+private_data(
+    URL "https://artifacts.luxonis.com/artifactory//luxonis-depthai-data-local/misc/dynamic_calibration_test_data.tar"
+    SHA1 "520d97199757f6fa0497c4037dcca5a43c7be3de"
+    FILE "dynamic_calibration_test_data.tar"
+    LOCATION dynamic_calibration_test_data
+)
 
 private_data(
     URL "https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/misc/parser_testing/ground_truth_files/detection_parser/yolov6-nano_r2-coco-512x288_a26d1ee-detections.json"
@@ -431,6 +437,10 @@ dai_set_test_labels(openvino_blob_test ondevice rvc2_all ci)
 # Dynamic calibration tests
 dai_add_test(dynamic_calibration_test src/ondevice_tests/dynamic_calibration_test.cpp)
 dai_set_test_labels(dynamic_calibration_test ondevice rvc2_all ci)
+target_compile_definitions(dynamic_calibration_test PRIVATE RECORDING_PATH="${dynamic_calibration_test_data}")
+
+dai_add_test(dynamic_calibration_onhost_test src/onhost_tests/dynamic_calibration_test.cpp)
+dai_set_test_labels(dynamic_calibration_onhost_test onhost)
 
 # Neural network test
 dai_add_test(neural_network_test src/ondevice_tests/neural_network_test.cpp)
@@ -615,7 +625,7 @@ dai_set_test_labels(camera_test ondevice rvc2_all rvc4 ci)
 
 # VideoEncoder test
 dai_add_test(video_encoder_test src/ondevice_tests/video_encoder_test.cpp)
-dai_set_test_labels(video_encoder_test ondevice rvc2_all rvc4 rvc4rgb ci)
+dai_set_test_labels(video_encoder_test ondevice rvc2 usb rvc4 rvc4rgb ci)
 target_compile_definitions(video_encoder_test PRIVATE VIDEO_PATH="${construction_vest}")
 
 # XLinkIn test