diff --git a/src/plugins/intel_npu/src/compiler/include/npu_driver_compiler_adapter.hpp b/src/plugins/intel_npu/src/compiler/include/driver_compiler_adapter.hpp similarity index 100% rename from src/plugins/intel_npu/src/compiler/include/npu_driver_compiler_adapter.hpp rename to src/plugins/intel_npu/src/compiler/include/driver_compiler_adapter.hpp diff --git a/src/plugins/intel_npu/src/compiler/include/graph_transformations.hpp b/src/plugins/intel_npu/src/compiler/include/graph_transformations.hpp index ab876c44937..88f4b5ab2cc 100644 --- a/src/plugins/intel_npu/src/compiler/include/graph_transformations.hpp +++ b/src/plugins/intel_npu/src/compiler/include/graph_transformations.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "npu_driver_compiler_adapter.hpp" +#include "driver_compiler_adapter.hpp" #include "openvino/pass/manager.hpp" /** diff --git a/src/plugins/intel_npu/src/compiler/src/npu_driver_compiler_adapter.cpp b/src/plugins/intel_npu/src/compiler/src/driver_compiler_adapter.cpp similarity index 99% rename from src/plugins/intel_npu/src/compiler/src/npu_driver_compiler_adapter.cpp rename to src/plugins/intel_npu/src/compiler/src/driver_compiler_adapter.cpp index 09e9911eb25..efb9a8f69c8 100644 --- a/src/plugins/intel_npu/src/compiler/src/npu_driver_compiler_adapter.cpp +++ b/src/plugins/intel_npu/src/compiler/src/driver_compiler_adapter.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "npu_driver_compiler_adapter.hpp" +#include "driver_compiler_adapter.hpp" #include "graph_transformations.hpp" #include "intel_npu/al/config/common.hpp" diff --git a/src/plugins/intel_npu/src/plugin/include/npu_backends.hpp b/src/plugins/intel_npu/src/plugin/include/backends.hpp similarity index 100% rename from src/plugins/intel_npu/src/plugin/include/npu_backends.hpp rename to src/plugins/intel_npu/src/plugin/include/backends.hpp diff --git a/src/plugins/intel_npu/src/plugin/include/npu_compiler.hpp b/src/plugins/intel_npu/src/plugin/include/compiler.hpp similarity index 100% rename from src/plugins/intel_npu/src/plugin/include/npu_compiler.hpp rename to src/plugins/intel_npu/src/plugin/include/compiler.hpp diff --git a/src/plugins/intel_npu/src/plugin/include/npu_metrics.hpp b/src/plugins/intel_npu/src/plugin/include/metrics.hpp similarity index 99% rename from src/plugins/intel_npu/src/plugin/include/npu_metrics.hpp rename to src/plugins/intel_npu/src/plugin/include/metrics.hpp index 687322b94e4..f16da63bfbb 100644 --- a/src/plugins/intel_npu/src/plugin/include/npu_metrics.hpp +++ b/src/plugins/intel_npu/src/plugin/include/metrics.hpp @@ -8,8 +8,8 @@ #include #include +#include "backends.hpp" #include "npu.hpp" -#include "npu_backends.hpp" #include "npu_private_properties.hpp" #include "openvino/runtime/intel_npu/properties.hpp" #include "openvino/runtime/internal_properties.hpp" diff --git a/src/plugins/intel_npu/src/plugin/include/plugin.hpp b/src/plugins/intel_npu/src/plugin/include/plugin.hpp index 6f2346d1b16..10f48d90ab4 100644 --- a/src/plugins/intel_npu/src/plugin/include/plugin.hpp +++ b/src/plugins/intel_npu/src/plugin/include/plugin.hpp @@ -8,12 +8,12 @@ #include #include +#include "backends.hpp" #include "intel_npu/al/config/config.hpp" #include "intel_npu/al/icompiler.hpp" #include "intel_npu/utils/logger/logger.hpp" +#include "metrics.hpp" #include "npu.hpp" -#include "npu_backends.hpp" -#include "npu_metrics.hpp" #include "openvino/runtime/iplugin.hpp" #include "openvino/runtime/so_ptr.hpp" diff --git a/src/plugins/intel_npu/src/plugin/src/vpux_backends.cpp b/src/plugins/intel_npu/src/plugin/src/backends.cpp similarity index 99% rename from src/plugins/intel_npu/src/plugin/src/vpux_backends.cpp rename to src/plugins/intel_npu/src/plugin/src/backends.cpp index 8b7be0e2d0f..9a77018781c 100644 --- a/src/plugins/intel_npu/src/plugin/src/vpux_backends.cpp +++ b/src/plugins/intel_npu/src/plugin/src/backends.cpp @@ -2,12 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "backends.hpp" + #include #include #include "device_helpers.hpp" #include "intel_npu/al/config/common.hpp" -#include "npu_backends.hpp" #if defined(ENABLE_ZEROAPI_BACKEND) # include "zero_backend.hpp" diff --git a/src/plugins/intel_npu/src/plugin/src/vpux_compiler.cpp b/src/plugins/intel_npu/src/plugin/src/compiler.cpp similarity index 96% rename from src/plugins/intel_npu/src/plugin/src/vpux_compiler.cpp rename to src/plugins/intel_npu/src/plugin/src/compiler.cpp index 7bbe856f45b..10786fc9132 100644 --- a/src/plugins/intel_npu/src/plugin/src/vpux_compiler.cpp +++ b/src/plugins/intel_npu/src/plugin/src/compiler.cpp @@ -2,14 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "compiler.hpp" + #include "intel_npu/al/config/compiler.hpp" #include "intel_npu/al/itt.hpp" #include "intel_npu/utils/logger/logger.hpp" -#include "npu_compiler.hpp" -#include "npu_private_properties.hpp" // AL +#include "npu_private_properties.hpp" #ifdef ENABLE_DRIVER_COMPILER_ADAPTER -# include "npu_driver_compiler_adapter.hpp" +# include "driver_compiler_adapter.hpp" #endif #include diff --git a/src/plugins/intel_npu/src/plugin/src/vpux_metrics.cpp b/src/plugins/intel_npu/src/plugin/src/metrics.cpp similarity index 99% rename from src/plugins/intel_npu/src/plugin/src/vpux_metrics.cpp rename to src/plugins/intel_npu/src/plugin/src/metrics.cpp index 02903de1767..5016fb8e24c 100644 --- a/src/plugins/intel_npu/src/plugin/src/vpux_metrics.cpp +++ b/src/plugins/intel_npu/src/plugin/src/metrics.cpp @@ -3,8 +3,9 @@ // // Plugin +#include "metrics.hpp" + #include "device_helpers.hpp" -#include "npu_metrics.hpp" #include "npu_private_properties.hpp" #include "openvino/runtime/intel_npu/properties.hpp" diff --git a/src/plugins/intel_npu/src/plugin/src/plugin.cpp b/src/plugins/intel_npu/src/plugin/src/plugin.cpp index b0df54df18a..0fd92c44b2f 100644 --- a/src/plugins/intel_npu/src/plugin/src/plugin.cpp +++ b/src/plugins/intel_npu/src/plugin/src/plugin.cpp @@ -7,13 +7,12 @@ #include #include "compiled_model.hpp" +#include "compiler.hpp" #include "device_helpers.hpp" #include "intel_npu/al/config/common.hpp" #include "intel_npu/al/config/compiler.hpp" #include "intel_npu/al/config/runtime.hpp" #include "intel_npu/al/itt.hpp" -#include "npu_compiler.hpp" -#include "npu_metrics.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/parameter.hpp" #include "openvino/runtime/intel_npu/properties.hpp"