211 lines
7.5 KiB
Diff
211 lines
7.5 KiB
Diff
--- a/src/plugins/intel_npu/thirdparty/CMakeLists.txt 2024-12-09 20:53:55.103131478 +0200
|
|
+++ b/src/plugins/intel_npu/thirdparty/CMakeLists.txt 2024-12-09 21:43:54.335978284 +0200
|
|
@@ -10,17 +10,5 @@
|
|
add_library(level-zero-ext INTERFACE)
|
|
set_property(TARGET level-zero-ext APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/level-zero-ext/>)
|
|
add_library(LevelZero::NPUExt ALIAS level-zero-ext)
|
|
-endif()
|
|
-
|
|
-#
|
|
-# yaml-cpp
|
|
-#
|
|
-
|
|
-if(ENABLE_INTEL_NPU_PROTOPIPE)
|
|
- set(YAML_BUILD_SHARED_LIBS OFF)
|
|
- add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
|
|
- # NB: Suppress warnings in yaml-cpp
|
|
- if(SUGGEST_OVERRIDE_SUPPORTED)
|
|
- target_compile_options(yaml-cpp PRIVATE -Wno-suggest-override)
|
|
- endif()
|
|
+ install(TARGETS level-zero-ext EXPORT OpenVINODeveloperTargets)
|
|
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 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include <map>
|
|
#include <string>
|
|
--- a/src/plugins/intel_npu/src/backend/src/zero_pipeline.cpp 2025-01-30 16:59:40.615523874 +0000
|
|
+++ b/src/plugins/intel_npu/src/backend/src/zero_pipeline.cpp 2025-01-30 17:00:06.007930172 +0000
|
|
@@ -5,7 +5,7 @@
|
|
#include "zero_pipeline.hpp"
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/common/itt.hpp"
|
|
#include "intel_npu/prefix.hpp"
|
|
--- a/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp 2025-01-30 17:01:12.269352224 +0000
|
|
+++ b/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp 2025-01-30 17:02:55.013658475 +0000
|
|
@@ -4,7 +4,7 @@
|
|
|
|
#include "zero_profiling.hpp"
|
|
|
|
-#include <ze_graph_profiling_ext.h>
|
|
+#include "ze_graph_profiling_ext.h"
|
|
|
|
#include "intel_npu/config/compiler.hpp"
|
|
#include "intel_npu/profiling.hpp"
|
|
--- a/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp 2025-01-30 17:07:27.738739813 +0000
|
|
+++ b/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp 2025-01-30 17:07:56.759752802 +0000
|
|
@@ -5,7 +5,7 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/common/npu.hpp"
|
|
#include "intel_npu/common/sync_infer_request.hpp"
|
|
--- a/src/plugins/intel_npu/src/backend/include/zero_device.hpp 2025-01-30 17:09:06.727631829 +0000
|
|
+++ b/src/plugins/intel_npu/src/backend/include/zero_device.hpp 2025-01-30 17:09:28.566273820 +0000
|
|
@@ -5,7 +5,7 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/common/icompiled_model.hpp"
|
|
#include "intel_npu/common/npu.hpp"
|
|
--- a/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp 2025-01-30 17:11:23.387863315 +0000
|
|
+++ b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_init.hpp 2025-01-30 17:12:15.351004206 +0000
|
|
@@ -5,9 +5,9 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_command_queue_npu_ext.h>
|
|
-#include <ze_graph_ext.h>
|
|
-#include <ze_intel_npu_uuid.h>
|
|
+#include "ze_command_queue_npu_ext.h"
|
|
+#include "ze_graph_ext.h"
|
|
+#include "ze_intel_npu_uuid.h"
|
|
|
|
#include <memory>
|
|
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp 2025-01-30 17:14:00.292277234 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/include/driver_compiler_adapter.hpp 2025-01-30 17:14:25.236311534 +0000
|
|
@@ -7,7 +7,7 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include <type_traits>
|
|
#include <utility>
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrappers.hpp 2025-01-30 17:15:30.489090023 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/include/ze_graph_ext_wrappers.hpp 2025-01-30 17:15:49.345658116 +0000
|
|
@@ -5,7 +5,7 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include <type_traits>
|
|
#include <utility>
|
|
--- a/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_types.hpp 2025-01-30 17:17:34.037203346 +0000
|
|
+++ b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_types.hpp 2025-01-30 17:18:09.895394136 +0000
|
|
@@ -5,9 +5,9 @@
|
|
#pragma once
|
|
|
|
#include <ze_api.h>
|
|
-#include <ze_command_queue_npu_ext.h>
|
|
-#include <ze_graph_ext.h>
|
|
-#include <ze_graph_profiling_ext.h>
|
|
+#include "ze_command_queue_npu_ext.h"
|
|
+#include "ze_graph_ext.h"
|
|
+#include "ze_graph_profiling_ext.h"
|
|
|
|
#include <string_view>
|
|
|
|
--- a/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_utils.hpp 2025-01-30 17:19:01.314989832 +0000
|
|
+++ b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_utils.hpp 2025-01-30 17:19:17.921341207 +0000
|
|
@@ -6,7 +6,7 @@
|
|
|
|
#include <limits.h>
|
|
#include <ze_api.h>
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/utils/logger/logger.hpp"
|
|
#include "intel_npu/utils/zero/zero_api.hpp"
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/include/plugin_graph.hpp 2025-01-30 17:20:31.103798946 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/include/plugin_graph.hpp 2025-01-30 17:21:08.007054462 +0000
|
|
@@ -6,7 +6,7 @@
|
|
|
|
#pragma once
|
|
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/common/igraph.hpp"
|
|
#include "intel_npu/icompiler.hpp"
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp 2025-01-30 17:22:45.703009508 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/src/driver_compiler_adapter.cpp 2025-01-30 17:23:09.819646893 +0000
|
|
@@ -4,7 +4,7 @@
|
|
|
|
#include "driver_compiler_adapter.hpp"
|
|
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include <regex>
|
|
#include <string_view>
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/include/driver_graph.hpp 2025-01-30 17:24:21.716872348 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/include/driver_graph.hpp 2025-01-30 17:24:43.017813607 +0000
|
|
@@ -6,7 +6,7 @@
|
|
|
|
#pragma once
|
|
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include "intel_npu/common/igraph.hpp"
|
|
#include "intel_npu/utils/zero/zero_init.hpp"
|
|
--- a/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp 2025-01-30 17:26:13.469876624 +0000
|
|
+++ b/src/plugins/intel_npu/src/compiler_adapter/src/plugin_compiler_adapter.cpp 2025-01-30 17:26:37.823924892 +0000
|
|
@@ -4,7 +4,7 @@
|
|
|
|
#include "plugin_compiler_adapter.hpp"
|
|
|
|
-#include <ze_graph_ext.h>
|
|
+#include "ze_graph_ext.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
--- a/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp 2025-01-30 17:30:07.987984148 +0000
|
|
+++ b/src/plugins/intel_npu/src/utils/src/zero/zero_init.cpp 2025-01-30 17:30:24.141709170 +0000
|
|
@@ -4,7 +4,7 @@
|
|
|
|
#include "intel_npu/utils/zero/zero_init.hpp"
|
|
|
|
-#include <ze_command_queue_npu_ext.h>
|
|
+#include "ze_command_queue_npu_ext.h"
|
|
|
|
#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()
|