Merge remote-tracking branch 'origin/master' into vs/bindings_tests

Author: sovrasov

.github/workflows/test_accuracy.yml

@@ -34,22 +34,19 @@ jobs:
         run: |
           source venv/bin/activate
           pytest --data=./data tests/python/accuracy/test_accuracy.py
-        # DATA=data pytest --data=./data tests/python/accuracy/test_YOLOv8.py # checkpoints are not available sometimes
       - name: Install CPP dependencies
         run: |
           sudo bash src/cpp/install_dependencies.sh
       - name: Build CPP Test
         run: |
-          source venv/bin/activate
+          mkdir build && cd build
           pip install nanobind==2.4.0
           pip install typing_extensions==4.12.2
-          mkdir build && cd build
-          cmake ../tests/cpp/accuracy/ -DPython_ROOT_DIR=$(python -c "import sys; print(sys.prefix)")
+          cmake ../tests/cpp/accuracy/
           make -j
       - name: Run CPP Test
         run: |
           build/test_accuracy -d data -p tests/python/accuracy/public_scope.json
-        # DATA=data build/test_YOLOv8 # checkpoints are not available sometimes
       - name: Run CPP-PY Bindings Test
         run: |
           source venv/bin/activate

.github/workflows/test_precommit.yml

@@ -121,7 +121,7 @@ jobs:
         # .\w_openvino_toolkit_windows_2023.0.0.10926.b4452d56304_x86_64\setupvars.bat exits with 0 code without moving to a next command. Set PATH manually
         run: |
           set PATH=opencv\opencv\build\x64\vc16\bin;w_openvino_toolkit_windows_2024.6.0.17404.4c0f47d2335_x86_64\runtime\bin\intel64\Release;w_openvino_toolkit_windows_2024.6.0.17404.4c0f47d2335_x86_64\runtime\3rdparty\tbb\bin;%PATH%
-          .\build\Release\synchronous_api.exe .\data\public\ssd_mobilenet_v1_fpn_coco\FP16\ssd_mobilenet_v1_fpn_coco.xml .\data\BloodImage_00007.jpg
+          .\build\Release\synchronous_api.exe .\data\otx_models\detection_model_with_xai_head.xml .\data\BloodImage_00007.jpg
   serving_api:
     strategy:
       fail-fast: false
@@ -147,7 +147,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install src/python/[ovms,tests]
-          python -c "from model_api.models import DetectionModel; DetectionModel.create_model('ssd_mobilenet_v1_fpn_coco').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')"
-          docker run -d --rm -v $GITHUB_WORKSPACE/ovms_models/:/models -p 8000:8000 openvino/model_server:latest --model_path /models/ssd_mobilenet_v1_fpn_coco/ --model_name ssd_mobilenet_v1_fpn_coco --rest_port 8000 --log_level DEBUG --target_device CPU
           python tests/cpp/precommit/prepare_data.py -d data -p tests/cpp/precommit/public_scope.json
+          python -c "from model_api.models import DetectionModel; DetectionModel.create_model('./data/otx_models/detection_model_with_xai_head.xml').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')"
+          docker run -d --rm -v $GITHUB_WORKSPACE/ovms_models/:/models -p 8000:8000 openvino/model_server:latest --model_path /models/ssd_mobilenet_v1_fpn_coco/ --model_name ssd_mobilenet_v1_fpn_coco --rest_port 8000 --log_level DEBUG --target_device CPU
           python examples/python/serving_api/run.py data/coco128/images/train2017/000000000009.jpg  # detects 4 objects

src/cpp/CMakeLists.txt

@@ -33,20 +33,8 @@ endif()
 
 find_package(OpenCV REQUIRED COMPONENTS core imgproc)
 
-# Looking for OpenVINO in the python distribution. It doesn't work for cross-compiling build
-if(NOT CMAKE_CROSSCOMPILING)
-    set(Python_FIND_VIRTUALENV FIRST)
-    find_package(Python COMPONENTS Interpreter Development REQUIRED)
-    execute_process(
-        COMMAND ${Python_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')"
-        OUTPUT_VARIABLE OpenVINO_DIR_PY
-        ERROR_QUIET
-    )
-endif()
-
 find_package(OpenVINO REQUIRED
-             COMPONENTS Runtime Threading
-             HINTS "${OpenVINO_DIR_PY}")
+             COMPONENTS Runtime Threading)
 
 include(FetchContent)
 FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)

src/cpp/install_dependencies.sh

@@ -5,12 +5,12 @@ wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PU
 
 apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 
-echo "deb https://apt.repos.intel.com/openvino/2024 ubuntu22 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2024.list
+echo "deb https://apt.repos.intel.com/openvino/2025 ubuntu22 main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2025.list
 
 apt update
 
 #Install OpenCV
 apt-get install libopencv-dev
 
 # Install OpenVINO
