Follow header files reference policy

src/plugins/intel_cpu/src/compiled_model.cpp

@@ -1,39 +1,37 @@
 // Copyright (C) 2018-2023 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
-#include <ie_metric_helpers.hpp>
+#include "ie_metric_helpers.hpp"  // must be included first
 
 #include "compiled_model.h"
 
-#include <precision_utils.h>
-#include <low_precision/low_precision.hpp>
-#include <threading/ie_executor_manager.hpp>
-
 #include "async_infer_request.h"
 #include "infer_request.h"
 #include "itt.h"
+#include "low_precision/low_precision.hpp"
 #include "memory_state.h"
 #include "ngraph/type/element_type.hpp"
 #include "nodes/memory.hpp"
 #include "openvino/runtime/intel_cpu/properties.hpp"
+#include "precision_utils.h"
 #include "serialize.h"
+#include "threading/ie_executor_manager.hpp"
 #define FIX_62820 0
 #if FIX_62820 && ((IE_THREAD == IE_THREAD_TBB) || (IE_THREAD == IE_THREAD_TBB_AUTO))
 #    include <threading/ie_tbb_streams_executor.hpp>
 #endif
-#include <ie_system_conf.h>
-
 #include <algorithm>
 #include <cstring>
-#include <ie_ngraph_utils.hpp>
-#include <ngraph/opsets/opset1.hpp>
-#include <threading/ie_cpu_streams_executor.hpp>
-#include <transformations/utils/utils.hpp>
 #include <unordered_set>
 #include <utility>
 
+#include "ie_ngraph_utils.hpp"
+#include "ie_system_conf.h"
+#include "ngraph/opsets/opset1.hpp"
 #include "openvino/runtime/properties.hpp"
 #include "openvino/util/common_util.hpp"
+#include "threading/ie_cpu_streams_executor.hpp"
+#include "transformations/utils/utils.hpp"
 
 using namespace ov::threading;
 

src/plugins/intel_cpu/src/compiled_model.h

@@ -7,17 +7,17 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <openvino/runtime/threading/thread_local.hpp>
 #include <unordered_map>
 #include <vector>
 
 #include "extension_mngr.h"
 #include "graph.h"
 #include "graph_context.h"
-#include "openvino/runtime/iplugin.hpp"
 #include "openvino/runtime/icompiled_model.hpp"
 #include "openvino/runtime/iinfer_request.hpp"
+#include "openvino/runtime/iplugin.hpp"
 #include "openvino/runtime/isync_infer_request.hpp"
