rpms/openvino
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable intel_npu protopipe and single-image-test tools (req. OpenCV G-API)

Browse source
This commit is contained in:
Ali Erdinc Koroglu 2025-03-10 14:29:59 +02:00
commit de6c16ab05
3 changed files with 58 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

30
28039.patch
View file

@ -1,30 +0,0 @@
From 5e23f2a09c530834d4ea41f9901921c61da3381d Mon Sep 17 00:00:00 2001
From: h6197627 <44726212+h6197627@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:42:44 +0200
Subject: [PATCH] [PyOV] update numpy <2.3.0
---
src/bindings/python/constraints.txt | 2 +-
src/bindings/python/requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bindings/python/constraints.txt b/src/bindings/python/constraints.txt
index cc1d4514b7bbfe..4d65603a5323ab 100644
--- a/src/bindings/python/constraints.txt
+++ b/src/bindings/python/constraints.txt
@@ -1,5 +1,5 @@
# used in multiple components
-numpy>=1.16.6,<2.2.0 # Python bindings, frontends
+numpy>=1.16.6,<2.3.0 # Python bindings, frontends
# pytest
pytest>=5.0,<8.4
diff --git a/src/bindings/python/requirements.txt b/src/bindings/python/requirements.txt
index a2d63161fe764c..febb91d5ecee55 100644
--- a/src/bindings/python/requirements.txt
+++ b/src/bindings/python/requirements.txt
@@ -1,3 +1,3 @@
-numpy>=1.16.6,<2.2.0
+numpy>=1.16.6,<2.3.0
openvino-telemetry>=2023.2.1
packaging

68
npu-level-zero.patch
View file

@ -17,6 +17,57 @@
- target_compile_options(yaml-cpp PRIVATE -Wno-suggest-override)
- endif()
-endif()
--- a/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2025-01-30 22:09:54.664509560 +0000
+++ b/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2025-01-30 22:10:59.261604242 +0000
@@ -41,13 +41,6 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "bin"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
- COMPONENT ${NPU_INTERNAL_COMPONENT}
- ${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-endif()
--- a/src/plugins/intel_npu/tools/protopipe/CMakeLists.txt 2025-03-10 13:20:37.652583797 +0200
+++ a/src/plugins/intel_npu/tools/protopipe/CMakeLists.txt 2025-03-10 13:21:06.242582658 +0200
@@ -60,13 +60,7 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "bin/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
- COMPONENT ${NPU_INTERNAL_COMPONENT}
- ${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-endif()
--- a/src/plugins/intel_npu/tools/single-image-test/CMakeLists.txt 2025-03-10 13:21:33.270430504 +0200
+++ a/src/plugins/intel_npu/tools/single-image-test/CMakeLists.txt 2025-03-10 13:21:48.355429777 +0200
@@ -63,13 +63,7 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "bin/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
- COMPONENT ${NPU_INTERNAL_COMPONENT}
- ${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-endif()
--- a/src/plugins/intel_npu/src/backend/include/zero_memory.hpp 2025-01-30 16:54:27.550694466 +0000
+++ b/src/plugins/intel_npu/src/backend/include/zero_memory.hpp 2025-01-30 16:55:08.462018205 +0000
@@ -5,7 +5,7 @@
@ -157,20 +208,3 @@
#include <regex>
--- a/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2025-01-30 22:09:54.664509560 +0000
+++ b/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2025-01-30 22:10:59.261604242 +0000
@@ -41,13 +41,6 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "bin"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
- COMPONENT ${NPU_INTERNAL_COMPONENT}
- ${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
-endif()

7
openvino.spec
View file

@ -72,10 +72,13 @@ BuildRequires: yaml-cpp-devel
BuildRequires: tbb-devel
BuildRequires: onnx-devel
BuildRequires: protobuf-devel
BuildRequires: opencv-devel
# forked version of OpenVINO oneDNN does not have a proper version
Provides: bundled(onednn)
# MLAS upstream does not have any release
Provides: bundled(mlas)
# level-zero-npu-extensions upstream does not have any release
Provides: bundled(level-zero-npu-extensions)
Requires: lib%{name}-ir-frontend = %{version}
Requires: lib%{name}-pytorch-frontend = %{version}
Requires: lib%{name}-onnx-frontend = %{version}
@ -173,6 +176,8 @@ sed -i '/#include <utility>.*/a#include <cstdint>' src/plugins/intel_cpu/src/uti
sed -i '/#include <vector>.*/a#include <cstdint>' src/plugins/intel_npu/src/plugin/npuw/partitioning/online/graph.hpp
sed -i '/#include <vector>.*/a#include <cstdint>' src/plugins/intel_npu/src/plugin/npuw/serialization.hpp
sed -i '/#include <memory>.*/a#include <cstdint>' src/plugins/intel_cpu/src/utils/enum_class_hash.hpp
sed -i '/#include <vector>.*/a#include <cstdint>' src/plugins/intel_npu/tools/protopipe/src/graph.hpp
sed -i '/#include <memory>.*/a#include <cstdint>' src/plugins/intel_npu/tools/protopipe/src/scenario/criterion.hpp
%build
%cmake \
@ -273,6 +278,8 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} PYTHONPATH=%{buildroot}%
%{_libdir}/%{name}-%{version}/lib%{name}_intel_cpu_plugin.so
%{_libdir}/%{name}-%{version}/lib%{name}_intel_npu_plugin.so
%{_bindir}/compile_tool
%{_bindir}/protopipe
%{_bindir}/single-image-test
%files -n lib%{name}-ir-frontend
%{_libdir}/lib%{name}_ir_frontend.so.%{version}