Skip to content

Commit 99d7cd4

Browse files
authored
[NPU] Use run-time ze_loader for npu plugin (openvinotoolkit#27659)
### Details: - *Not build or export ze_loader* - *Create level-zero-headers to export ze headers that needed by extra modules* ### Tickets: - *157614* --------- Signed-off-by: Xin Wang <xin1.wang@intel.com>
1 parent 5cd59b8 commit 99d7cd4

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

.github/workflows/linux_conditional_compilation.yml

-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ jobs:
212212
tar -cvf - \
213213
tests/ov_cpu_func_tests \
214214
tests/libopenvino_template_extension.so \
215-
tests/libze_loader.so* \
216215
tests/libhwloc* \
217216
tests/libtbb* \
218217
tests/functional_test_utils/layer_tests_summary/* \

.github/workflows/windows_conditional_compilation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
Compress-Archive @compress
238238
239239
$compress = @{
240-
Path = "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/ov_cpu_func_tests.exe", "${{ env.BUILD_DIR }}/bin/${{ env.CMAKE_BUILD_TYPE }}/ze_loader.dll", "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/openvino_template_extension.dll", "${{ env.OPENVINO_REPO }}/src/tests/test_utils/functional_test_utils/layer_tests_summary", "${{ env.INSTALL_DIR }}/runtime/3rdparty/tbb"
240+
Path = "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/ov_cpu_func_tests.exe", "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/openvino_template_extension.dll", "${{ env.OPENVINO_REPO }}/src/tests/test_utils/functional_test_utils/layer_tests_summary", "${{ env.INSTALL_DIR }}/runtime/3rdparty/tbb"
241241
CompressionLevel = "Optimal"
242242
DestinationPath = "${{ env.BUILD_DIR }}/openvino_tests.zip"
243243
}

src/plugins/intel_npu/src/backend/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ target_link_libraries(${TARGET_NAME}
2525
PRIVATE
2626
openvino::npu_al
2727
openvino::npu_common
28-
LevelZero::LevelZero
2928
)
3029

3130
#

src/plugins/intel_npu/src/compiler_adapter/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ target_link_libraries(${TARGET_NAME}
2525
PRIVATE
2626
openvino::npu_al
2727
openvino::npu_common
28-
LevelZero::LevelZero
2928
)
3029

3130
#

src/plugins/intel_npu/src/utils/src/zero/CMakeLists.txt

+7-14
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
1515
add_library(openvino::npu_zero_utils ALIAS ${TARGET_NAME})
1616
set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME npu_zero_utils)
1717

18+
add_library(level-zero-headers INTERFACE)
19+
set_property(TARGET level-zero-headers APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/thirdparty/level_zero/level-zero/include>)
20+
add_library(LevelZero::Headers ALIAS level-zero-headers)
21+
1822
target_include_directories(${TARGET_NAME}
1923
PUBLIC
20-
$<TARGET_PROPERTY:LevelZero::LevelZero,INTERFACE_INCLUDE_DIRECTORIES>
24+
$<TARGET_PROPERTY:LevelZero::Headers,INTERFACE_INCLUDE_DIRECTORIES>
2125
$<TARGET_PROPERTY:LevelZero::NPUExt,INTERFACE_INCLUDE_DIRECTORIES>
2226
$<BUILD_INTERFACE:${NPU_UTILS_SOURCE_DIR}/include>)
2327

@@ -35,16 +39,5 @@ ov_developer_package_export_targets(TARGET openvino::npu_zero_utils
3539
ov_developer_package_export_targets(TARGET level-zero-ext)
3640
ov_install_static_lib(level-zero-ext ${NPU_PLUGIN_COMPONENT})
3741

38-
if(TARGET ze_loader)
39-
ov_developer_package_export_targets(TARGET ze_loader)
40-
ov_install_static_lib(ze_loader ${NPU_PLUGIN_COMPONENT})
41-
42-
# TODO: remove once https://github.com/oneapi-src/level-zero/pull/243 is merged
43-
ov_developer_package_export_targets(TARGET utils)
44-
ov_install_static_lib(utils ${NPU_PLUGIN_COMPONENT})
45-
46-
# Support tests to run with ze_loader
47-
install(TARGETS ze_loader
48-
RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL
49-
LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
50-
endif()
42+
ov_developer_package_export_targets(TARGET level-zero-headers)
43+
ov_install_static_lib(level-zero-headers ${NPU_PLUGIN_COMPONENT})

0 commit comments

Comments
 (0)