modelconv 0.5.2__tar.gz → 0.5.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelconv
-Version: 0.5.2
+Version: 0.5.3
 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
@@ -49,12 +49,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.3}/modelconv.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelconv
-Version: 0.5.2
+Version: 0.5.3
 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
@@ -49,12 +49,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.3}/modelconv.egg-info/SOURCES.txt

@@ -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.3}/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
@@ -29,6 +29,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 +45,4 @@ psutil
 numpy<2
 polars
 pytest
+onnx==1.18.0

{modelconv-0.5.2 → modelconv-0.5.3}/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.3"
 __semver__: Final[SemanticVersion] = SemanticVersion.parse(__version__)
 
 

{modelconv-0.5.2 → modelconv-0.5.3}/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.3}/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.3}/modelconverter/packages/base_exporter.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from typing import Any
 
 import numpy as np
-import onnx
 from loguru import logger
 
 from modelconverter.utils import (
@@ -20,6 +19,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 +129,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 +147,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

{modelconv-0.5.2 → modelconv-0.5.3}/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.3}/modelconverter/packages/rvc3/exporter.py

@@ -106,7 +106,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.3}/modelconverter/packages/rvc4/exporter.py

@@ -40,6 +40,7 @@ class RVC4Exporter(Exporter):
         super().__init__(config=config, output_dir=output_dir)
 
         rvc4_cfg = config.rvc4
+        self.encodings = rvc4_cfg.encodings
         self.snpe_onnx_to_dlc = rvc4_cfg.snpe_onnx_to_dlc_args
         self.snpe_dlc_quant = rvc4_cfg.snpe_dlc_quant_args
         self.snpe_dlc_graph_prepare = rvc4_cfg.snpe_dlc_graph_prepare_args
@@ -186,6 +187,7 @@ class RVC4Exporter(Exporter):
             args.append("--override_params")
         elif self.quantization_mode == QuantizationMode.INT8_16_MIX:
             self._add_args(args, ["--act_bitwidth", "16"])
+        elif self.encodings is not None:
             args.append("--override_params")
 
         start_time = time.time()
@@ -273,20 +275,28 @@ class RVC4Exporter(Exporter):
         return self.input_list_path
 
     def generate_io_encodings(self) -> Path:
