diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/adaptive_pooling.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/adaptive_pooling.cpp index fd8f9514e5fd38..112427a3da2877 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/adaptive_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/adaptive_pooling.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "common_test_utils/ov_tensor_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/augru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/augru_sequence.cpp index a2c0c80f958120..c34dfe8d27130c 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/augru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/augru_sequence.cpp @@ -7,6 +7,7 @@ #include "utils/cpu_test_utils.hpp" #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp index 977c33d603cd27..3cbf92827bc58b 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/eltwise.hpp @@ -4,13 +4,13 @@ #pragma once +#include #include "shared_test_classes/base/ov_subgraph.hpp" #include "shared_test_classes/single_op/eltwise.hpp" #include "common_test_utils/ov_tensor_utils.hpp" #include "utils/fusing_test_utils.hpp" #include "utils/cpu_test_utils.hpp" -#include "gtest/gtest.h" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/scaled_attn.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/scaled_attn.cpp index 06b67daaf8f5dd..454b0bfc5b9625 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/scaled_attn.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/scaled_attn.cpp @@ -8,6 +8,7 @@ #include "openvino/opsets/opset13.hpp" #include "utils/cpu_test_utils.hpp" #include "transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp" +#include "openvino/pass/manager.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder.cpp index f711a3d01c16e9..db3aef64200ada 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +#include #include #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index e378290a7f9e39..17b4d9a7c6fd2a 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +#include #include #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_loss.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_loss.cpp index 9ac16bbdf0022c..d07c06d8fd606d 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_loss.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_loss.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +#include #include #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/gru_sequence.cpp index 2e7b77d30d8887..10cfe89081c825 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/gru_sequence.cpp @@ -7,6 +7,8 @@ #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" #include "common_test_utils/node_builders/gru_cell.hpp" +#include "openvino/pass/manager.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace CPUTestUtils; namespace ov { diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/interpolate.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/interpolate.cpp index e37cf565a6b0d2..a7fb8b9fe6acff 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/interpolate.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/interpolate.cpp @@ -8,6 +8,7 @@ #include "utils/cpu_test_utils.hpp" #include "utils/fusing_test_utils.hpp" #include "transformations/op_conversions/convert_interpolate11_downgrade.hpp" +#include "openvino/pass/manager.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/lstm_sequence.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/lstm_sequence.cpp index d9599a118ae9da..f4d4f17b799306 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/lstm_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/lstm_sequence.cpp @@ -2,13 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "common_test_utils/node_builders/lstm_cell.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" - -#include +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/pass/manager.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box.cpp index de109f0200ffdd..7fea598eb9f403 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box.cpp @@ -3,7 +3,6 @@ // #include "openvino/core/partial_shape.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box_clustered.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box_clustered.cpp index eb17754d90037c..f69987b98cc661 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box_clustered.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/prior_box_clustered.cpp @@ -3,7 +3,6 @@ // #include "openvino/core/partial_shape.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/rnn_sequence.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/rnn_sequence.cpp index 7c66e6ecfae1c8..67b336f4e03fcf 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/rnn_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/rnn_sequence.cpp @@ -7,6 +7,7 @@ #include "utils/cpu_test_utils.hpp" #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/topk.cpp b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/topk.cpp index d178dedba78d16..2cd4e3bbb16326 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/topk.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/topk.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "common_test_utils/ov_tensor_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/any_layout.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/any_layout.cpp index c19b3bbecccefc..97376937426fff 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/any_layout.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/any_layout.cpp @@ -2,8 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "utils/cpu_test_utils.hpp" #include "openvino/core/preprocess/pre_post_process.hpp" +#include "openvino/runtime/core.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/add.hpp" namespace ov { namespace test { @@ -51,7 +56,7 @@ class AnyLayoutOnInputsAndOutputs : public ::testing::TestWithParam { auto output = ov::Tensor(ov::element::f32, shape, output_data.data()); // Load model - Core core; + ov::Core core; auto compiled_model = core.compile_model(function, "CPU"); // Infer diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/broadcast_eltwise.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/broadcast_eltwise.cpp index 05103091b8c2ac..0cc044406dde26 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/broadcast_eltwise.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/broadcast_eltwise.cpp @@ -3,7 +3,6 @@ // #include "common_test_utils/ov_tensor_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_multiple_query_sdp.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_multiple_query_sdp.cpp index 9072b63d87906c..d33eb9d81fb3cb 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_multiple_query_sdp.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_multiple_query_sdp.cpp @@ -8,6 +8,7 @@ #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" #include "common_test_utils/include/common_test_utils/ov_tensor_utils.hpp" +#include "openvino/pass/manager.hpp" using namespace ov::test; using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_sdp.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_sdp.cpp index 571ef9e90c6caf..9d8182ef320cb2 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_sdp.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_sdp.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // #include "openvino/opsets/opset13.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_transpose_sdp_transpose.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_transpose_sdp_transpose.cpp index d48be1bd53cc01..5158ff8f433d73 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_transpose_sdp_transpose.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_transpose_sdp_transpose.cpp @@ -3,6 +3,7 @@ // #include "openvino/opsets/opset13.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_dw_conv.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_dw_conv.cpp index f449f10828f385..e5407b489da353 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_dw_conv.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_dw_conv.cpp @@ -6,7 +6,6 @@ #include "common_test_utils/node_builders/convolution.hpp" #include "common_test_utils/node_builders/group_convolution.hpp" #include "utils/cpu_test_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" namespace ov { diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_sum_broadcast.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_sum_broadcast.cpp index 14489391865206..82070eb8a7fe36 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_sum_broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/conv_sum_broadcast.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "common_test_utils/node_builders/activation.hpp" #include "common_test_utils/node_builders/constant.hpp" #include "common_test_utils/node_builders/convolution.hpp" @@ -12,8 +14,6 @@ #include "utils/convolution_params.hpp" #include "utils/fusing_test_utils.hpp" -#include - using namespace CPUTestUtils; namespace ov { diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/convert_range.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/convert_range.cpp index d6238186c02471..7054683872acb8 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/convert_range.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/convert_range.cpp @@ -4,7 +4,8 @@ #include "utils/cpu_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" -#include +#include "functional_test_utils/skip_tests_config.hpp" +#include "openvino/core/graph_util.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/denormal_check.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/denormal_check.cpp index ec55b7f69c439a..fef1458db012f4 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/denormal_check.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/denormal_check.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "ov_models/utils/data_utils.hpp" #include "openvino/runtime/aligned_buffer.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/fuse_transpose_reorder.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/fuse_transpose_reorder.cpp index e13d8783b10d23..11be05dc03f154 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/fuse_transpose_reorder.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/fuse_transpose_reorder.cpp @@ -7,6 +7,7 @@ #include "common_test_utils/node_builders/convolution.hpp" #include "ov_models/preprocess/preprocess_builders.hpp" #include "openvino/openvino.hpp" +#include "functional_test_utils/skip_tests_config.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/input_tensor_roi.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/input_tensor_roi.cpp index 17f045c8edc5ae..b3a0d65813ae79 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/input_tensor_roi.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/input_tensor_roi.cpp @@ -2,8 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "common_test_utils/ov_plugin_cache.hpp" #include "utils/cpu_test_utils.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/add.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/memory_sharing_test.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/memory_sharing_test.cpp index 93eb300eee61e6..2b9214c4c22cd0 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/memory_sharing_test.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/memory_sharing_test.cpp @@ -6,6 +6,8 @@ #include "openvino/openvino.hpp" #include "utils/convolution_params.hpp" #include "utils/cpu_test_utils.hpp" +#include "functional_test_utils/skip_tests_config.hpp" +#include "common_test_utils/test_constants.hpp" using namespace CPUTestUtils; diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/mha.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/mha.cpp index 7d481fb3d1402f..262ea381c7a4e6 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/mha.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/mha.cpp @@ -6,7 +6,6 @@ #include "common_test_utils/ov_tensor_utils.hpp" #include "common_test_utils/node_builders/constant.hpp" #include "common_test_utils/node_builders/fake_quantize.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "internal_properties.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/rotary_pos_emb.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/rotary_pos_emb.cpp index 054619b1e873e2..ab6908f787e7ba 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/rotary_pos_emb.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/rotary_pos_emb.cpp @@ -5,12 +5,10 @@ #include #include #include -#include #include #include #include "common_test_utils/common_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "utils/cpu_test_utils.hpp" #include "utils/fusing_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/sdpa_group_beam_search.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/sdpa_group_beam_search.cpp index 41687a6d9d20e1..74d9ea0a4424ab 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/sdpa_group_beam_search.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/sdpa_group_beam_search.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // #include "openvino/opsets/opset13.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_serialize.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_serialize.cpp index 48a05573915c29..0eac646c008faa 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_serialize.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_serialize.cpp @@ -2,10 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "openvino/core/model.hpp" +#include "openvino/runtime/core.hpp" #include "openvino/opsets/opset9.hpp" #include "utils/cpu_test_utils.hpp" #include "snippets/op/subgraph.hpp" +#include "functional_test_utils/skip_tests_config.hpp" +#include "common_test_utils/graph_comparator.hpp" + using namespace CPUTestUtils; using namespace ov::opset9; diff --git a/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.cpp b/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.cpp index 73b7a5ba203568..37bd7aa592699f 100644 --- a/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.cpp +++ b/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.cpp @@ -2,6 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // +#include +#include + #include "cpu_test_utils.hpp" #include "openvino/core/type/element_type.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.hpp b/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.hpp index 6de63875d7c8a2..9cd48d759321d3 100644 --- a/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.hpp +++ b/src/plugins/intel_cpu/tests/functional/utils/cpu_test_utils.hpp @@ -7,7 +7,6 @@ #include "openvino/runtime/compiled_model.hpp" #include "openvino/runtime/exec_model_info.hpp" #include "openvino/runtime/system_conf.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" namespace CPUTestUtils { diff --git a/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.cpp b/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.cpp index 762a906f65bd2b..287960c3adb010 100644 --- a/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.cpp +++ b/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include "fusing_test_utils.hpp" namespace CPUTestUtils { diff --git a/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.hpp b/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.hpp index 849652eb7a6c2f..eb30e82abca4d6 100644 --- a/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.hpp +++ b/src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.hpp @@ -10,6 +10,13 @@ #include "cpu_test_utils.hpp" #include "openvino/runtime/system_conf.hpp" #include "ov_models/utils/data_utils.hpp" +#include "openvino/op/multiply.hpp" +#include "openvino/op/add.hpp" +#include "openvino/op/matmul.hpp" +#include "openvino/op/subtract.hpp" +#include "openvino/op/divide.hpp" +#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp" +#include "openvino/op/util/logical_reduction_keep_dims.hpp" using namespace ov::test; diff --git a/src/plugins/intel_gpu/tests/functional/dynamic_tests/gpu_dyn_batch_shape_tests.cpp b/src/plugins/intel_gpu/tests/functional/dynamic_tests/gpu_dyn_batch_shape_tests.cpp index 87ada454d5dfab..77330870dee2e9 100644 --- a/src/plugins/intel_gpu/tests/functional/dynamic_tests/gpu_dyn_batch_shape_tests.cpp +++ b/src/plugins/intel_gpu/tests/functional/dynamic_tests/gpu_dyn_batch_shape_tests.cpp @@ -4,7 +4,6 @@ #include "common_test_utils/test_common.hpp" #include "common_test_utils/file_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "common_test_utils/ov_plugin_cache.hpp" #include "openvino/runtime/core.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp index eb49ca4fd79189..a94025b3e84940 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp @@ -5,10 +5,11 @@ #include #include #include + #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/single_op/matrix_nms.hpp" -#include +#include "common_test_utils/ov_tensor_utils.hpp" +#include "common_test_utils/data_utils.hpp" namespace ov { namespace test { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp index ccc9ba0ec1693c..79c7b60cc6f9dc 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp @@ -6,10 +6,10 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "common_test_utils/ov_tensor_utils.hpp" #include "common_test_utils/test_enums.hpp" +#include "common_test_utils/data_utils.hpp" namespace ov { namespace test { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/nms_rotated.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/nms_rotated.cpp index 6df6382a7b3f0f..01fc768f3040a7 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/nms_rotated.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/nms_rotated.cpp @@ -2,10 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shared_test_classes/base/layer_test_utils.hpp" + #include "shared_test_classes/base/ov_subgraph.hpp" #include "common_test_utils/ov_tensor_utils.hpp" #include "common_test_utils/node_builders/constant.hpp" +#include "common_test_utils/data_utils.hpp" namespace ov { namespace test { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/shared_constant.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/shared_constant.cpp index 2363d2b5e912a8..904e41e23c2204 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/shared_constant.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/shared_constant.cpp @@ -5,7 +5,6 @@ #include "openvino/core/partial_shape.hpp" #include "openvino/runtime/properties.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "common_test_utils/test_constants.hpp" #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder.cpp index ba6545f31a95cf..bb974828327419 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder.cpp @@ -5,8 +5,7 @@ #include #include #include -// #include "single_op_tests/ctc_greedy_decoder.hpp" -// #include "shared_test_classes/single_op/ctc_greedy_decoder.hpp" + #include "common_test_utils/test_constants.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder_seq_len.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder_seq_len.cpp index 7ceb1e06a5f9b3..d1f0cb7911ac44 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder_seq_len.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder_seq_len.cpp @@ -9,7 +9,6 @@ #include #include "shared_test_classes/base/ov_subgraph.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "common_test_utils/test_constants.hpp" #include "common_test_utils/ov_tensor_utils.hpp" diff --git a/src/plugins/template/tests/functional/op_reference/asin.cpp b/src/plugins/template/tests/functional/op_reference/asin.cpp index 56dfd504d9d110..9db982ac389261 100644 --- a/src/plugins/template/tests/functional/op_reference/asin.cpp +++ b/src/plugins/template/tests/functional/op_reference/asin.cpp @@ -7,7 +7,6 @@ #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/asinh.cpp b/src/plugins/template/tests/functional/op_reference/asinh.cpp index 0fbd3f5783819e..068a47685b7a2a 100644 --- a/src/plugins/template/tests/functional/op_reference/asinh.cpp +++ b/src/plugins/template/tests/functional/op_reference/asinh.cpp @@ -7,7 +7,6 @@ #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp b/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp index bc7f15cf842855..0998dbfe90b7c2 100644 --- a/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp +++ b/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp @@ -5,12 +5,13 @@ #include -#include "common_test_utils/include/common_test_utils/ov_tensor_utils.hpp" +#include "common_test_utils/data_utils.hpp" #include "common_test_utils/ov_plugin_cache.hpp" +#include "common_test_utils/ov_tensor_utils.hpp" +#include "functional_test_utils/skip_tests_config.hpp" #include "openvino/core/type/element_type.hpp" #include "openvino/runtime/allocator.hpp" #include "openvino/runtime/tensor.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/embedding_segments_sum.cpp b/src/plugins/template/tests/functional/op_reference/embedding_segments_sum.cpp index a9fc92d6df87fc..abbdd18b394dcd 100644 --- a/src/plugins/template/tests/functional/op_reference/embedding_segments_sum.cpp +++ b/src/plugins/template/tests/functional/op_reference/embedding_segments_sum.cpp @@ -2,10 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "openvino/op/embedding_segments_sum.hpp" + #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "openvino/op/constant.hpp" using namespace reference_tests; using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/embeddingbag_offsetssum.cpp b/src/plugins/template/tests/functional/op_reference/embeddingbag_offsetssum.cpp index ed12500db0c50d..0dd95ac8ea0375 100644 --- a/src/plugins/template/tests/functional/op_reference/embeddingbag_offsetssum.cpp +++ b/src/plugins/template/tests/functional/op_reference/embeddingbag_offsetssum.cpp @@ -5,7 +5,8 @@ #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/embeddingbag_offsets_sum.hpp" using namespace reference_tests; using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/embeddingbag_packedsum.cpp b/src/plugins/template/tests/functional/op_reference/embeddingbag_packedsum.cpp index f2bb7946fb9603..76dc46a0191746 100644 --- a/src/plugins/template/tests/functional/op_reference/embeddingbag_packedsum.cpp +++ b/src/plugins/template/tests/functional/op_reference/embeddingbag_packedsum.cpp @@ -2,10 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "openvino/op/embeddingbag_packedsum.hpp" + #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "openvino/op/constant.hpp" using namespace reference_tests; using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/if.cpp b/src/plugins/template/tests/functional/op_reference/if.cpp index fe05f18c27f50d..206abf9cd72611 100644 --- a/src/plugins/template/tests/functional/op_reference/if.cpp +++ b/src/plugins/template/tests/functional/op_reference/if.cpp @@ -2,13 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "openvino/op/if.hpp" + #include #include #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "openvino/op/add.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/multiply.hpp" using namespace reference_tests; using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/mvn.cpp b/src/plugins/template/tests/functional/op_reference/mvn.cpp index d16c7a9a76131b..167ebd89eebd83 100644 --- a/src/plugins/template/tests/functional/op_reference/mvn.cpp +++ b/src/plugins/template/tests/functional/op_reference/mvn.cpp @@ -7,7 +7,8 @@ #include #include "base_reference_test.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/common_utils.hpp" +#include "openvino/op/constant.hpp" using namespace ov; using namespace reference_tests; diff --git a/src/plugins/template/tests/functional/op_reference/reduce_sum.cpp b/src/plugins/template/tests/functional/op_reference/reduce_sum.cpp index 82c3e305026894..112e18043b75c1 100644 --- a/src/plugins/template/tests/functional/op_reference/reduce_sum.cpp +++ b/src/plugins/template/tests/functional/op_reference/reduce_sum.cpp @@ -6,6 +6,8 @@ #include +#include + #include "reduction.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/reduction.hpp b/src/plugins/template/tests/functional/op_reference/reduction.hpp index f3f58587913da9..42472691611e55 100644 --- a/src/plugins/template/tests/functional/op_reference/reduction.hpp +++ b/src/plugins/template/tests/functional/op_reference/reduction.hpp @@ -5,7 +5,9 @@ #include #include "base_reference_test.hpp" +#include "common_test_utils/common_utils.hpp" #include "common_test_utils/test_enums.hpp" +#include "openvino/op/constant.hpp" #include "openvino/op/reduce_l1.hpp" #include "openvino/op/reduce_l2.hpp" #include "openvino/op/reduce_logical_and.hpp" @@ -15,7 +17,6 @@ #include "openvino/op/reduce_min.hpp" #include "openvino/op/reduce_prod.hpp" #include "openvino/op/reduce_sum.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/subgraph_reference/preprocess.cpp b/src/plugins/template/tests/functional/subgraph_reference/preprocess.cpp index 306885bde3e519..8ba255844f706a 100644 --- a/src/plugins/template/tests/functional/subgraph_reference/preprocess.cpp +++ b/src/plugins/template/tests/functional/subgraph_reference/preprocess.cpp @@ -7,8 +7,12 @@ #include #include "base_reference_test.hpp" +#include "functional_test_utils/skip_tests_config.hpp" #include "openvino/core/preprocess/pre_post_process.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "openvino/op/abs.hpp" +#include "openvino/op/add.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/slice.hpp" using namespace ov; using namespace ov::preprocess; diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_consistency.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_consistency.hpp index a6b2f9b5494c22..7fe8a116e1f7e5 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_consistency.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_consistency.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include +#include "openvino/openvino.hpp" #include "common_test_utils/ov_plugin_cache.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "openvino/runtime/auto/properties.hpp" +#include "common_test_utils/test_common.hpp" +#include "common_test_utils/test_constants.hpp" namespace ov { namespace test { diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp index 58ed7f4a4b6031..e855587bb79743 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp @@ -13,7 +13,6 @@ #include #include "common_test_utils/ov_plugin_cache.hpp" #include "openvino/core/shape.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include #include #include "base/ov_behavior_test_utils.hpp" diff --git a/src/tests/functional/plugin/shared/include/execution_graph_tests/disable_lowering_precision.hpp b/src/tests/functional/plugin/shared/include/execution_graph_tests/disable_lowering_precision.hpp index 7eba75309827db..f231f325bd6c7a 100644 --- a/src/tests/functional/plugin/shared/include/execution_graph_tests/disable_lowering_precision.hpp +++ b/src/tests/functional/plugin/shared/include/execution_graph_tests/disable_lowering_precision.hpp @@ -9,7 +9,7 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "common_test_utils/test_common.hpp" namespace ExecutionGraphTests { diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_correctness.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_correctness.cpp index dbde8b3f562a37..2953566baca02b 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_correctness.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_correctness.cpp @@ -8,6 +8,12 @@ #include "behavior/ov_infer_request/infer_consistency.hpp" #include "common_test_utils/node_builders/constant.hpp" +#include "openvino/op/batch_norm.hpp" +#include "openvino/op/relu.hpp" +#include "openvino/op/convolution.hpp" +#include "openvino/op/avg_pool.hpp" +#include "common_test_utils/data_utils.hpp" +#include "functional_test_utils/skip_tests_config.hpp" namespace ov { namespace test { diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp index 8ea45c7e788116..f688a4f34168c4 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -5,7 +5,6 @@ #include #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "behavior/ov_infer_request/infer_request_dynamic.hpp" #include diff --git a/src/tests/functional/plugin/shared/src/execution_graph_tests/disable_lowering_precision.cpp b/src/tests/functional/plugin/shared/src/execution_graph_tests/disable_lowering_precision.cpp index 0201261e4ef714..b5a90e02fc1e24 100644 --- a/src/tests/functional/plugin/shared/src/execution_graph_tests/disable_lowering_precision.cpp +++ b/src/tests/functional/plugin/shared/src/execution_graph_tests/disable_lowering_precision.cpp @@ -12,11 +12,13 @@ #include "openvino/runtime/exec_model_info.hpp" #include "openvino/core/model.hpp" #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/ov_plugin_cache.hpp" #include "functional_test_utils/skip_tests_config.hpp" #include "execution_graph_tests/disable_lowering_precision.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" +#include "openvino/op/matmul.hpp" +#include "openvino/op/convert.hpp" +#include "openvino/op/constant.hpp" namespace ExecutionGraphTests { diff --git a/src/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp b/src/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp index ed8088b01399bf..d03978ad65b569 100644 --- a/src/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp +++ b/src/tests/functional/plugin/shared/src/execution_graph_tests/num_inputs_fusing_bin_conv.cpp @@ -5,11 +5,12 @@ #include #include "common_test_utils/ov_plugin_cache.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "common_test_utils/node_builders/group_convolution.hpp" #include "common_test_utils/node_builders/binary_convolution.hpp" #include "functional_test_utils/skip_tests_config.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/add.hpp" #include "execution_graph_tests/num_inputs_fusing_bin_conv.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 62818c22a05557..a87c957a948e3d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/fake_quantize_and_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index 90ba837d86ae01..e4cb1529f0cb31 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/fake_quantize_and_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index a799cd8fc2929a..0bac32082f011a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index 68ce95d492a2fa..b40c0f9ffb7213 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -14,7 +14,6 @@ #include "openvino/pass/constant_folding.hpp" #include "ov_lpt_models/depth_to_space.hpp" #include "ov_models/pass/convert_prc.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "transformations/common_optimizations/depth_to_space_fusion.hpp" #include "transformations/init_node_info.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 449110e7fe55e1..07be535339d678 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 694962036010b1..8d44d5f9c83708 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/mat_mul.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index 09be58373119de..3aee8a01c02391 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/fuse_convert.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index b915fe21762141..21c56c21665536 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_lpt_models/mat_mul.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index 796f5d7d609ddb..5dbf4bede95ec8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/group_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 57c92ecd4c411d..6a16e0549850d7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/fake_quantize_and_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index f5981ec8e77f74..a714b45b9308ba 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/mat_mul_with_optimized_constant_fake_quantize.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index 0767ffb272b00f..bab2f8d8642923 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_lpt_models/move_fake_quantize.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 2827bc00ec6834..590aa9619cafb6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/multiply_to_group_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index 38d001149ea0e3..5bf8d09afde085 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/mvn.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index e8ab412cc19366..25d0b3782a37ec 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/normalize_l2.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index f216fbe18e16d3..65453ef37c5519 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/node_builders/fake_quantize.hpp" #include "ov_models/pass/convert_prc.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index eb6c2d3ce3791d..80ab123e2351f8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/node_builders/fake_quantize.hpp" #include "ov_models/pass/convert_prc.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index 676f69d53c9458..de7e291d84e939 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/node_builders/fake_quantize.hpp" #include "ov_models/pass/convert_prc.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index fe39393189e3d5..e4da8c357f99c7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_models/pass/convert_prc.hpp" #include "ov_lpt_models/fake_quantize_and_convolution.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index c61577faa8f1f5..0494d19365d78e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -10,7 +10,6 @@ #include #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_lpt_models/recurrent_cell.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index 479418a3d2dca2..6ec62b85d5e285 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_lpt_models/shuffle_channels.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index 0a70a1727d189e..68eddd6284a3f1 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -11,7 +11,6 @@ #include "common_test_utils/common_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "ov_lpt_models/transpose_after_mat_mul.hpp" diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/benchmark.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/benchmark.hpp index 98229bbfd2ecd2..d845b42922424e 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/benchmark.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/benchmark.hpp @@ -8,7 +8,6 @@ #include #include "pugixml.hpp" -#include "layer_test_utils.hpp" #include "ov_subgraph.hpp" namespace ov { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp deleted file mode 100644 index 13e31dae19ea27..00000000000000 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include - -#include "common_test_utils/common_utils.hpp" -#include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ov_test_utils.hpp" -#include "common_test_utils/test_common.hpp" -#include "functional_test_utils/crash_handler.hpp" -#include "functional_test_utils/skip_tests_config.hpp" -#include "functional_test_utils/summary/environment.hpp" -#include "functional_test_utils/summary/op_summary.hpp" -#include "openvino/core/type/bfloat16.hpp" -#include "ov_models/pass/convert_prc.hpp" - -namespace LayerTestsUtils { - -using TargetDevice = std::string; - -class LayerTestsCommon { -protected: - LayerTestsCommon(); -}; - -} // namespace LayerTestsUtils diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 3e720a377bbc74..3e0ba71d854fd8 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -15,7 +15,6 @@ #include "low_precision/layer_transformation.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" -#include "functional_test_utils/skip_tests_config.hpp" namespace LayerTestsUtils { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp index 51812cdfb46877..1c3602b39decc4 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp @@ -9,6 +9,7 @@ #include "functional_test_utils/summary/op_summary.hpp" #include "openvino/core/model.hpp" #include "transformations/convert_precision.hpp" +#include "functional_test_utils/skip_tests_config.hpp" namespace ov { namespace test { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/shuffle_channels.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/shuffle_channels.hpp index 8f315bde169c6c..f305d86e577507 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/shuffle_channels.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/shuffle_channels.hpp @@ -9,7 +9,6 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" namespace ov { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/slice.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/slice.hpp index f98fd74cb745c0..76c84413925cb3 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/slice.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_op/slice.hpp @@ -9,7 +9,6 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" namespace ov { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp index 3c0a23c74d2bde..ad96d4144fb6fb 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/scaleshift.hpp @@ -9,7 +9,6 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "common_test_utils/test_constants.hpp" diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/simple_if.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/simple_if.hpp index 29d1a14c632360..bbd950d632db24 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/simple_if.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/simple_if.hpp @@ -8,7 +8,6 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" namespace ov { diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp index a08870dfb68006..8c75d1c78f5d0f 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp @@ -9,7 +9,6 @@ #include #include -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" namespace ov { diff --git a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp index 83e82d09b76b4d..d1f804c9bdb790 100644 --- a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp +++ b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp @@ -27,7 +27,6 @@ #include "common_test_utils/ov_tensor_utils.hpp" #include "common_test_utils/ov_test_utils.hpp" #include "functional_test_utils/crash_handler.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "shared_test_classes/base/utils/generate_inputs.hpp" diff --git a/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp b/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp index 7b8e488bfd5480..09a67f0cae5038 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp @@ -10,7 +10,6 @@ #include "shared_test_classes/base/utils/compare_results.hpp" #include -#include "shared_test_classes/base/layer_test_utils.hpp" namespace ov { namespace test { diff --git a/src/tests/functional/shared_test_classes/src/single_op/generate_proposals.cpp b/src/tests/functional/shared_test_classes/src/single_op/generate_proposals.cpp index 5030a1f3dea04f..433112594abb06 100644 --- a/src/tests/functional/shared_test_classes/src/single_op/generate_proposals.cpp +++ b/src/tests/functional/shared_test_classes/src/single_op/generate_proposals.cpp @@ -3,8 +3,8 @@ // #include "shared_test_classes/single_op/generate_proposals.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "common_test_utils/ov_tensor_utils.hpp" +#include "common_test_utils/data_utils.hpp" namespace ov { namespace test { diff --git a/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp b/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp index 88a83d81d2e255..67e23baca583c6 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/node_builders/eltwise.hpp" #include "common_test_utils/data_utils.hpp" #include "common_test_utils/ov_test_utils.hpp" -#include "functional_test_utils/skip_tests_config.hpp" #include "openvino/op/util/variable.hpp" #include "openvino/pass/low_latency.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp b/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp index 3fecea21d1208a..f6fab70ca2781c 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp @@ -5,7 +5,6 @@ #include "shared_test_classes/subgraph/split_conv_concat.hpp" #include "common_test_utils/data_utils.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" #include "common_test_utils/node_builders/convolution.hpp" diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index 1c4a169e896033..fd8cd9fd0e4c06 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -10,6 +10,7 @@ #include #include "common_test_utils/common_utils.hpp" +#include "common_test_utils/data_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/type/element_type_traits.hpp" #include "openvino/runtime/tensor.hpp" diff --git a/src/tests/test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp b/src/tests/test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp deleted file mode 100644 index eb91b522e4489a..00000000000000 --- a/src/tests/test_utils/functional_test_utils/include/functional_test_utils/core_config.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "shared_test_classes/base/layer_test_utils.hpp" - -void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test);