Delete layer_test_utils.hpp (openvinotoolkit#22750)

Co-authored-by: Pavel Durandin <[email protected]>
ynimmaga · Feb 22, 2024 · c0908b3 · c0908b3
1 parent ef7c8c1
commit c0908b3
Show file tree

Hide file tree

Showing 97 changed files with 109 additions and 116 deletions.
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
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <random>
+
 #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
@@ -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
@@ -4,13 +4,13 @@
 
 #pragma once
 
+#include <gtest/gtest.h>
 
 #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
@@ -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
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <random>
 #include <gtest/gtest.h>
 
 #include "common_test_utils/ov_tensor_utils.hpp"

diff --git a/...ugins/intel_cpu/tests/functional/custom/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/...ugins/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 <random>
 #include <gtest/gtest.h>
 
 #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
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <random>
 #include <gtest/gtest.h>
 
 #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
@@ -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
@@ -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
@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <cstdlib>
+
 #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 <cstdlib>
+#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
@@ -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
@@ -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
@@ -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
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <random>
+
 #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
@@ -2,8 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <gtest/gtest.h>
+
 #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<ov::Shape> {
         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
@@ -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/...lugins/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_multiple_query_sdp.cpp b/...lugins/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
@@ -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/...s/intel_cpu/tests/functional/custom/subgraph_tests/src/concat_transpose_sdp_transpose.cpp b/...s/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
@@ -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
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <regex>
+
 #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 <regex>
-
 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
@@ -4,7 +4,8 @@
 
 #include "utils/cpu_test_utils.hpp"
 #include "shared_test_classes/base/ov_subgraph.hpp"
-#include <openvino/core/graph_util.hpp>
+#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
@@ -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
@@ -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
@@ -2,8 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <gtest/gtest.h>
+
 #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
@@ -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
@@ -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
@@ -5,12 +5,10 @@
 #include <common_test_utils/ov_tensor_utils.hpp>
 #include <openvino/opsets/opset1.hpp>
 #include <openvino/opsets/opset8.hpp>
-#include <shared_test_classes/base/ov_subgraph.hpp>
 #include <string>
 #include <tuple>
 
 #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
@@ -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
@@ -2,10 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <gtest/gtest.h>
+
 #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
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <gtest/gtest.h>
+#include <regex>
+
 #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
@@ -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
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include <gtest/gtest.h>
+
 #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
@@ -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
@@ -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/...ugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp b/...ugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp
@@ -5,10 +5,11 @@
 #include <tuple>
 #include <string>
 #include <random>
+
 #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 <common_test_utils/ov_tensor_utils.hpp>
+#include "common_test_utils/ov_tensor_utils.hpp"
+#include "common_test_utils/data_utils.hpp"
 
 namespace ov {
 namespace test {

diff --git a/...s/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp b/...s/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/multiclass_nms.cpp
@@ -6,10 +6,10 @@
 #include <tuple>
 #include <vector>
 
-#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/...gins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/nms_rotated.cpp b/...gins/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 {