Skip to content

Commit c098c4a

Browse files
committed
Extend Zero API with zelSetDriverTeardown and use it in unittest main
Signed-off-by: Sorin Butnariu <sorin.butnariu@intel.com>
1 parent 305f6d7 commit c098c4a

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_api.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ namespace intel_npu {
6565
symbol_statement(zeCommandListGetNextCommandIdExp) \
6666
symbol_statement(zeCommandListUpdateMutableCommandsExp) \
6767
symbol_statement(zeInitDrivers) \
68-
symbol_statement(zelGetLoaderVersion)
68+
symbol_statement(zelGetLoaderVersion) \
69+
symbol_statement(zelSetDriverTeardown)
6970
// clang-format on
7071

7172
class ZeroApi {

src/plugins/intel_npu/tests/unit/main.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,11 @@ int main(int argc, char** argv, char** envp) {
2727
// register crashHandler for SIGSEGV signal
2828
signal(SIGSEGV, sigsegv_handler);
2929

30-
std::shared_ptr<void> lib;
3130
try {
32-
using zelSetDriverTeardownF = ze_result_t (*)();
33-
zelSetDriverTeardownF zelSetDriverTeardown = nullptr;
34-
35-
auto libpath = ov::util::make_plugin_library_name({}, "ze_loader");
36-
#if !defined(_WIN32) && !defined(ANDROID)
37-
libpath += LIB_ZE_LOADER_SUFFIX;
38-
#endif
39-
lib = ov::util::load_shared_object(libpath);
40-
zelSetDriverTeardown =
41-
reinterpret_cast<zelSetDriverTeardownF>(ov::util::get_symbol(lib, "zelSetDriverTeardown"));
42-
zelSetDriverTeardown();
31+
const auto zeroApi = intel_npu::ZeroApi::getInstance();
32+
if (zeroApi) {
33+
intel_npu::zelSetDriverTeardown();
34+
}
4335
} catch (...) {
4436
// ze_loader not present on the system, probably it is not an NPU host
4537
}

0 commit comments

Comments
 (0)