Merge branch 'master' into gemma2_swa

Author: AsyaPronina

.github/actions/handle_docker/get_images_to_build.py

@@ -6,11 +6,21 @@
 import re
 import sys
 
-from distutils.util import strtobool
 from helpers import *
 from images_api import *
 
 
+def str_to_bool(value):
+    """Convert string to boolean, replacing deprecated distutils.util.strtobool"""
+    value = value.lower()
+    if value in ('y', 'yes', 't', 'true', 'on', '1'):
+        return True
+    elif value in ('n', 'no', 'f', 'false', 'off', '0'):
+        return False
+    else:
+        raise ValueError(f"Invalid truth value: {value!r}")
+
+
 def parse_args():
     parser = argparse.ArgumentParser(description='Returns list of Docker images to build for a given workflow')
     parser.add_argument('-i', '--images', required=True, help='Comma-separated docker images')
@@ -23,9 +33,9 @@ def parse_args():
     parser.add_argument('--base_tag_file', default=None, required=False, help='Base docker tag file path')
     parser.add_argument('--ref_name', required=False, default='', help='GitHub ref name')
     parser.add_argument('--repo', default='openvinotoolkit/openvino', help='GitHub repository')
-    parser.add_argument('--docker_env_changed', type=lambda x: bool(strtobool(x)), default=True,
+    parser.add_argument('--docker_env_changed', type=lambda x: bool(str_to_bool(x)), default=True,
                         help='Whether PR changes docker env')
-    parser.add_argument('--dockerfiles_changed', type=lambda x: bool(strtobool(x)), default=True,
+    parser.add_argument('--dockerfiles_changed', type=lambda x: bool(str_to_bool(x)), default=True,
                         help='Whether PR changes dockerfiles')
     parser.add_argument('--action_path', default='.github/actions/handle_docker', help='Path to this GitHub action')
     parser.add_argument('--push', action='store_true', required=False, help='Whether to push images to registry')

.github/actions/handle_docker/requirements.txt

@@ -1 +1,3 @@
-ghapi==1.0.4
+ghapi==1.0.9
+# pin fastcore CVS-179495
+fastcore==1.12.1

.github/dockerfiles/docker_tag

@@ -1 +1 @@
-pr-33079
+pr-33674

docs/articles_en/openvino-workflow/running-inference/inference-devices-and-modes/npu-device.rst

@@ -147,12 +147,14 @@ offer a limited set of supported OpenVINO features.
          ov::intel_npu::qdq_optimization
          ov::intel_npu::qdq_optimization_aggressive
          ov::intel_npu::turbo
+         ov::intel_npu::platform
          ov::intel_npu::tiles
          ov::intel_npu::max_tiles
          ov::intel_npu::bypass_umd_caching
          ov::intel_npu::defer_weights_load
          ov::intel_npu::run_inferences_sequentially
          ov::intel_npu::disable_idle_memory_prunning
+         ov::intel_npu::compiler_type
 
    .. tab-item:: Read-only properties
 

docs/requirements.txt

@@ -33,7 +33,7 @@ pyyaml==6.0.3
 requests==2.32.5
 six==1.17.0
 snowballstemmer==3.0.1
-soupsieve==2.8.1
+soupsieve==2.8.2
 sphinx==8.1.3
 sphinx-copybutton==0.5.2
 sphinx-design==0.6.1

src/bindings/python/src/openvino/_pyopenvino/properties/intel_npu.pyi

@@ -5,7 +5,52 @@ import typing
 """
 openvino.properties.intel_npu submodule that simulates ov::intel_npu
 """
-__all__: list[str] = ['bypass_umd_caching', 'compilation_mode_params', 'compiler_dynamic_quantization', 'compiler_version', 'defer_weights_load', 'device_alloc_mem_size', 'device_total_mem_size', 'driver_version', 'max_tiles', 'qdq_optimization', 'qdq_optimization_aggressive', 'run_inferences_sequentially', 'tiles', 'turbo']
+__all__: list[str] = ['bypass_umd_caching', 'compilation_mode_params', 'compiler_dynamic_quantization', 'compiler_version', 'defer_weights_load', 'device_alloc_mem_size', 'device_total_mem_size', 'driver_version', 'max_tiles', 'qdq_optimization', 'qdq_optimization_aggressive', 'run_inferences_sequentially', 'tiles', 'turbo', 'platform', 'CompilerType', 'compiler_type']
+class CompilerType:
+    """
+    Members:
+
+      PLUGIN
+
+      DRIVER
+    """
+    PLUGIN: typing.ClassVar[CompilerType]  # value = <CompilerType.PLUGIN: 0>
+    DRIVER: typing.ClassVar[CompilerType]  # value = <CompilerType.DRIVER: 1>
+    __members__: typing.ClassVar[dict[str, CompilerType]]  # value = {'PLUGIN': <CompilerType.PLUGIN: 0>, 'DRIVER': <CompilerType.DRIVER: 1>}
+    def __eq__(self, other: typing.Any) -> bool:
+        ...
+    def __ge__(self, other: typing.Any) -> bool:
+        ...
+    def __getstate__(self) -> int:
+        ...
+    def __gt__(self, other: typing.Any) -> bool:
+        ...
+    def __hash__(self) -> int:
+        ...
+    def __index__(self) -> int:
+        ...
+    def __init__(self, value: typing.SupportsInt) -> None:
+        ...
+    def __int__(self) -> int:
+        ...
+    def __le__(self, other: typing.Any) -> bool:
+        ...
+    def __lt__(self, other: typing.Any) -> bool:
+        ...
+    def __ne__(self, other: typing.Any) -> bool:
+        ...
+    def __repr__(self) -> str:
+        ...
+    def __setstate__(self, state: typing.SupportsInt) -> None:
+        ...
+    def __str__(self) -> str:
+        ...
+    @property
+    def name(self) -> str:
+        ...
+    @property
+    def value(self) -> int:
+        ...
 @typing.overload
 def bypass_umd_caching() -> str:
     ...
@@ -74,3 +119,12 @@ def turbo() -> str:
 @typing.overload
 def turbo(arg0: bool) -> tuple[str, openvino._pyopenvino.OVAny]:
     ...
+@typing.overload
+def platform() -> str:
+    ...
+@typing.overload
+def platform(arg0: str) -> tuple[str, openvino._pyopenvino.OVAny]:
+    ...
+@typing.overload
+def compiler_type(arg0: CompilerType) -> tuple[str, openvino._pyopenvino.OVAny]:
+    ...

src/bindings/python/src/openvino/properties/intel_npu/__init__.py

@@ -2,6 +2,9 @@
 # Copyright (C) 2018-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+# Enums
+from openvino._pyopenvino.properties.intel_npu import CompilerType
+
 # Properties
 import openvino._pyopenvino.properties.intel_npu as __intel_npu
 from openvino.properties._properties import __make_properties

src/bindings/python/src/pyopenvino/core/properties/properties.cpp

@@ -343,6 +343,7 @@ void regmodule_properties(py::module m) {
 
     wrap_property_RW(m_intel_npu, ov::intel_npu::compilation_mode_params, "compilation_mode_params");
     wrap_property_RW(m_intel_npu, ov::intel_npu::turbo, "turbo");
+    wrap_property_RW(m_intel_npu, ov::intel_npu::platform, "platform");
     wrap_property_RW(m_intel_npu, ov::intel_npu::tiles, "tiles");
     wrap_property_RW(m_intel_npu, ov::intel_npu::max_tiles, "max_tiles");
     wrap_property_RW(m_intel_npu, ov::intel_npu::bypass_umd_caching, "bypass_umd_caching");
@@ -352,4 +353,10 @@ void regmodule_properties(py::module m) {
     wrap_property_RW(m_intel_npu, ov::intel_npu::qdq_optimization_aggressive, "qdq_optimization_aggressive");
     wrap_property_RW(m_intel_npu, ov::intel_npu::run_inferences_sequentially, "run_inferences_sequentially");
     wrap_property_RW(m_intel_npu, ov::intel_npu::disable_idle_memory_prunning, "disable_idle_memory_prunning");
+
+    py::enum_<ov::intel_npu::CompilerType>(m_intel_npu, "CompilerType", py::arithmetic())
+        .value("DRIVER", ov::intel_npu::CompilerType::DRIVER)
+        .value("PLUGIN", ov::intel_npu::CompilerType::PLUGIN);
+
+    wrap_property_RW(m_intel_npu, ov::intel_npu::compiler_type, "compiler_type");
 }

src/bindings/python/src/pyopenvino/utils/utils.cpp

@@ -19,6 +19,7 @@
 #include "openvino/frontend/decoder.hpp"
 #include "openvino/frontend/graph_iterator.hpp"
 #include "openvino/runtime/intel_cpu/properties.hpp"
+#include "openvino/runtime/intel_npu/properties.hpp"
 #include "openvino/runtime/properties.hpp"
 
 using Version = ov::pass::Serialize::Version;
@@ -266,6 +267,8 @@ py::object from_ov_any(const ov::Any& any) {
         return py::cast(luid_stream.str());
     } else if (any.is<ov::device::PCIInfo>()) {
         return py::cast(any.as<ov::device::PCIInfo>());
+    } else if (any.is<ov::intel_npu::CompilerType>()) {
+        return py::cast(any.as<ov::intel_npu::CompilerType>());
         // Custom FrontEnd Types
     } else if (any.is<ov::frontend::type::List>()) {
         return py::cast(any.as<ov::frontend::type::List>());
@@ -555,6 +558,8 @@ ov::Any py_object_to_any(const py::object& py_obj) {
         return py::cast<ov::streams::Num>(py_obj);
     } else if (py::isinstance<ov::WorkloadType>(py_obj)) {
         return py::cast<ov::WorkloadType>(py_obj);
+    } else if (py::isinstance<ov::intel_npu::CompilerType>(py_obj)) {
+        return py::cast<ov::intel_npu::CompilerType>(py_obj);
     } else if (py::isinstance<ov::Tensor>(py_obj)) {
         return py::cast<ov::Tensor>(py_obj);
     } else if (py::isinstance<ov::Output<ov::Node>>(py_obj)) {

src/bindings/python/tests/test_runtime/test_properties.py

@@ -461,6 +461,13 @@ def test_properties_ro(ov_property_ro, expected_value):
             "NPU_TURBO",
             ((True, True),),
         ),
+        (
+            intel_npu.platform,
+            "NPU_PLATFORM",
+            (("3720", "3720"),
+             ("4000", "4000"),
+             ("5010", "5010"),),
+        ),
         (
             intel_npu.tiles,
             "NPU_TILES",
@@ -501,6 +508,12 @@ def test_properties_ro(ov_property_ro, expected_value):
             "NPU_DISABLE_IDLE_MEMORY_PRUNING",
             ((True, True),),
         ),
+        (
+            intel_npu.compiler_type,
+            "NPU_COMPILER_TYPE",
+            ((intel_npu.CompilerType.DRIVER, intel_npu.CompilerType.DRIVER),
+             (intel_npu.CompilerType.PLUGIN, intel_npu.CompilerType.PLUGIN),),
+        ),
         (props.enable_weightless, "ENABLE_WEIGHTLESS", ((True, True), (False, False))),
     ],
 )