From de65abc6b3f49f5836a5f8bc07e954d58b47c151 Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Tue, 22 Aug 2023 15:03:45 +0200 Subject: [PATCH] Remove WA for vpu repo with CommonTestUtils namespace (#19275) --- .../shared_tests_instances/snippets/mha.cpp | 2 +- .../src/matmul_quantized_subgraph.cpp | 4 ++-- .../tests/functional/subgraph_tests/src/mha.cpp | 4 ++-- .../custom_shape_infer/adaptive_avg_pool.cpp | 4 ++-- .../custom_shape_infer/adaptive_max_pool.cpp | 4 ++-- .../custom_shape_infer/one_hot.cpp | 2 +- .../custom_shape_infer/prior_box.cpp | 14 +++++++------- .../custom_shape_infer/prior_box_clustered.cpp | 8 ++++---- .../custom_shape_infer/reshape.cpp | 4 ++-- .../custom_shape_infer/squeeze.cpp | 4 ++-- .../custom_shape_infer/strided_slice.cpp | 12 ++++++------ .../custom_shape_infer/transpose.cpp | 4 ++-- .../custom_shape_infer/unsqueeze.cpp | 4 ++-- .../pass_tests/concat_restrictions.cpp | 1 - .../preprocess_tests/gather_transpose_merge.cpp | 6 +++--- .../transformations/gather_transpose_merge.cpp | 4 ++-- .../unit/transformations/transpose_compress.cpp | 2 +- .../single_layer_tests/interpolate.cpp | 10 +++++----- .../src/single_layer/interpolate.cpp | 12 ++++++------ .../include/common_test_utils/common_utils.hpp | 9 --------- .../include/common_test_utils/data_utils.hpp | 8 -------- .../include/common_test_utils/file_utils.hpp | 10 ---------- .../include/common_test_utils/test_common.hpp | 13 ------------- .../common_test_utils/test_constants.hpp | 17 ----------------- .../functional_test_utils/crash_handler.hpp | 8 -------- 25 files changed, 52 insertions(+), 118 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/mha.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/mha.cpp index 09a9ebbb8e9..eab92fd7ddd 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/mha.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/mha.cpp @@ -211,7 +211,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Snippets_MHAQuantMatMul0, MHAQuantMatMul0, ::testing::Values(false), // The graph doesn't contain Multiply ::testing::Values(8), // FQ on input + MHA + Transpose on output + 4 Reshapes + Deq Mul ::testing::Values(3), // FQ on input + MHA + Deq Mul - ::testing::Values(CommonTestUtils::DEVICE_CPU), + ::testing::Values(ov::test::utils::DEVICE_CPU), ::testing::Values(CPUTestUtils::cpuEmptyPluginConfig)), MHA::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_quantized_subgraph.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_quantized_subgraph.cpp index ba43a53cf1f..a65913178cd 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_quantized_subgraph.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_quantized_subgraph.cpp @@ -41,7 +41,7 @@ public: std::tie(supportedInputShapes, isFC, inType, outType, cpuParams) = obj.param; std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(supportedInputShapes) << "_"; + result << "IS=" << ov::test::utils::vec2str(supportedInputShapes) << "_"; result << (isFC ? "FullyConnected" : "MatMul") << "_"; result << "InputType=" << inType << "_"; result << "OutputType=" << outType << "_"; @@ -56,7 +56,7 @@ protected: ElementType inType; ElementType outType; void SetUp() override { - targetDevice = CommonTestUtils::DEVICE_CPU; + targetDevice = ov::test::utils::DEVICE_CPU; SizeVector inShapes; CPUSpecificParams cpuParams; std::tie(inShapes, isFC, inType, outType, cpuParams) = this->GetParam(); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/mha.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/mha.cpp index a4936ac4ee3..bbf9c146d30 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/mha.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/mha.cpp @@ -592,7 +592,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_MHAQuant_Pattern0, MHAQuantTest, ::testing::Values(0), ::testing::Values(ExpectedNodes{{"Subgraph", 5}, // FQs on inputs x 3 + MHA + Deq Mul {"Transpose", 1}}), // Transpose between MHA and Deq Mul - ::testing::Values(CommonTestUtils::DEVICE_CPU)), + ::testing::Values(ov::test::utils::DEVICE_CPU)), MHAQuantTest::getTestCaseName); @@ -604,7 +604,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_MHAQuant_Pattern1, MHAQuantTest, ::testing::Values(1), ::testing::Values(ExpectedNodes{{"Subgraph", 3}, // FQ on input + MHA + Deq Mul {"Transpose", 1}}), // Transpose between MHA and Deq Mul - ::testing::Values(CommonTestUtils::DEVICE_CPU)), + ::testing::Values(ov::test::utils::DEVICE_CPU)), MHAQuantTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_MHAQuant_Pattern2, MHAQuantTest, diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_avg_pool.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_avg_pool.cpp index 76c5ab9cf58..44c5eed6790 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_avg_pool.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_avg_pool.cpp @@ -28,8 +28,8 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_axes, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "sd" << CommonTestUtils::vec2str(tmp_axes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "sd" << ov::test::utils::vec2str(tmp_axes) << "_"; result << "exp_shape" << tmp_exp_shape; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_max_pool.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_max_pool.cpp index 917f8586291..af07648d0e4 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_max_pool.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/adaptive_max_pool.cpp @@ -29,8 +29,8 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_axes, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "sd" << CommonTestUtils::vec2str(tmp_axes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "sd" << ov::test::utils::vec2str(tmp_axes) << "_"; result << "exp_shape" << tmp_exp_shape; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/one_hot.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/one_hot.cpp index 629fbb9bfed..6f5efcf329a 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/one_hot.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/one_hot.cpp @@ -34,7 +34,7 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_depth, tmp_on, tmp_off, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; result << "depth" << tmp_depth << "_"; result << "on" << tmp_on << "_"; result << "off" << tmp_off << "_"; diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box.cpp index f9dd7f707fe..80726f1b54e 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box.cpp @@ -35,17 +35,17 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_attrs, tmp_data, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "min_size" << CommonTestUtils::vec2str(tmp_attrs.min_size) << "_"; - result << "max_size" << CommonTestUtils::vec2str(tmp_attrs.max_size) << "_"; - result << "density" << CommonTestUtils::vec2str(tmp_attrs.density) << "_"; - result << "fixed_ratio" << CommonTestUtils::vec2str(tmp_attrs.fixed_ratio) << "_"; - result << "fixed_size" << CommonTestUtils::vec2str(tmp_attrs.fixed_size) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "min_size" << ov::test::utils::vec2str(tmp_attrs.min_size) << "_"; + result << "max_size" << ov::test::utils::vec2str(tmp_attrs.max_size) << "_"; + result << "density" << ov::test::utils::vec2str(tmp_attrs.density) << "_"; + result << "fixed_ratio" << ov::test::utils::vec2str(tmp_attrs.fixed_ratio) << "_"; + result << "fixed_size" << ov::test::utils::vec2str(tmp_attrs.fixed_size) << "_"; result << "clip(" << unit_test::boolToString(tmp_attrs.clip) << ")_"; result << "flip(" << unit_test::boolToString(tmp_attrs.flip) << ")_"; result << "step(" << tmp_attrs.step << ")_"; result << "offset(" << tmp_attrs.offset << ")_"; - result << "variance" << CommonTestUtils::vec2str(tmp_attrs.variance) << "_"; + result << "variance" << ov::test::utils::vec2str(tmp_attrs.variance) << "_"; result << "scale_all_sizes(" << unit_test::boolToString(tmp_attrs.scale_all_sizes) << ")_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box_clustered.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box_clustered.cpp index d1a4357f70c..e5b2e53e2db 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box_clustered.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/prior_box_clustered.cpp @@ -35,14 +35,14 @@ public: std::tie(tmp_input_shapes, tmp_attrs, tmp_data, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "widths" << CommonTestUtils::vec2str(tmp_attrs.widths) << "_"; - result << "heights" << CommonTestUtils::vec2str(tmp_attrs.heights) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "widths" << ov::test::utils::vec2str(tmp_attrs.widths) << "_"; + result << "heights" << ov::test::utils::vec2str(tmp_attrs.heights) << "_"; result << "clip(" << unit_test::boolToString(tmp_attrs.clip) << ")_"; result << "step_widths(" << tmp_attrs.step_widths<< ")_"; result << "step_heights(" << tmp_attrs.step_heights << ")_"; result << "offset(" << tmp_attrs.offset << ")_"; - result << "variances" << CommonTestUtils::vec2str(tmp_attrs.variances) << "_"; + result << "variances" << ov::test::utils::vec2str(tmp_attrs.variances) << "_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/reshape.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/reshape.cpp index 111b7c36d72..ed3f87b2e8c 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/reshape.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/reshape.cpp @@ -33,8 +33,8 @@ public: bool tmp_specialZero; std::tie(tmp_input_shapes, tmp_axes, tmp_exp_shape, tmp_specialZero) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "axes" << CommonTestUtils::vec2str(tmp_axes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "axes" << ov::test::utils::vec2str(tmp_axes) << "_"; result << "exp_shape(" << tmp_exp_shape << ")_"; result << "specalZero(" << unit_test::boolToString(tmp_specialZero) << ")"; return result.str(); diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/squeeze.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/squeeze.cpp index b4a1d4b3980..6f7dd89a2ef 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/squeeze.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/squeeze.cpp @@ -29,8 +29,8 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_axes, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "axes" << CommonTestUtils::vec2str(tmp_axes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "axes" << ov::test::utils::vec2str(tmp_axes) << "_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/strided_slice.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/strided_slice.cpp index 8ea01dabead..b899d6d76a6 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/strided_slice.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/strided_slice.cpp @@ -38,12 +38,12 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_data, tmp_begin_mask, tmp_end_mask, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "begin" << CommonTestUtils::vec2str(tmp_data[BEGIN]) << "_"; - result << "end" << CommonTestUtils::vec2str(tmp_data[END]) << "_"; - result << "stride" << CommonTestUtils::vec2str(tmp_data[STRIDE]) << "_"; - result << "begin_mask" << CommonTestUtils::vec2str(tmp_begin_mask) << "_"; - result << "end_mask" << CommonTestUtils::vec2str(tmp_end_mask) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "begin" << ov::test::utils::vec2str(tmp_data[BEGIN]) << "_"; + result << "end" << ov::test::utils::vec2str(tmp_data[END]) << "_"; + result << "stride" << ov::test::utils::vec2str(tmp_data[STRIDE]) << "_"; + result << "begin_mask" << ov::test::utils::vec2str(tmp_begin_mask) << "_"; + result << "end_mask" << ov::test::utils::vec2str(tmp_end_mask) << "_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/transpose.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/transpose.cpp index 862591844e6..c31d9f7917f 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/transpose.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/transpose.cpp @@ -28,8 +28,8 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_transpose_order, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "input_shapes(" << CommonTestUtils::vec2str(tmp_input_shapes) << ")_"; - result << "order(" << CommonTestUtils::vec2str(tmp_transpose_order) << ")_"; + result << "input_shapes(" << ov::test::utils::vec2str(tmp_input_shapes) << ")_"; + result << "order(" << ov::test::utils::vec2str(tmp_transpose_order) << ")_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/unsqueeze.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/unsqueeze.cpp index a01e53a0c66..c8cbf748749 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/unsqueeze.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/custom_shape_infer/unsqueeze.cpp @@ -28,8 +28,8 @@ public: StaticShape tmp_exp_shape; std::tie(tmp_input_shapes, tmp_axes, tmp_exp_shape) = obj.param; std::ostringstream result; - result << "IS" << CommonTestUtils::vec2str(tmp_input_shapes) << "_"; - result << "axes" << CommonTestUtils::vec2str(tmp_axes) << "_"; + result << "IS" << ov::test::utils::vec2str(tmp_input_shapes) << "_"; + result << "axes" << ov::test::utils::vec2str(tmp_axes) << "_"; result << "exp_shape(" << tmp_exp_shape << ")"; return result.str(); } diff --git a/src/plugins/intel_gna/tests/functional/pass_tests/concat_restrictions.cpp b/src/plugins/intel_gna/tests/functional/pass_tests/concat_restrictions.cpp index 8c3e27f95bd..42f06f524fc 100644 --- a/src/plugins/intel_gna/tests/functional/pass_tests/concat_restrictions.cpp +++ b/src/plugins/intel_gna/tests/functional/pass_tests/concat_restrictions.cpp @@ -26,7 +26,6 @@ using ConcatRestrictionsParamsTuple = typename std::tuple