-apt install openvino
+sudo apt install openvino-2025.0.0

src/python/model_api/adapters/openvino_adapter.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Intel Corporation
+# Copyright (C) 2020-2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -15,7 +15,7 @@
     from numpy import ndarray
 
 try:
-    import openvino.runtime as ov
+    import openvino as ov
     from openvino import (
         AsyncInferQueue,
         Core,

src/python/model_api/adapters/utils.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Intel Corporation
+# Copyright (C) 2020-2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -11,10 +11,9 @@
 
 import cv2
 import numpy as np
-from openvino import Model, OVAny, Type, layout_helpers
-from openvino.runtime import Input, Node, Output
-from openvino.runtime import opset10 as opset
-from openvino.runtime.utils.decorators import custom_preprocess_function
+from openvino import Input, Model, Node, Output, OVAny, Type, layout_helpers
+from openvino import opset10 as opset
+from openvino.utils.decorators import custom_preprocess_function
 
 if TYPE_CHECKING:
     from collections.abc import Callable

src/python/model_api/models/classification.py

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Intel Corporation
+# Copyright (C) 2020-2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -12,9 +12,9 @@
 from typing import TYPE_CHECKING
 
 import numpy as np
+from openvino import Model, Type
+from openvino import opset10 as opset
 from openvino.preprocess import PrePostProcessor
-from openvino.runtime import Model, Type
-from openvino.runtime import opset10 as opset
 
 from model_api.models.image_model import ImageModel
 from model_api.models.result import ClassificationResult, Label

src/python/model_api/visualizer/visualizer.py

@@ -3,9 +3,11 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-from pathlib import Path
-from typing import Union
+from __future__ import annotations  # TODO: remove when Python3.9 support is dropped
 
+from typing import TYPE_CHECKING
+
+import numpy as np
 from PIL import Image
 
 from model_api.models.result import (
@@ -18,7 +20,6 @@
     Result,
 )
 
-from .layout import Layout
 from .scene import (
     AnomalyScene,
     ClassificationScene,
@@ -29,18 +30,27 @@
     SegmentationScene,
 )
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
+    from .layout import Layout
+
 
 class Visualizer:
     """Utility class to automatically select the correct scene and render/show it."""
 
-    def __init__(self, layout: Union[Layout, None] = None) -> None:
+    def __init__(self, layout: Layout | None = None) -> None:
         self.layout = layout
 
-    def show(self, image: Image, result: Result) -> Image:
+    def show(self, image: Image | np.ndarray, result: Result) -> None:
+        if isinstance(image, np.ndarray):
+            image = Image.fromarray(image)
         scene = self._scene_from_result(image, result)
         return scene.show()
 
-    def save(self, image: Image, result: Result, path: Path) -> None:
+    def save(self, image: Image | np.ndarray, result: Result, path: Path) -> None:
+        if isinstance(image, np.ndarray):
+            image = Image.fromarray(image)
         scene = self._scene_from_result(image, result)
         scene.save(path)
 

src/python/pyproject.toml

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -27,8 +27,7 @@ dependencies = [
     "numpy>=1.16.6",
     "opencv-python",
     "scipy>=1.5.4",
-    "openvino>=2024.0",
-    "openvino-dev>=2024.0",
+    "openvino>=2025.0",
     "omz_tools @ git+https://github.com/openvinotoolkit/open_model_zoo.git@master#egg=omz_tools&subdirectory=tools/model_tools",
     "pillow",
 ]
@@ -42,7 +41,6 @@ tests = [
     "httpx",
     "pytest",
     "pytest-mock",
-    "openvino-dev[onnx,pytorch,tensorflow2]",
     "ultralytics>=8.0.114,<=8.0.205",
     "onnx",
     "onnxruntime",

tests/cpp/accuracy/CMakeLists.txt

@@ -65,17 +65,7 @@ include(../cmake/common.cmake)
 
 find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
 
-set(Python_FIND_VIRTUALENV FIRST)
-find_package(Python REQUIRED)
-execute_process(
-    COMMAND ${Python_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')"
-    OUTPUT_VARIABLE OpenVINO_DIR_PY
-    ERROR_QUIET
-)
-find_package(OpenVINO REQUIRED
-         COMPONENTS Runtime Threading
-         HINTS "${OpenVINO_DIR_PY}")
-
+set(ENABLE_PY_BINDINGS OFF)
 add_subdirectory(../../../src/cpp ${tests_BINARY_DIR}/model_api/cpp)
 
 add_test(NAME test_accuracy SOURCES test_accuracy.cpp DEPENDENCIES model_api)