-        encodings_dict = {"activation_encodings": {}, "param_encodings": {}}
-        if not (list(self.inputs.keys()) and list(self.outputs.keys())):
-            logger.warning(
-                "Cannot generate I/O encodings as inputs or outputs are not defined. The resulting DLC may not be compatible with DAI."
+        if self.encodings is not None:
+            encodings_dict = self.encodings.model_dump(
+                mode="json", exclude_none=True
             )
-        for name in (
-            list(self.inputs.keys())
-            + list(self.outputs.keys())
-            + self.extra_quant_tensors
-        ):
-            encodings_dict["activation_encodings"][name] = [
-                {"bitwidth": 8, "dtype": "int"}
-            ]
-        encodings_path = self.intermediate_outputs_dir / "io_encodings.json"
+        else:
+            encodings_dict = {
+                "activation_encodings": {},
+                "param_encodings": {},
+            }
+            if not (list(self.inputs.keys()) and list(self.outputs.keys())):
+                logger.warning(
+                    "Cannot generate I/O encodings as inputs or outputs are not defined. The resulting DLC may not be compatible with DAI."
+                )
+            for name in (
+                list(self.inputs.keys())
+                + list(self.outputs.keys())
+                + self.extra_quant_tensors
+            ):
+                encodings_dict["activation_encodings"][name] = [
+                    {"bitwidth": 8, "dtype": "int"}
+                ]
+        encodings_path = self.intermediate_outputs_dir / "encodings.json"
         with open(encodings_path, "w") as encodings_file:
             json.dump(encodings_dict, encodings_file, indent=4)
         return encodings_path
@@ -345,10 +355,14 @@ class RVC4Exporter(Exporter):
 
         if self.quantization_mode == QuantizationMode.FP16_STD:
             self._add_args(args, ["--float_bitwidth", "16"])
-        elif self.quantization_mode in [
-            QuantizationMode.INT8_16_MIX,
-            QuantizationMode.INT8_16_MIX_ACC,
-        ]:
+        elif (
+            self.quantization_mode
+            in [
+                QuantizationMode.INT8_16_MIX,
+                QuantizationMode.INT8_16_MIX_ACC,
+            ]
+            or self.encodings is not None
+        ):
             io_encodings_file = self.generate_io_encodings()
             self._add_args(
                 args,

{modelconv-0.5.2 → modelconv-0.5.3}/modelconverter/packages/rvc4/requirements.txt

@@ -3,3 +3,4 @@ psutil
 numpy<2
 polars
 pytest # this is actually required by snpe packages
+onnx==1.18.0 # SNPE's ONNX importer fails with onnx==1.21.0 in CI.

{modelconv-0.5.2 → modelconv-0.5.3}/modelconverter/utils/__init__.py

@@ -7,7 +7,9 @@ from .docker_utils import (
     docker_exec,
     get_container_memory_available,
     get_container_memory_limit,
+    get_default_target_version,
     get_docker_image,
+    get_local_docker_image,
     in_docker,
 )
 from .environ import environ
@@ -64,8 +66,10 @@ __all__ = [
     "get_archive_input",
     "get_container_memory_available",
     "get_container_memory_limit",
+    "get_default_target_version",
     "get_docker_image",
     "get_extra_quant_tensors",
+    "get_local_docker_image",
     "get_metadata",
     "get_protocol",
     "guess_new_layout",

{modelconv-0.5.2 → modelconv-0.5.3}/modelconverter/utils/calibration_data.py

@@ -27,15 +27,38 @@ def read_img_dir(path: Path, max_images: int) -> list[Path]:
     return imgs
 
 
+def _find_content_root(path: Path) -> Path:
+    ignored_entries = {"__MACOSX", "Thumbs.db", "desktop.ini"}
+
+    current = path
+    while True:
+        contents = [
+            p
+            for p in current.iterdir()
+            if p.name not in ignored_entries and not p.name.startswith(".")
+        ]
+        subdirs = [p for p in contents if p.is_dir()]
+        files = [p for p in contents if p.is_file()]
+
+        if files:
+            return current
+        if len(subdirs) == 1:
+            current = subdirs[0]
+        else:
+            # Multiple subdirectories and no files. Return current and let read_img_dir raise an error
+            return current
+
+
 def _get_from_remote(string: str, dest: Path, max_images: int = -1) -> Path:
     path = download_from_remote(string, dest, max_images)
     if path.suffix == ".zip":
         extracted_path = path.with_suffix("")
         if extracted_path.exists():
             shutil.rmtree(extracted_path)
+        extracted_path.mkdir(parents=True, exist_ok=True)
         with zipfile.ZipFile(path, "r") as zip_ref:
-            zip_ref.extractall(path.parent)
-        return extracted_path
+            zip_ref.extractall(extracted_path)
+        return _find_content_root(extracted_path)
     return path
 
 

{modelconv-0.5.2 → modelconv-0.5.3}/modelconverter/utils/config.py

@@ -1,27 +1,28 @@
+import json
 from itertools import chain
 from pathlib import Path
 from typing import Annotated, Any, Literal, cast
 
 import onnx
 from loguru import logger
-from luxonis_ml.typing import PathType
+from luxonis_ml.typing import BaseModelExtraForbid, PathType
 from luxonis_ml.utils import LuxonisConfig
 from onnx import TypeProto
 from pydantic import (
-    BaseModel,
-    ConfigDict,
     Field,
     PositiveInt,
+    field_serializer,
     field_validator,
     model_validator,
 )
 from typing_extensions import Self
 
 from modelconverter.utils.calibration_data import download_calibration_data
-from modelconverter.utils.constants import MODELS_DIR
+from modelconverter.utils.constants import MISC_DIR, MODELS_DIR
 from modelconverter.utils.filesystem_utils import resolve_path
 from modelconverter.utils.layout import make_default_layout
 from modelconverter.utils.metadata import Metadata, get_metadata
+from modelconverter.utils.onnx_compatibility import save_onnx_model
 from modelconverter.utils.types import (
     DataType,
     Encoding,
@@ -40,11 +41,7 @@ NAMED_VALUES = {
 }
 
 
-class CustomBaseModel(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-
-class LinkCalibrationConfig(CustomBaseModel):
+class LinkCalibrationConfig(BaseModelExtraForbid):
     stage: str
     output: str | None = None
     script: str | None = None
@@ -68,7 +65,7 @@ class LinkCalibrationConfig(CustomBaseModel):
         return script
 
 
-class ImageCalibrationConfig(CustomBaseModel):
+class ImageCalibrationConfig(BaseModelExtraForbid):
     path: Path
     max_images: int = -1
     resize_method: ResizeMethod = ResizeMethod.RESIZE
@@ -81,7 +78,7 @@ class ImageCalibrationConfig(CustomBaseModel):
         return download_calibration_data(str(value))
 
 
-class RandomCalibrationConfig(CustomBaseModel):
+class RandomCalibrationConfig(BaseModelExtraForbid):
     max_images: int = 20
     min_value: float = 0.0
     max_value: float = 255.0
@@ -90,7 +87,7 @@ class RandomCalibrationConfig(CustomBaseModel):
     data_type: DataType = DataType.FLOAT32
 
 
-class OutputConfig(CustomBaseModel):
+class OutputConfig(BaseModelExtraForbid):
     name: str
     shape: list[int] | None = None
     layout: str | None = None
@@ -123,7 +120,7 @@ class OutputConfig(CustomBaseModel):
         return self
 
 
-class EncodingConfig(CustomBaseModel):
+class EncodingConfig(BaseModelExtraForbid):
     from_: Annotated[
         Encoding, Field(alias="from", serialization_alias="from")
     ] = Encoding.RGB
@@ -225,7 +222,7 @@ class InputConfig(OutputConfig):
         return value
 
 
-class TargetConfig(CustomBaseModel):
+class TargetConfig(BaseModelExtraForbid):
     disable_calibration: bool = False
 
 
@@ -265,6 +262,28 @@ class RVC3Config(BlobBaseConfig):
     pot_target_device: PotDevice = PotDevice.VPU
 
 
+class QuantizationOverridesItem(BaseModelExtraForbid):
+    bitwidth: Annotated[int, Literal[4, 8, 16, 32]] | None = None
+    is_symmetric: bool | None = None
+    dtype: Literal["int", "float"] | None = None
+    max: float | None = None
+    min: float | None = None
+    offset: int | None = None
+    scale: float | None = None
+
+    @field_serializer("is_symmetric", when_used="json")
+    @staticmethod
+    def serialize_is_symmetric(value: bool | None) -> str | None:
+        if value is None:
+            return None
+        return str(value)
+
+
+class Encodings(BaseModelExtraForbid):
+    activation_encodings: dict[str, list[QuantizationOverridesItem]]
+    param_encodings: dict[str, list[QuantizationOverridesItem]]
+
+
 class RVC4Config(TargetConfig):
     snpe_onnx_to_dlc_args: list[str] = []
     snpe_dlc_quant_args: list[str] = []
@@ -277,6 +296,37 @@ class RVC4Config(TargetConfig):
     htp_socs: list[
         Literal["sm8350", "sm8450", "sm8550", "sm8650", "qcs6490", "qcs8550"]
     ] = ["sm8550"]
+    encodings: Encodings | None = None
+
+    @model_validator(mode="after")
+    def validate_quantization_overrides(self) -> Self:
+        if "--quantization_overrides" in self.snpe_onnx_to_dlc_args:
+            if self.encodings:
+                raise ValueError(
+                    "Cannot specify both `--quantization_overrides`"
+                    "in `rvc4.snpe_onnx_to_dlc_args` and "
+                    "`rvc4.encodings` at the same time."
+                )
+            qo_index = self.snpe_onnx_to_dlc_args.index(
+                "--quantization_overrides"
+            )
+            self.snpe_onnx_to_dlc_args.pop(qo_index)
+            encodings_json = self.snpe_onnx_to_dlc_args.pop(qo_index)
+            with open(encodings_json) as f:
+                self.encodings = Encodings.model_validate_json(json.load(f))
+        return self
+
+    @field_validator("encodings", mode="before")
+    @staticmethod
+    def validate_encodings(value: Any) -> Encodings | None:
+        if value is None:
+            return None
+
+        if isinstance(value, str):
+            value_path = resolve_path(value, MISC_DIR)
+            return Encodings(**json.loads(value_path.read_text()))
+
+        return Encodings(**value)
 
     @model_validator(mode="after")
     def _validate_fp16(self) -> Self:
@@ -286,7 +336,7 @@ class RVC4Config(TargetConfig):
         return self
 
 
-class SingleStageConfig(CustomBaseModel):
+class SingleStageConfig(BaseModelExtraForbid):
     input_model: Path
     input_bin: Path | None = None
     input_file_type: InputFileType
@@ -592,14 +642,9 @@ def _get_onnx_node_info(
             f"Output value info for node '{node_name}' not found."
         )
 
-    shape = [
-        dim.dim_value for dim in output_value_info.type.tensor_type.shape.dim
-    ]
-    if any(dim == 0 for dim in shape):
-        raise ValueError(
-            "Dynamic shapes are not supported. "
-            f"Shape of node '{node_name}' is {shape}."
-        )
+    shape = _get_static_onnx_shape(
+        output_value_info.type.tensor_type, f"node '{node_name}'"
+    )
     data_type = output_value_info.type.tensor_type.elem_type
 
     return shape, DataType.from_onnx_dtype(data_type)
@@ -613,12 +658,7 @@ def _get_onnx_tensor_info(
     def extract_tensor_info(
         tensor_type: TypeProto.Tensor,
     ) -> tuple[list[int], DataType]:
-        shape = [dim.dim_value for dim in tensor_type.shape.dim]
-        if any(dim == 0 for dim in shape):
-            raise ValueError(
-                "Dynamic shapes are not supported. "
-                f"Shape of tensor '{tensor_name}' is {shape}."
-            )
+        shape = _get_static_onnx_shape(tensor_type, f"tensor '{tensor_name}'")
         return shape, DataType.from_onnx_dtype(tensor_type.elem_type)
 
     for tensor in chain(model.graph.input, model.graph.output):
@@ -638,6 +678,21 @@ def _get_onnx_tensor_info(
     raise NameError(f"Tensor '{tensor_name}' not found in the ONNX model.")
 
 
+def _get_static_onnx_shape(
+    tensor_type: TypeProto.Tensor, tensor_name: str
+) -> list[int]:
+    shape = []
+    for dim in tensor_type.shape.dim:
+        if dim.HasField("dim_value") and dim.dim_value > 0:
+            shape.append(dim.dim_value)
+        else:
+            raise ValueError(
+                "Dynamic shapes are not supported. "
+                f"Shape of {tensor_name} is {[d.dim_value for d in tensor_type.shape.dim]}."
+            )
+    return shape
+
+
 def _get_onnx_inter_info(
     model_path: Path, name: str
 ) -> tuple[list[int] | None, DataType | None]:
@@ -690,12 +745,9 @@ def generate_renamed_onnx(
             if output_name in rename_dict:
                 node.output[i] = rename_dict[output_name]
 
-    if model_data_path:
-        onnx.save(
-            model,
-            str(output_path),
-            save_as_external_data=True,
-            location=f"{output_path.name}_data",
-        )
-    else:
-        onnx.save(model, str(output_path))
+    save_onnx_model(
+        model,
+        output_path,
+        save_as_external_data=model_data_path is not None,
+        location=f"{output_path.name}_data",
+    )