From cd47ad53b944802b71f59f5ed8692b2203279d03 Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Mon, 26 Feb 2024 22:07:44 +0100 Subject: [PATCH] Enable some fixed tests (#23057) ### Details: - Enable some fixed tests ### Tickets: - CVS-120413 - CVS-121313 - CVS-122081 - CVS-124060 Co-authored-by: Vitaliy Urusovskij --- .../convolution_backprop_data.cpp | 36 +++++++++---------- .../skip_tests_config.cpp | 5 --- .../convolution_backprop_data.cpp | 2 +- .../skip_tests_config.cpp | 2 -- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 34e96e9aeb7a2e..3fc78188cc34f3 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -23,7 +23,7 @@ const std::vector> emptyOutputPadding = {{}}; const std::vector> inputShapes2D_static = {{{1, 3, 30, 30}}, {{1, 16, 10, 10}}, {{1, 32, 10, 10}}}; -const std::vector> kernels2D = {/*{1, 1},*/ {3, 3}, {3, 5}}; +const std::vector> kernels2D = {{1, 1}, {3, 3}, {3, 5}}; const std::vector> strides2D = {{1, 1}, {1, 3}}; const std::vector> padBegins2D = {{0, 0}}; const std::vector> padEnds2D = {{0, 0}, {1, 1}}; @@ -224,22 +224,22 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding3D) ); -// INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, -// ::testing::Combine( -// conv3DParams_AutoPadValid_output_padding, -// ::testing::ValuesIn(model_type), -// ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes3D_static)), -// ::testing::ValuesIn(emptyOutputShape), -// ::testing::Values(ov::test::utils::DEVICE_CPU)), -// ConvolutionBackpropDataLayerTest::getTestCaseName); - -// INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, -// ::testing::Combine( -// conv3DParams_ExplicitPadding_output_padding, -// ::testing::ValuesIn(model_type), -// ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes3D_static)), -// ::testing::ValuesIn(emptyOutputShape), -// ::testing::Values(ov::test::utils::DEVICE_CPU)), -// ConvolutionBackpropDataLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, + ::testing::Combine( + conv3DParams_AutoPadValid_output_padding, + ::testing::ValuesIn(model_type), + ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes3D_static)), + ::testing::ValuesIn(emptyOutputShape), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + ConvolutionBackpropDataLayerTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, + ::testing::Combine( + conv3DParams_ExplicitPadding_output_padding, + ::testing::ValuesIn(model_type), + ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes3D_static)), + ::testing::ValuesIn(emptyOutputShape), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + ConvolutionBackpropDataLayerTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index d6c94017f4f60c..4a643a42ce6324 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -178,17 +178,12 @@ std::vector disabledTestPatterns() { R"(.*smoke_TopK/TopKLayerTest.Inference.*_k=21_.*_sort=value_modelType=f16_trgDev=CPU.*)", // Issue: 121228 R"(smoke_TestsDFT_(1|2|3|4)d/DFTLayerTest.Inference.*bf16.*)", - // Issue: 121313 - R"(smoke_GroupConvBackpropData.*paddingDefined/GroupConvBackpropLayerTest.Inference.*f16.*)", - R"(smoke_GroupConvBackpropData.*paddingDefined/GroupConvBackpropLayerTest.Inference.*f32.*)", // Issue: 121812 R"(.*ConvertCPULayerTest.*outFmts=(nhwc|nChw8c|nChw16c).*)", // Issue: 122321 R"(.*smoke_ConvertCPULayerTest_BOOL.*)", // Issue: 122177 R"(smoke_LSTMSequenceCommon.*LSTMSequenceTest.Inference.*CONVERT_TO_TI.*)", - // Issue: 122081 - R"(smoke_Activation_Basic_Prelu_Const/ActivationLayerTest.Inference/.*_TS=\(3.2.5.7\).*)", // Issue: 122094 R"(smoke_Interpolate_Basic_Down_Sample_Tail/InterpolateLayerTest.Inference.*(asymmetric|align_corners).*f16.*)", // Need to generate sequence exactly in the i64 data type. Enable in scope of i64 enabling. diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 8fdfe1f197a9fd..a57397a7e083d3 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -29,7 +29,7 @@ const std::vector netPrecisions2D = { const std::vector> inputShapes2D = {{{1, 3, 30, 30}}, {{1, 16, 10, 10}}, {{1, 32, 10, 10}}}; -const std::vector> kernels2D = {/*{1, 1},*/ {3, 3}, {3, 5}}; +const std::vector> kernels2D = {{1, 1}, {3, 3}, {3, 5}}; const std::vector> strides2D = {{1, 3}}; const std::vector> padBegins2D = {{0, 0}}; const std::vector> padEnds2D = {{0, 0}, {1, 1}}; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index fd4d8f7ca4e0d9..9508397faf53b2 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -60,8 +60,6 @@ std::vector disabledTestPatterns() { // Issue: 90539 R"(smoke_AutoBatch_BehaviorTests/OVInferRequestIOTensorTest.InferStaticNetworkSetInputTensor/targetDevice=BATCH.*)", R"(.*CachingSupportCase.*LoadNetworkCacheTestBase.*CompareWithRefImpl.*)", - // Issue: 124060 - R"(.*smoke_GridSample/GridSampleLayerTest.Inference/.*model_type=f16.*)", // Issue: 119648 R"(.*smoke_LPT/InterpolateTransformation.*)", #if defined(_WIN32)