diff --git a/docs/articles_en/openvino-workflow/running-inference/inference-devices-and-modes/npu-device.rst b/docs/articles_en/openvino-workflow/running-inference/inference-devices-and-modes/npu-device.rst index f52e2c72084483..bbc6cbbc84d5d1 100644 --- a/docs/articles_en/openvino-workflow/running-inference/inference-devices-and-modes/npu-device.rst +++ b/docs/articles_en/openvino-workflow/running-inference/inference-devices-and-modes/npu-device.rst @@ -170,7 +170,7 @@ offer a limited set of supported OpenVINO features. ov::intel_npu::device_alloc_mem_size ov::intel_npu::device_total_mem_size ov::intel_npu::driver_version - ov::intel_npu::compiler_api_version + ov::intel_npu::compiler_version .. note:: diff --git a/src/inference/include/openvino/runtime/intel_npu/properties.hpp b/src/inference/include/openvino/runtime/intel_npu/properties.hpp index 9126e1eea8daac..1c03e51edd268d 100644 --- a/src/inference/include/openvino/runtime/intel_npu/properties.hpp +++ b/src/inference/include/openvino/runtime/intel_npu/properties.hpp @@ -56,10 +56,10 @@ static constexpr ov::Property driver_versi /** * @brief [Only for NPU plugin] * Type: uint32_t - * Read-only property to get NPU compiler API version + * Read-only property to get NPU compiler version * @ingroup ov_runtime_npu_prop_cpp_api */ -static constexpr ov::Property compiler_api_version{"NPU_COMPILER_API_VERSION"}; +static constexpr ov::Property compiler_version{"NPU_COMPILER_VERSION"}; /** * @brief [Only for NPU compiler] diff --git a/src/plugins/intel_npu/README.md b/src/plugins/intel_npu/README.md index 20ab550cb3d0c9..b5da3bff6e1b47 100644 --- a/src/plugins/intel_npu/README.md +++ b/src/plugins/intel_npu/README.md @@ -171,7 +171,7 @@ The following properties are supported: | `ov::intel_npu::device_alloc_mem_size`/
`NPU_DEVICE_ALLOC_MEM_SIZE` | RO | Size of already allocated NPU DDR memory | `N/A` | `N/A` | | `ov::intel_npu::device_total_mem_size`/
`NPU_DEVICE_TOTAL_MEM_SIZE` | RO | Size of available NPU DDR memory | `N/A` | `N/A` | | `ov::intel_npu::driver_version`/
`NPU_DRIVER_VERSION` | RO | NPU driver version. | `N/A` | `N/A` | -| `ov::intel_npu::compiler_api_version`/
`NPU_COMPILER_API_VERSION` | RO | NPU compiler API version. MSB 16 bits are Major version, LSB 16 bits are Minor version | `N/A` | `N/A` | +| `ov::intel_npu::compiler_version`/
`NPU_COMPILER_VERSION` | RO | NPU compiler version. MSB 16 bits are Major version, LSB 16 bits are Minor version | `N/A` | `N/A` | | `ov::intel_npu::compilation_mode_params`/
`NPU_COMPILATION_MODE_PARAMS` | RW | Set various parameters supported by the NPU compiler. (See bellow) | ``| `N/A` | | `ov::intel_npu::turbo`/
`NPU_TURBO` | RW | Set Turbo mode on/off | `YES`/ `NO`| `NO` | | `ov::intel_npu::tiles`/
`NPU_TILES` | RW | Sets the number of npu tiles to compile the model for | `[0-]` | `-1` | diff --git a/src/plugins/intel_npu/src/al/include/intel_npu/icompiler.hpp b/src/plugins/intel_npu/src/al/include/intel_npu/icompiler.hpp index 79ecdb8c894640..799ea1be2b9597 100644 --- a/src/plugins/intel_npu/src/al/include/intel_npu/icompiler.hpp +++ b/src/plugins/intel_npu/src/al/include/intel_npu/icompiler.hpp @@ -72,12 +72,12 @@ class ICompiler : public std::enable_shared_from_this { virtual NetworkMetadata parse(const std::vector& network, const Config& config) const = 0; /** - * @brief Returns the compiler API version - * @return composite uint32_t value of compiler api version. + * @brief Returns the compiler version + * @return composite uint32_t value of compiler version. * MSB 16 bits = Major version * LSB 16bits = Minor version */ - virtual uint32_t get_api_version() const = 0; + virtual uint32_t get_version() const = 0; virtual std::vector process_profiling_output(const std::vector& profData, const std::vector& network, diff --git a/src/plugins/intel_npu/src/common/include/intel_npu/common/icompiler_adapter.hpp b/src/plugins/intel_npu/src/common/include/intel_npu/common/icompiler_adapter.hpp index 4c695ea142fc18..65eda416c36639 100644 --- a/src/plugins/intel_npu/src/common/include/intel_npu/common/icompiler_adapter.hpp +++ b/src/plugins/intel_npu/src/common/include/intel_npu/common/icompiler_adapter.hpp @@ -14,7 +14,7 @@ class ICompilerAdapter { const Config& config) const = 0; virtual std::shared_ptr parse(std::vector network, const Config& config) const = 0; virtual ov::SupportedOpsMap query(const std::shared_ptr& model, const Config& config) const = 0; - virtual uint32_t getApiVersion() const = 0; + virtual uint32_t get_version() const = 0; virtual ~ICompilerAdapter() = default; }; diff --git a/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp b/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp index 8daf403ac3da0c..63a5505829b21f 100644 --- a/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp +++ b/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp @@ -27,7 +27,7 @@ class DriverCompilerAdapter final : public ICompilerAdapter { ov::SupportedOpsMap query(const std::shared_ptr& model, const Config& config) const override; - uint32_t getApiVersion() const override; + uint32_t get_version() const override; private: /** diff --git a/src/plugins/intel_npu/src/compiler_adapter/include/plugin_compiler_adapter.hpp b/src/plugins/intel_npu/src/compiler_adapter/include/plugin_compiler_adapter.hpp index 5867a7480b1b23..599510d65d0373 100644 --- a/src/plugins/intel_npu/src/compiler_adapter/include/plugin_compiler_adapter.hpp +++ b/src/plugins/intel_npu/src/compiler_adapter/include/plugin_compiler_adapter.hpp @@ -25,7 +25,7 @@ class PluginCompilerAdapter final : public ICompilerAdapter { ov::SupportedOpsMap query(const std::shared_ptr& model, const Config& config) const override; - uint32_t getApiVersion() const override; + uint32_t get_version() const override; private: std::shared_ptr _zeroInitStruct; diff --git a/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp b/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp index 7cc5b9b734a7a3..f0fae7c481aba0 100644 --- a/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp +++ b/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp @@ -253,8 +253,8 @@ ov::SupportedOpsMap DriverCompilerAdapter::query(const std::shared_ptrgetCompilerApiVersion(); +uint32_t DriverCompilerAdapter::get_version() const { + return _zeroInitStruct->getCompilerVersion(); } /** diff --git a/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp b/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp index 4cf104f29eca9b..d0723f8549bdba 100644 --- a/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp +++ b/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp @@ -132,8 +132,8 @@ ov::SupportedOpsMap PluginCompilerAdapter::query(const std::shared_ptrquery(model, config); } -uint32_t PluginCompilerAdapter::getApiVersion() const { - return _compiler->get_api_version(); +uint32_t PluginCompilerAdapter::get_version() const { + return _compiler->get_version(); } } // namespace intel_npu diff --git a/src/plugins/intel_npu/src/plugin/src/plugin.cpp b/src/plugins/intel_npu/src/plugin/src/plugin.cpp index 97596374f70d2a..eec7d3d91a7f0d 100644 --- a/src/plugins/intel_npu/src/plugin/src/plugin.cpp +++ b/src/plugins/intel_npu/src/plugin/src/plugin.cpp @@ -454,14 +454,14 @@ Plugin::Plugin() [&](const Config& config) { return _metrics->GetDriverVersion(); }}}, - {ov::intel_npu::compiler_api_version.name(), + {ov::intel_npu::compiler_version.name(), {true, ov::PropertyMutability::RO, [&](const Config& config) { /// create dummy compiler CompilerAdapterFactory compilerAdapterFactory; auto dummyCompiler = compilerAdapterFactory.getCompiler(_backends->getIEngineBackend(), config); - return dummyCompiler->getApiVersion(); + return dummyCompiler->get_version(); }}}, {ov::intel_npu::compilation_mode_params.name(), {true, diff --git a/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp index bbb25f8d170952..7eb00042b703cf 100644 --- a/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp +++ b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp @@ -49,8 +49,8 @@ class ZeroInitStructsHolder final { inline uint32_t getDriverVersion() const { return driver_properties.driverVersion; } - inline uint32_t getCompilerApiVersion() const { - return compiler_api_version; + inline uint32_t getCompilerVersion() const { + return compiler_version; } inline uint32_t getMutableCommandListVersion() const { return mutable_command_list_version; @@ -89,7 +89,7 @@ class ZeroInitStructsHolder final { ze_api_version_t ze_drv_api_version = {}; - uint32_t compiler_api_version = 0; + uint32_t compiler_version = 0; }; } // namespace intel_npu diff --git a/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp b/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp index 929d0e7a888b38..d65ee59dc9e205 100644 --- a/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp +++ b/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp @@ -318,7 +318,7 @@ ZeroInitStructsHolder::ZeroInitStructsHolder() : log("NPUZeroInitStructsHolder", graph_props.stype = ZE_STRUCTURE_TYPE_DEVICE_GRAPH_PROPERTIES; auto result = graph_dditable_ext_decorator->pfnDeviceGetGraphProperties(device_handle, &graph_props); THROW_ON_FAIL_FOR_LEVELZERO("pfnDeviceGetGraphProperties", result); - compiler_api_version = ZE_MAKE_VERSION(graph_props.compilerVersion.major, graph_props.compilerVersion.minor); + compiler_version = ZE_MAKE_VERSION(graph_props.compilerVersion.major, graph_props.compilerVersion.minor); } ZeroInitStructsHolder::~ZeroInitStructsHolder() {