From ad550810cdb9e9f2c6ef251a9a20803891bee5ac Mon Sep 17 00:00:00 2001 From: "Zhu, Shaojie" Date: Thu, 17 Oct 2024 19:27:29 +0800 Subject: [PATCH] move zero_utils.hpp to the utils folder --- .../intel_npu/src/backend/include/zero_infer_request.hpp | 2 +- src/plugins/intel_npu/src/backend/include/zero_pipeline.hpp | 2 +- src/plugins/intel_npu/src/backend/include/zero_wrappers.hpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_device.cpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_executor.cpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_init.cpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_memory.cpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_profiling.cpp | 2 +- src/plugins/intel_npu/src/backend/src/zero_remote_tensor.cpp | 2 +- .../include/intel_npu/utils/zero}/zero_utils.hpp | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename src/plugins/intel_npu/src/{backend/include => utils/include/intel_npu/utils/zero}/zero_utils.hpp (100%) diff --git a/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp b/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp index 6d0b343bf8d7b7..6cd68136ba6e81 100644 --- a/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp +++ b/src/plugins/intel_npu/src/backend/include/zero_infer_request.hpp @@ -13,7 +13,7 @@ #include "zero_pipeline.hpp" #include "zero_profiling.hpp" #include "zero_remote_tensor.hpp" -#include "zero_utils.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "zero_wrappers.hpp" namespace intel_npu { diff --git a/src/plugins/intel_npu/src/backend/include/zero_pipeline.hpp b/src/plugins/intel_npu/src/backend/include/zero_pipeline.hpp index 4160a2ca979290..62c8481d28ac1a 100644 --- a/src/plugins/intel_npu/src/backend/include/zero_pipeline.hpp +++ b/src/plugins/intel_npu/src/backend/include/zero_pipeline.hpp @@ -4,10 +4,10 @@ #pragma once +#include "intel_npu/utils/zero/zero_utils.hpp" #include "zero_executor.hpp" #include "zero_memory.hpp" #include "zero_profiling.hpp" -#include "zero_utils.hpp" #include "zero_wrappers.hpp" namespace intel_npu { diff --git a/src/plugins/intel_npu/src/backend/include/zero_wrappers.hpp b/src/plugins/intel_npu/src/backend/include/zero_wrappers.hpp index 12a745e42e3b9e..854bd88a7e478f 100644 --- a/src/plugins/intel_npu/src/backend/include/zero_wrappers.hpp +++ b/src/plugins/intel_npu/src/backend/include/zero_wrappers.hpp @@ -8,8 +8,8 @@ #include #include "intel_npu/utils/logger/logger.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "zero_types.hpp" -#include "zero_utils.hpp" namespace intel_npu { class CommandList; diff --git a/src/plugins/intel_npu/src/backend/src/zero_device.cpp b/src/plugins/intel_npu/src/backend/src/zero_device.cpp index b3645678ae62e5..85d39b37643180 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_device.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_device.cpp @@ -6,11 +6,11 @@ #include "intel_npu/al/itt.hpp" #include "intel_npu/utils/zero/zero_api.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "zero_executor.hpp" #include "zero_host_tensor.hpp" #include "zero_infer_request.hpp" #include "zero_remote_tensor.hpp" -#include "zero_utils.hpp" using namespace intel_npu; diff --git a/src/plugins/intel_npu/src/backend/src/zero_executor.cpp b/src/plugins/intel_npu/src/backend/src/zero_executor.cpp index e4a62dc26d9eb7..e140943a770440 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_executor.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_executor.cpp @@ -14,10 +14,10 @@ #include "intel_npu/al/config/common.hpp" #include "intel_npu/al/itt.hpp" #include "intel_npu/al/prefix.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "openvino/runtime/properties.hpp" #include "ze_command_queue_npu_ext.h" #include "zero_device.hpp" -#include "zero_utils.hpp" using namespace intel_npu; diff --git a/src/plugins/intel_npu/src/backend/src/zero_init.cpp b/src/plugins/intel_npu/src/backend/src/zero_init.cpp index 7e34176259d7d0..37ab3b5f4b3a16 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_init.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_init.cpp @@ -6,9 +6,9 @@ #include "intel_npu/al/itt.hpp" #include "intel_npu/utils/zero/zero_api.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "ze_api.h" #include "ze_command_queue_npu_ext.h" -#include "zero_utils.hpp" #ifdef _WIN32 namespace { diff --git a/src/plugins/intel_npu/src/backend/src/zero_memory.cpp b/src/plugins/intel_npu/src/backend/src/zero_memory.cpp index 2faa22503eb4f1..a12960c8b0a499 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_memory.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_memory.cpp @@ -5,7 +5,7 @@ #include "zero_memory.hpp" #include "intel_npu/utils/zero/zero_api.hpp" -#include "zero_utils.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" namespace intel_npu { namespace zeroMemory { diff --git a/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp b/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp index 5994604e096354..7935fffc563910 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_profiling.cpp @@ -9,8 +9,8 @@ #include "intel_npu/al/config/compiler.hpp" #include "intel_npu/al/profiling.hpp" #include "intel_npu/utils/zero/zero_api.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "zero_profiling.hpp" -#include "zero_utils.hpp" namespace intel_npu { namespace zeroProfiling { diff --git a/src/plugins/intel_npu/src/backend/src/zero_remote_tensor.cpp b/src/plugins/intel_npu/src/backend/src/zero_remote_tensor.cpp index 8e19ad9d9a4faa..f043d8937c4a28 100644 --- a/src/plugins/intel_npu/src/backend/src/zero_remote_tensor.cpp +++ b/src/plugins/intel_npu/src/backend/src/zero_remote_tensor.cpp @@ -8,8 +8,8 @@ #include "intel_npu/al/config/common.hpp" #include "intel_npu/utils/zero/zero_api.hpp" +#include "intel_npu/utils/zero/zero_utils.hpp" #include "openvino/core/type/element_iterator.hpp" -#include "zero_utils.hpp" using namespace ov::intel_npu; diff --git a/src/plugins/intel_npu/src/backend/include/zero_utils.hpp b/src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_utils.hpp similarity index 100% rename from src/plugins/intel_npu/src/backend/include/zero_utils.hpp rename to src/plugins/intel_npu/src/utils/include/intel_npu/utils/zero/zero_utils.hpp