+#include "openvino/runtime/threading/thread_local.hpp"
 
 namespace ov {
 namespace intel_cpu {

src/plugins/intel_cpu/src/graph.cpp

@@ -2,58 +2,55 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <algorithm>
-#include <string>
-#include <map>
-#include <vector>
-#include <tuple>
-#include <unordered_set>
-#include <limits>
-#include <fstream>
-#include <unordered_map>
-#include <memory>
-#include <utility>
-
 #include "graph.h"
-#include "graph_dumper.h"
-#include "graph_optimizer.h"
+
+#include <algorithm>
+#include <fstream>
+#include <limits>
+#include <map>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+#include "blob_factory.hpp"
+#include "common/primitive_desc.hpp"
+#include "common/primitive_desc_iface.hpp"
 #include "dnnl_extension_utils.h"
 #include "extension_mngr.h"
-#include "memory_solver.hpp"
-#include "itt.h"
+#include "graph_dumper.h"
+#include "graph_optimizer.h"
+#include "ie_algorithm.hpp"
+#include "ie_plugin_config.hpp"
 #include "infer_request.h"
-#include "nodes/input.h"
-#include <nodes/reorder.h>
-#include "nodes/convert.h"
-#include "nodes/subgraph.h"
-#include "nodes/fullyconnected.h"
-
-#include <ie_algorithm.hpp>
-#include <blob_factory.hpp>
-#include "nodes/common/cpu_memcpy.h"
-#include "nodes/common/cpu_convert.h"
-
-#include "precision_utils.h"
-#include <ie_plugin_config.hpp>
-
-#include "utils/general_utils.h"
-#include "utils/debug_capabilities.h"
-#include "utils/node_dumper.h"
-#include "utils/ngraph_utils.hpp"
-#include "utils/cpu_utils.hpp"
-#include "utils/verbose.h"
+#include "itt.h"
+#include "low_precision/low_precision.hpp"
 #include "memory_desc/cpu_memory_desc_utils.h"
-
-#include <ngraph/node.hpp>
-#include <ngraph/function.hpp>
-#include <ngraph/ops.hpp>
-#include <transformations/utils/utils.hpp>
-#include <low_precision/low_precision.hpp>
 #include "memory_desc/dnnl_blocked_memory_desc.h"
-#include <common/primitive_desc.hpp>
-#include <common/primitive_desc_iface.hpp>
+#include "memory_solver.hpp"
+#include "ngraph/function.hpp"
+#include "ngraph/node.hpp"
+#include "ngraph/ops.hpp"
+#include "nodes/common/cpu_convert.h"
+#include "nodes/common/cpu_memcpy.h"
+#include "nodes/convert.h"
+#include "nodes/fullyconnected.h"
+#include "nodes/input.h"
+#include "nodes/reorder.h"
+#include "nodes/subgraph.h"
+#include "precision_utils.h"
+#include "transformations/utils/utils.hpp"
+#include "utils/cpu_utils.hpp"
+#include "utils/debug_capabilities.h"
+#include "utils/general_utils.h"
+#include "utils/ngraph_utils.hpp"
+#include "utils/node_dumper.h"
+#include "utils/verbose.h"
 #if (OV_THREAD == OV_THREAD_TBB || OV_THREAD == OV_THREAD_TBB_AUTO)
-#   include <tbb/task.h>
+#    include <tbb/task.h>
 #endif
 
 using namespace dnnl;

src/plugins/intel_cpu/src/graph.h

@@ -7,7 +7,6 @@
 #include <atomic>
 #include <map>
 #include <memory>
-#include <openvino/runtime/profiling_info.hpp>
 #include <string>
 #include <vector>
 
@@ -19,6 +18,7 @@
 #include "graph_context.h"
 #include "node.h"
 #include "normalize_preprocess.h"
+#include "openvino/runtime/profiling_info.hpp"
 
 namespace ov {
 namespace intel_cpu {

src/plugins/intel_cpu/src/infer_request.cpp

@@ -4,19 +4,17 @@
 
 #include "infer_request.h"
 
-#include <debug.h>
-#include <ie_common.h>
-
-#include <blob_factory.hpp>
-#include <ie_ngraph_utils.hpp>
 #include <map>
 #include <string>
-#include <transformations/utils/utils.hpp>
 #include <vector>
 
 #include "async_infer_request.h"
+#include "blob_factory.hpp"
 #include "compiled_model.h"
+#include "debug.h"
 #include "dnnl_extension_utils.h"
+#include "ie_common.h"
+#include "ie_ngraph_utils.hpp"
 #include "itt.h"
 #include "memory_desc/dnnl_blocked_memory_desc.h"
 #include "memory_state.h"
@@ -27,6 +25,7 @@
 #include "nodes/split.h"
 #include "openvino/core/shape.hpp"
 #include "openvino/runtime/tensor.hpp"
+#include "transformations/utils/utils.hpp"
 #include "utils/cpu_utils.hpp"
 #include "utils/general_utils.h"
 

src/plugins/intel_cpu/src/plugin.cpp

@@ -4,25 +4,23 @@
 #include "ie_metric_helpers.hpp"  // must be included first
 
 #include "plugin.h"
+
+#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
 #include "extension.h"
 #include "extension_mngr.h"
 
-#include "itt.h"
-#include "openvino/runtime/properties.hpp"
-#include "serialize.h"
-#include "threading/ie_executor_manager.hpp"
-#include "transformations/transformation_pipeline.h"
-
-#include <ie_ngraph_utils.hpp>
-#include <transformations/utils/utils.hpp>
-
-#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
+#include "ie_ngraph_utils.hpp"
 #include "ie_plugin_config.hpp"
 #include "ie_system_conf.h"
+#include "itt.h"
 #include "openvino/runtime/intel_cpu/properties.hpp"
 #include "openvino/runtime/properties.hpp"
 #include "performance_heuristics.hpp"
+#include "serialize.h"
 #include "threading/ie_cpu_streams_info.hpp"
+#include "threading/ie_executor_manager.hpp"
+#include "transformations/transformation_pipeline.h"
+#include "transformations/utils/utils.hpp"
 #include "utils/denormals.hpp"
 #include "weights_cache.hpp"
 

src/plugins/intel_cpu/src/serialize.cpp

@@ -3,9 +3,10 @@
 //
 #include "serialize.h"
 
-#include <openvino/pass/serialize.hpp>
 #include <pugixml.hpp>
-#include <transformations/utils/utils.hpp>
+
+#include "openvino/pass/serialize.hpp"
+#include "transformations/utils/utils.hpp"
 
 using namespace InferenceEngine;
 

src/plugins/intel_cpu/src/serialize.h

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 #pragma once
-#include "extension_mngr.h"
-
-#include <iostream>
 #include <functional>
-#include <cpp/ie_cnn_network.h>
+#include <iostream>
+
+#include "cpp/ie_cnn_network.h"
+#include "extension_mngr.h"
 
 namespace ov {
 namespace intel_cpu {

src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp

@@ -189,9 +189,6 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*smoke_Snippets_ConvertStub/ConvertStub\.CompareWithRefImpl/IS=.*_OT=\(bf16\)_#N=2_#S=2_targetDevice=CPU.*)",
         // Issue: 111944
         R"(.*smoke_DefConvLayoutTest6.*)",
-        // Issue: 111453
-        R"(.*smoke_BehaviorTests/OVCompiledGraphImportExportTest.*/targetDevice=CPU_elementType=(i16|i64|u16|u32|u64|f16).*)",
-        R"(.*smoke_Hetero_BehaviorTests/OVCompiledGraphImportExportTest.ovImportExportedFunction/targetDevice=HETERO_elementType=(i16|i64|u16|u32|u64|f16).*)",
         // New plugin work with tensors, so it means that blob in old API can have different pointers
         R"(.*InferRequestIOBBlobTest.*secondCallGetInputDoNotReAllocateData.*)",
         R"(.*InferRequestIOBBlobTest.*secondCallGetOutputDoNotReAllocateData.*)",
@@ -204,6 +201,9 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*InferRequestIOBBlobTest.*canProcessDeallocatedOutputBlobAfterGetAndSetBlob.*)",
         // Plugin version was changed to ov::Version
         R"(.*VersionTest.*pluginCurrentVersionIsCorrect.*)",
+        // Issue: 111453
+        R"(.*smoke_BehaviorTests/OVCompiledGraphImportExportTest.*/targetDevice=CPU_elementType=(i16|i64|u16|u32|u64|f16).*)",
+        R"(.*smoke_Hetero_BehaviorTests/OVCompiledGraphImportExportTest.ovImportExportedFunction/targetDevice=HETERO_elementType=(i16|i64|u16|u32|u64|f16).*)",
         // New plugin api + legacy ov api will put preprocess into transformation, which will add additional Convert
         // node to graph, it cause below tests failure
         R"(.*smoke_Basic/FuseTransposeAndReorderTest.CompareWithRefs.*)",
@@ -211,7 +211,7 @@ std::vector<std::string> disabledTestPatterns() {
         // Issue: 113703 - input/output port's name maybe changed after transformation in plugin api 2.0
         R"(.*smoke_If/SimpleIfTest.*Cond=0.*)",
         R"(.*smoke_Transpose(2|4|5|6)D/TransposeLayerTest.CompareWithRefs.*netPRC=(I8|U8).*)",
-        // Issue: 113704 -Layout information maybe incorrect when covert tensor to blob
+        // Issue: 113704 - Layout information maybe incorrect when covert tensor to blob
         R"(.*smoke_.*BehaviorTests/InferRequestPreprocessConversionTest.*)",
         // Issue: There are some problem when work with AUTO plugin API 2.0
         R"(.*smoke_Auto_CachingSupportCase_CPU/CompileModelCacheTestBase.CompareWithRefImpl.*)",