Skip to content
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.

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

fix(ml): openvino not working with dynamic axes #6871

Merged
merged 10 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 47 additions & 1 deletion machine-learning/app/models/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
from shutil import rmtree
from typing import Any

import onnx
import onnxruntime as ort
from huggingface_hub import snapshot_download
from onnx.shape_inference import infer_shapes
from onnx.tools.update_model_dims import update_inputs_outputs_dims
from typing_extensions import Buffer

import ann.ann
from app.models.constants import SUPPORTED_PROVIDERS
from app.models.constants import STATIC_INPUT_PROVIDERS, SUPPORTED_PROVIDERS

from ..config import get_cache_dir, get_hf_model_name, log, settings
from ..schemas import ModelRuntime, ModelType
Expand Down Expand Up @@ -114,6 +117,13 @@ def _make_session(self, model_path: Path) -> AnnSession | ort.InferenceSession:
)
model_path = onnx_path

if any(provider in STATIC_INPUT_PROVIDERS for provider in self.providers):
static_path = model_path.parent / "static_1" / "model.onnx"
static_path.parent.mkdir(parents=True, exist_ok=True)
if not static_path.is_file():
self._convert_to_static(model_path, static_path)
model_path = static_path

match model_path.suffix:
case ".armnn":
session = AnnSession(model_path)
Expand All @@ -128,6 +138,42 @@ def _make_session(self, model_path: Path) -> AnnSession | ort.InferenceSession:
raise ValueError(f"Unsupported model file type: {model_path.suffix}")
return session

def _convert_to_static(self, source_path: Path, target_path: Path) -> None:
inferred = infer_shapes(onnx.load(source_path))
inputs = self._get_static_dims(inferred.graph.input)
outputs = self._get_static_dims(inferred.graph.output)

# check_model gets called in update_inputs_outputs_dims and doesn't work for large models
check_model = onnx.checker.check_model
try:

def check_model_stub(*args: Any, **kwargs: Any) -> None:
pass

onnx.checker.check_model = check_model_stub
updated_model = update_inputs_outputs_dims(inferred, inputs, outputs)
finally:
onnx.checker.check_model = check_model

onnx.save(
updated_model,
target_path,
save_as_external_data=True,
all_tensors_to_one_file=False,
size_threshold=1048576,
)

def _get_static_dims(self, graph_io: Any, dim_size: int = 1) -> dict[str, list[int]]:
return {
field.name: [
d.dim_value if d.HasField("dim_value") else dim_size
for shape in field.type.ListFields()
if (dim := shape[1].shape.dim)
for d in dim
]
for field in graph_io
}

@property
def model_type(self) -> ModelType:
return self._model_type
Expand Down
9 changes: 4 additions & 5 deletions machine-learning/app/models/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@
}


SUPPORTED_PROVIDERS = [
"CUDAExecutionProvider",
"OpenVINOExecutionProvider",
"CPUExecutionProvider",
]
SUPPORTED_PROVIDERS = ["CUDAExecutionProvider", "OpenVINOExecutionProvider", "CPUExecutionProvider"]


STATIC_INPUT_PROVIDERS = ["OpenVINOExecutionProvider"]


def is_openclip(model_name: str) -> bool:
Expand Down