From f937be755a618a962da8aa3d994261b32262dc33 Mon Sep 17 00:00:00 2001 From: Vladisalv Sovrasov Date: Tue, 8 Apr 2025 19:07:44 +0900 Subject: [PATCH] Finally cleanup OMZ leftovers --- .github/workflows/publish.yaml | 2 -- .../model_api/adapters/openvino_adapter.py | 17 ++--------------- src/python/pyproject.toml | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 8baa2487..0edf4d04 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,7 +24,6 @@ jobs: python -m pip install --upgrade build - name: Build sdist run: | - sed -i '/omz_tools/d' src/python/pyproject.toml python -m build --sdist src/python/ - uses: actions/upload-artifact@v4 with: @@ -32,7 +31,6 @@ jobs: path: src/python/dist/*.tar.gz - name: Build wheel run: | - sed -i '/omz_tools/d' src/python/pyproject.toml python -m build --wheel src/python/ - uses: actions/upload-artifact@v4 with: diff --git a/src/python/model_api/adapters/openvino_adapter.py b/src/python/model_api/adapters/openvino_adapter.py index c20553aa..a36538bf 100644 --- a/src/python/model_api/adapters/openvino_adapter.py +++ b/src/python/model_api/adapters/openvino_adapter.py @@ -171,21 +171,8 @@ def __init__( ) self.model = core.read_model(self.model_path, weights_path) return - if isinstance(model, str): - from omz_tools.models import OMZModel, list_models - - if model in list_models(): - omz_model = OMZModel.download( - model, - precision=precision, - download_dir=download_dir, - cache_dir=cache_dir, - ) - self.model_path = omz_model.model_path - log.info(f"Reading model {self.model_path}") - self.model = core.read_model(self.model_path) - return - msg = "Model must be bytes, a file or existing OMZ model name" + + msg = "Model must be bytes or a file" raise RuntimeError(msg) def load_model(self) -> None: diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml index c9702a44..0430608b 100644 --- a/src/python/pyproject.toml +++ b/src/python/pyproject.toml @@ -28,7 +28,6 @@ dependencies = [ "opencv-python-headless", "scipy>=1.5.4", "openvino>=2025.0", - "omz_tools @ git+https://github.com/openvinotoolkit/open_model_zoo.git@master#egg=omz_tools&subdirectory=tools/model_tools", "pillow", ]