modelconv 0.5.2__tar.gz → 0.5.4__tar.gz

{modelconv-0.5.2 → modelconv-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelconv
-Version: 0.5.2
+Version: 0.5.4
 Summary: Converter for neural models into various formats.
 Author-email: Luxonis <support@luxonis.com>
 Maintainer-email: Luxonis <support@luxonis.com>
@@ -17,9 +17,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Pillow
-Requires-Dist: luxonis-ml[data,gcs,nn_archive,s3]>=0.8.2
-Requires-Dist: cyclopts
-Requires-Dist: onnx<1.19.0,>=1.17.0
+Requires-Dist: luxonis-ml[data,gcs,nn_archive,s3]>=0.8.4
+Requires-Dist: cyclopts==4.8.0
+Requires-Dist: onnx==1.21.0
 Requires-Dist: onnxruntime
 Requires-Dist: onnxsim
 Requires-Dist: docker
@@ -33,6 +33,7 @@ Requires-Dist: depthai~=3.0; extra == "bench"
 Provides-Extra: analysis
 Requires-Dist: polars; extra == "analysis"
 Requires-Dist: plotly; extra == "analysis"
+Requires-Dist: depthai~=3.0; extra == "analysis"
 Provides-Extra: dev
 Requires-Dist: pre-commit==3.2.1; extra == "dev"
 Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
@@ -49,12 +50,14 @@ Requires-Dist: psutil; extra == "rvc4"
 Requires-Dist: numpy<2; extra == "rvc4"
 Requires-Dist: polars; extra == "rvc4"
 Requires-Dist: pytest; extra == "rvc4"
+Requires-Dist: onnx==1.18.0; extra == "rvc4"
 Provides-Extra: hailo
 Requires-Dist: nvidia-dali-cuda120==1.49.0; extra == "hailo"
 Requires-Dist: nvidia-dali-tf-plugin-cuda120==1.49.0; extra == "hailo"
 Requires-Dist: protobuf==3.20.3; extra == "hailo"
 Requires-Dist: matplotlib==3.10.6; extra == "hailo"
 Requires-Dist: pyparsing==2.4.7; extra == "hailo"
+Requires-Dist: onnx==1.17.0; extra == "hailo"
 Dynamic: license-file
 
 # ModelConverter - Compilation Library

{modelconv-0.5.2 → modelconv-0.5.4}/modelconv.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelconv
-Version: 0.5.2
+Version: 0.5.4
 Summary: Converter for neural models into various formats.
 Author-email: Luxonis <support@luxonis.com>
 Maintainer-email: Luxonis <support@luxonis.com>
@@ -17,9 +17,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Pillow
-Requires-Dist: luxonis-ml[data,gcs,nn_archive,s3]>=0.8.2
-Requires-Dist: cyclopts
-Requires-Dist: onnx<1.19.0,>=1.17.0
+Requires-Dist: luxonis-ml[data,gcs,nn_archive,s3]>=0.8.4
+Requires-Dist: cyclopts==4.8.0
+Requires-Dist: onnx==1.21.0
 Requires-Dist: onnxruntime
 Requires-Dist: onnxsim
 Requires-Dist: docker
@@ -33,6 +33,7 @@ Requires-Dist: depthai~=3.0; extra == "bench"
 Provides-Extra: analysis
 Requires-Dist: polars; extra == "analysis"
 Requires-Dist: plotly; extra == "analysis"
+Requires-Dist: depthai~=3.0; extra == "analysis"
 Provides-Extra: dev
 Requires-Dist: pre-commit==3.2.1; extra == "dev"
 Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
@@ -49,12 +50,14 @@ Requires-Dist: psutil; extra == "rvc4"
 Requires-Dist: numpy<2; extra == "rvc4"
 Requires-Dist: polars; extra == "rvc4"
 Requires-Dist: pytest; extra == "rvc4"
+Requires-Dist: onnx==1.18.0; extra == "rvc4"
 Provides-Extra: hailo
 Requires-Dist: nvidia-dali-cuda120==1.49.0; extra == "hailo"
 Requires-Dist: nvidia-dali-tf-plugin-cuda120==1.49.0; extra == "hailo"
 Requires-Dist: protobuf==3.20.3; extra == "hailo"
 Requires-Dist: matplotlib==3.10.6; extra == "hailo"
 Requires-Dist: pyparsing==2.4.7; extra == "hailo"
+Requires-Dist: onnx==1.17.0; extra == "hailo"
 Dynamic: license-file
 
 # ModelConverter - Compilation Library

{modelconv-0.5.2 → modelconv-0.5.4}/modelconv.egg-info/SOURCES.txt

@@ -45,11 +45,11 @@ modelconverter/packages/rvc4/inferer.py
 modelconverter/packages/rvc4/requirements.txt
 modelconverter/packages/rvc4/visualize.py
 modelconverter/utils/__init__.py
-modelconverter/utils/adb_handler.py
-modelconverter/utils/adb_monitor.py
 modelconverter/utils/calibration_data.py
 modelconverter/utils/config.py
 modelconverter/utils/constants.py
+modelconverter/utils/device_handlers.py
+modelconverter/utils/device_monitors.py
 modelconverter/utils/docker_utils.py
 modelconverter/utils/environ.py
 modelconverter/utils/exceptions.py
@@ -61,12 +61,16 @@ modelconverter/utils/image.py
 modelconverter/utils/layout.py
 modelconverter/utils/metadata.py
 modelconverter/utils/nn_archive.py
+modelconverter/utils/onnx_compatibility.py
 modelconverter/utils/onnx_tools.py
 modelconverter/utils/progress_handler.py
 modelconverter/utils/subprocess.py
 modelconverter/utils/types.py
 tests/__init__.py
 tests/conftest.py
+tests/test_benchmark/__init__.py
+tests/test_benchmark/conftest.py
+tests/test_benchmark/test_benchmark_regression.py
 tests/test_packages/__init__.py
 tests/test_packages/common.py
 tests/test_packages/onnx_inferer.py
@@ -86,4 +90,5 @@ tests/test_utils/test_config.py
 tests/test_utils/test_filesystem.py
 tests/test_utils/test_image.py
 tests/test_utils/test_layout.py
-tests/test_utils/test_modifier.py
+tests/test_utils/test_modifier.py
+tests/test_utils/test_onnx_compatibility.py

{modelconv-0.5.2 → modelconv-0.5.4}/modelconv.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Pillow
-luxonis-ml[data,gcs,nn_archive,s3]>=0.8.2
-cyclopts
-onnx<1.19.0,>=1.17.0
+luxonis-ml[data,gcs,nn_archive,s3]>=0.8.4
+cyclopts==4.8.0
+onnx==1.21.0
 onnxruntime
 onnxsim
 docker
@@ -14,6 +14,7 @@ psutil
 [analysis]
 polars
 plotly
+depthai~=3.0
 
 [bench]
 depthai~=3.0
@@ -29,6 +30,7 @@ nvidia-dali-tf-plugin-cuda120==1.49.0
 protobuf==3.20.3
 matplotlib==3.10.6
 pyparsing==2.4.7
+onnx==1.17.0
 
 [rvc2]
 tflite2onnx
@@ -44,3 +46,4 @@ psutil
 numpy<2
 polars
 pytest
+onnx==1.18.0

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/__init__.py

@@ -4,7 +4,7 @@ from typing import Final
 from luxonis_ml.utils import PUT_FILE_REGISTRY
 from pydantic_extra_types.semantic_version import SemanticVersion
 
-__version__: Final[str] = "0.5.2"
+__version__: Final[str] = "0.5.4"
 __semver__: Final[SemanticVersion] = SemanticVersion.parse(__version__)
 
 

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/__main__.py

@@ -33,6 +33,8 @@ from modelconverter.utils import (
     archive_from_model,
     docker_build,
     docker_exec,
+    get_default_target_version,
+    get_local_docker_image,
     in_docker,
     resolve_path,
     upload_to_remote,
@@ -127,7 +129,7 @@ def convert(
 
     with catch_exceptions():
         init_dirs()
-        cfg, archive_cfg, _main_stage = get_configs(path, opts)
+        cfg, archive_cfg, _main_stage = get_configs(target, path, opts)
         main_stage = main_stage or _main_stage
         is_multistage = len(cfg.stages) > 1
         if is_multistage and main_stage is None:
@@ -264,7 +266,7 @@ def infer(
     if path is not None:
         config = path
     with catch_exceptions():
-        mult_cfg, _, _ = get_configs(str(config), opts)
+        mult_cfg, _, _ = get_configs(target, str(config), opts)
         cfg = mult_cfg.get_stage_config(stage)
         setup_logging(
             file="modelconverter.log", use_rich=mult_cfg.rich_logging
@@ -630,9 +632,21 @@ def launcher(
     target = bound.arguments["target"]
 
     if dev:
-        docker_build(
-            target.value, bare_tag=tag, version=tool_version, image=image
-        )
+        version = tool_version or get_default_target_version(target.value)
+        # CI invokes multiple dev docker commands per job; reuse the first
+        # local build so later commands don't rebuild the same image again.
+        if not (
+            os.getenv("CI") == "true"
+            and get_local_docker_image(
+                target.value,
+                bare_tag=tag,
+                version=version,
+                image=image,
+            )
+        ):
+            docker_build(
+                target.value, bare_tag=tag, version=version, image=image
+            )
 
     docker_exec(
         target.value,

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/cli/utils.py

@@ -72,7 +72,9 @@ def init_dirs() -> None:
 
 
 def get_configs(
-    path: str | None, opts: list[str] | dict[str, Any] | None = None
+    target: Target,
+    path: str | None,
+    opts: list[str] | dict[str, Any] | None = None,
 ) -> tuple[Config, NNArchiveConfig | None, str | None]:
     """Sets up the configuration.
 
@@ -99,7 +101,7 @@ def get_configs(
     if path is not None:
         path_ = resolve_path(path, MISC_DIR)
         if path_.is_dir() or is_nn_archive(path_):
-            return process_nn_archive(path_, overrides)
+            return process_nn_archive(target, path_, overrides)
     cfg = Config.get_config(path, overrides)
 
     main_stage_key = None

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/packages/base_exporter.py

@@ -5,8 +5,8 @@ from importlib.metadata import version
 from pathlib import Path
 from typing import Any
 
+import cv2
 import numpy as np
-import onnx
 from loguru import logger
 
 from modelconverter.utils import (
@@ -20,6 +20,7 @@ from modelconverter.utils.config import (
     RandomCalibrationConfig,
     SingleStageConfig,
 )
+from modelconverter.utils.onnx_compatibility import save_onnx_model
 from modelconverter.utils.subprocess import SubprocessResult
 from modelconverter.utils.types import InputFileType, Target
 
@@ -129,7 +130,13 @@ class Exporter(ABC):
             )
             return self.input_model
 
-        onnx_sim, check = simplify(str(self.input_model))
+        try:
+            onnx_sim, check = simplify(str(self.input_model))
+        except Exception as e:
+            logger.warning(
+                f"Failed to simplify ONNX: {e}. Proceeding without simplification."
+            )
+            return self.input_model
         if not check:
             logger.warning(
                 "Provided ONNX could not be simplified. "
@@ -141,15 +148,14 @@ class Exporter(ABC):
             self.input_model, "simplified.onnx"
         )
         logger.info(f"Saving simplified ONNX to {onnx_sim_path}")
-        if self.input_model.with_suffix(".onnx_data").exists():
-            onnx.save(
-                onnx_sim,
-                str(onnx_sim_path),
-                save_as_external_data=True,
-                location=f"{onnx_sim_path.name}_data",
-            )
-        else:
-            onnx.save(onnx_sim, str(onnx_sim_path))
+        save_onnx_model(
+            onnx_sim,
+            onnx_sim_path,
+            save_as_external_data=self.input_model.with_suffix(
+                ".onnx_data"
+            ).exists(),
+            location=f"{onnx_sim_path.name}_data",
+        )
         return onnx_sim_path
 
     @abstractmethod
@@ -220,7 +226,24 @@ class Exporter(ABC):
                 arr = np.clip(arr, calib.min_value, calib.max_value)
 
                 arr = arr.astype(calib.data_type.as_numpy_dtype())
-                np.save(dest / f"{i}.npy", arr)
+                if len(arr.shape) in {2, 3} or (
+                    len(arr.shape) in {3, 4} and arr.shape[0] == 1
+                ):
+                    layout = inp.layout
+                    if arr.shape[0] == 1 and len(arr.shape) > 2:
+                        arr = arr.squeeze(0)
+                        if layout is not None:
+                            layout = layout[1:]
+
+                    if layout is not None and "C" in layout:
+                        channel_dim = layout.index("C")
+                        if channel_dim == 0 and len(arr.shape) == 3:
+                            arr = arr.transpose(1, 2, 0)
+                    elif arr.shape[0] in {1, 3}:  # type: ignore
+                        arr = arr.transpose(1, 2, 0)
+                    cv2.imwrite(str(dest / f"{i}.png"), arr)
+                else:
+                    np.save(dest / f"{i}.npy", arr)
 
             self.inputs[name].calibration = ImageCalibrationConfig(path=dest)
 

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/packages/hailo/requirements.txt

@@ -3,3 +3,4 @@ nvidia-dali-tf-plugin-cuda120==1.49.0
 protobuf==3.20.3
 matplotlib==3.10.6
 pyparsing==2.4.7
+onnx==1.17.0 # Hailo SDK still imports onnx.mapping and still pins protobuf==3.20.3.

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/packages/rvc3/exporter.py

@@ -31,6 +31,7 @@ class RVC3Exporter(RVC2Exporter):
         self.mo_args = config.rvc3.mo_args
         self.compile_tool_args = config.rvc3.compile_tool_args
         self.device = "VPUX.3400"
+        self.reverse_input_channels = False
         self._device_specific_buildinfo = {}
 
     def export(self) -> Path:
@@ -106,7 +107,10 @@ class RVC3Exporter(RVC2Exporter):
                 data_type=DataType.UINT8,
                 transpose=False,
             )
-            cv2.imwrite(str(calibration_img_dir / file.name), img)
+            suffix = ".png" if file.suffix == ".npy" else file.suffix
+            cv2.imwrite(
+                str((calibration_img_dir / file.stem).with_suffix(suffix)), img
+            )
 
         config = {
             "model": {

{modelconv-0.5.2 → modelconv-0.5.4}/modelconverter/packages/rvc4/analyze.py

@@ -14,7 +14,7 @@ from PIL import Image
 
 from modelconverter.packages.base_analyze import Analyzer
 from modelconverter.packages.rvc4.benchmark import get_device_info
-from modelconverter.utils import AdbHandler, constants, subprocess_run
+from modelconverter.utils import constants, create_handler, subprocess_run
 
 
 class RVC4Analyzer(Analyzer):
@@ -27,7 +27,7 @@ class RVC4Analyzer(Analyzer):
     ):
         super().__init__(dlc_model_path, image_dirs)
         _, device_adb_id = get_device_info(device_ip, device_id)
-        self.adb = AdbHandler(device_adb_id)
+        self.handler = create_handler(device_ip, device_adb_id)
 
     def analyze_layer_outputs(self, onnx_model_path: Path) -> None:
         input_matcher = self._prepare_input_matcher()
@@ -76,8 +76,8 @@ class RVC4Analyzer(Analyzer):
         self, input_matcher: dict[str, dict[str, str]], type: type = np.uint8
     ) -> dict[str, str]:
         logger.info("Preparing raw inputs for RVC4 analysis.")
-        self.adb.shell(f"rm -rf /data/modelconverter/{self.model_name}")
-        self.adb.shell(
+        self.handler.shell(f"rm -rf /data/modelconverter/{self.model_name}")
+        self.handler.shell(
             f"mkdir -p /data/modelconverter/{self.model_name}/inputs"
         )
 
@@ -109,7 +109,7 @@ class RVC4Analyzer(Analyzer):
 
                 with tempfile.NamedTemporaryFile() as f:
                     raw_image.tofile(f)
-                    self.adb.push(
+                    self.handler.push(
                         f.name,
                         f"/data/modelconverter/{self.model_name}/inputs/{input_name}_{img_name}.raw",
                     )
@@ -122,7 +122,7 @@ class RVC4Analyzer(Analyzer):
         with tempfile.NamedTemporaryFile() as f:
             f.write(input_list.encode())
             f.flush()
-            self.adb.push(
+            self.handler.push(
                 f.name,
                 f"/data/modelconverter/{self.model_name}/input_list.txt",
             )
@@ -133,8 +133,12 @@ class RVC4Analyzer(Analyzer):
         return dlc_matcher
 
     def _add_outputs_to_all_layers(self, onnx_file_path: str) -> Path:
-        if Path(onnx_file_path.replace(".onnx", "-all-layers.onnx")).exists():
-            Path(onnx_file_path.replace(".onnx", "-all-layers.onnx")).unlink()
+        onnx_path = Path(onnx_file_path)
+        all_output_path = onnx_path.with_name(
+            f"{onnx_path.stem}-all-layers{onnx_path.suffix}"
+        )
+        if all_output_path.exists():
+            all_output_path.unlink()
 
         model = onnx.load(onnx_file_path)
         onnx.checker.check_model(model)
@@ -152,10 +156,10 @@ class RVC4Analyzer(Analyzer):
 
         for output in orig_graph_output:
             graph.output.append(output)
-        all_output_name = onnx_file_path.replace(".onnx", "-all-layers.onnx")
-        onnx.save(model, all_output_name)
+        all_output_path.parent.mkdir(parents=True, exist_ok=True)
+        onnx.save(model, all_output_path)
 
-        return Path(all_output_name)
+        return all_output_path
 
     def transpose_to_match(
         self, src: np.ndarray, target_shape: tuple[int, ...]
@@ -321,14 +325,14 @@ class RVC4Analyzer(Analyzer):
     def _run_dlc(self, command: str) -> str:
         logger.info("Inferencing DLC model on device.")
         try:
-            self.adb.push(
+            self.handler.push(
                 str(self.dlc_model_path),
                 f"/data/modelconverter/{self.model_name}/{self.model_name}.dlc",
             )
-            self.adb.shell(
+            self.handler.shell(
                 f"rm -rf /data/modelconverter/{self.model_name}/output"
             )
-            self.adb.shell(
+            self.handler.shell(
                 f"cd /data/modelconverter/{self.model_name} && {command}"
             )
 
@@ -337,7 +341,7 @@ class RVC4Analyzer(Analyzer):
                 shutil.rmtree(target_dir / "output")
 
             target_dir.mkdir(parents=True, exist_ok=True)
-            self.adb.pull(
+            self.handler.pull(
                 f"/data/modelconverter/{self.model_name}/output",
                 f"{target_dir}/output",
             )
@@ -397,7 +401,7 @@ class RVC4Analyzer(Analyzer):
 
         logger.info("Running DLC model to analyze layer cycles.")
         output_dir = self._run_dlc(
-            f"snpe-net-run --container {self.model_name}.dlc --input_list input_list.txt --use_dsp --use_native_input_files --use_native_output_files --perf_profile balanced --userbuffer_tf8"
+            f"snpe-net-run --container {self.model_name}.dlc --input_list input_list.txt --use_dsp --use_native_input_files --use_native_output_files --perf_profile balanced --userbuffer_auto"
         )
 
         csv_path = Path(output_dir + "/layer_stats.csv")
@@ -456,7 +460,7 @@ class RVC4Analyzer(Analyzer):
 
     # cleanup
     def _cleanup_dlc_outputs(self) -> None:
-        self.adb.shell(f"rm -rf /data/modelconverter/{self.model_name}")
+        self.handler.shell(f"rm -rf /data/modelconverter/{self.model_name}")
 
         output_dir = Path(
             f"{constants.OUTPUTS_DIR!s}/analysis/{self.model_name}/output"