From 43808d9da4a8a7b6f293300e4b733cb5555c868d Mon Sep 17 00:00:00 2001 From: Egor Duplenskii Date: Tue, 13 Dec 2022 12:36:28 +0100 Subject: [PATCH] [CPU] [TESTS] Avoid performing extra skip check (#10608) --- .../single_layer_tests/generate_proposals.cpp | 1 - .../tests/functional/single_layer_tests/activation.cpp | 2 -- .../functional/single_layer_tests/adaptive_pooling.cpp | 1 - .../tests/functional/single_layer_tests/augru_cell.cpp | 2 -- .../functional/single_layer_tests/augru_sequence.cpp | 2 -- .../functional/single_layer_tests/batch_to_space.cpp | 2 -- .../tests/functional/single_layer_tests/broadcast.cpp | 2 -- .../tests/functional/single_layer_tests/bucketize.cpp | 1 - .../tests/functional/single_layer_tests/concat.cpp | 4 +--- .../tests/functional/single_layer_tests/conversion.cpp | 4 +--- .../convert_to_plugin_specific_node.cpp | 2 -- .../functional/single_layer_tests/convolution.cpp | 4 ++-- .../single_layer_tests/convolution_backprop_data.cpp | 2 -- .../single_layer_tests/ctc_greedy_decoder.cpp | 1 - .../single_layer_tests/ctc_greedy_decoder_seq_len.cpp | 1 - .../tests/functional/single_layer_tests/ctc_loss.cpp | 2 -- .../tests/functional/single_layer_tests/cum_sum.cpp | 2 -- .../single_layer_tests/deformable_convolution.cpp | 1 - .../functional/single_layer_tests/depth_to_space.cpp | 2 -- .../functional/single_layer_tests/detection_output.cpp | 1 - .../tests/functional/single_layer_tests/eltwise.cpp | 2 -- .../single_layer_tests/embedding_bag_offsets_sum.cpp | 3 +-- .../single_layer_tests/embedding_bag_packed_sum.cpp | 1 - .../single_layer_tests/embedding_segments_sum.cpp | 1 - .../single_layer_tests/extract_image_patches.cpp | 1 - .../tests/functional/single_layer_tests/eye.cpp | 1 - .../functional/single_layer_tests/fake_quantize.cpp | 1 - .../tests/functional/single_layer_tests/gather.cpp | 2 -- .../tests/functional/single_layer_tests/gather_nd.cpp | 6 +----- .../functional/single_layer_tests/grid_sample.cpp | 2 -- .../single_layer_tests/group_convolution.cpp | 2 -- .../group_convolution_backprop_data.cpp | 4 +--- .../tests/functional/single_layer_tests/gru_cell.cpp | 2 -- .../functional/single_layer_tests/gru_sequence.cpp | 2 -- .../functional/single_layer_tests/interpolate.cpp | 2 -- .../functional/single_layer_tests/log_softmax.cpp | 2 -- .../tests/functional/single_layer_tests/logical.cpp | 4 +--- .../tests/functional/single_layer_tests/loop.cpp | 8 -------- .../tests/functional/single_layer_tests/lrn.cpp | 2 -- .../tests/functional/single_layer_tests/lstm_cell.cpp | 2 -- .../functional/single_layer_tests/lstm_sequence.cpp | 2 -- .../tests/functional/single_layer_tests/matmul.cpp | 1 - .../tests/functional/single_layer_tests/mvn.cpp | 4 +--- .../single_layer_tests/non_max_suppression.cpp | 1 - .../tests/functional/single_layer_tests/nonzero.cpp | 1 - .../tests/functional/single_layer_tests/normalize.cpp | 2 -- .../tests/functional/single_layer_tests/one_hot.cpp | 2 -- .../tests/functional/single_layer_tests/pad.cpp | 3 --- .../tests/functional/single_layer_tests/pooling.cpp | 4 ---- .../tests/functional/single_layer_tests/prior_box.cpp | 3 +-- .../single_layer_tests/prior_box_clustered.cpp | 1 - .../tests/functional/single_layer_tests/proposal.cpp | 2 -- .../functional/single_layer_tests/psroi_pooling.cpp | 1 - .../tests/functional/single_layer_tests/range.cpp | 3 +-- .../tests/functional/single_layer_tests/rdft.cpp | 2 -- .../tests/functional/single_layer_tests/reduce_ops.cpp | 2 -- .../functional/single_layer_tests/region_yolo.cpp | 1 - .../tests/functional/single_layer_tests/rnn_cell.cpp | 2 -- .../functional/single_layer_tests/rnn_sequence.cpp | 2 -- .../functional/single_layer_tests/roi_pooling.cpp | 1 - .../tests/functional/single_layer_tests/roialign.cpp | 1 - .../single_layer_tests/scatter_ND_update.cpp | 1 - .../single_layer_tests/scatter_elements_update.cpp | 1 - .../functional/single_layer_tests/scatter_update.cpp | 1 - .../tests/functional/single_layer_tests/select.cpp | 6 ++---- .../tests/functional/single_layer_tests/shape_ops.cpp | 4 +--- .../tests/functional/single_layer_tests/shapeof.cpp | 1 - .../functional/single_layer_tests/shuffle_channels.cpp | 2 -- .../tests/functional/single_layer_tests/slice.cpp | 2 -- .../tests/functional/single_layer_tests/softmax.cpp | 1 - .../functional/single_layer_tests/space_to_batch.cpp | 2 -- .../functional/single_layer_tests/space_to_depth.cpp | 4 +--- .../tests/functional/single_layer_tests/split.cpp | 4 +--- .../functional/single_layer_tests/strided_slice.cpp | 4 ---- .../functional/single_layer_tests/tensor_iterator.cpp | 2 -- .../tests/functional/single_layer_tests/tile.cpp | 2 -- .../tests/functional/single_layer_tests/topk.cpp | 2 -- .../tests/functional/single_layer_tests/transpose.cpp | 2 -- .../functional/single_layer_tests/variadic_split.cpp | 4 +--- .../subgraph_tests/src/add_convert_to_reorder.cpp | 4 +--- .../subgraph_tests/src/align_matmul_input_ranks.cpp | 2 -- .../tests/functional/subgraph_tests/src/any_layout.cpp | 1 - .../subgraph_tests/src/concat_const_inplace.cpp | 2 -- .../subgraph_tests/src/concat_conv_sum_inplace.cpp | 4 +--- .../functional/subgraph_tests/src/conv3d_reshape.cpp | 2 -- .../functional/subgraph_tests/src/conv_concat.cpp | 2 -- .../subgraph_tests/src/conv_maxpool_activ.cpp | 2 -- .../subgraph_tests/src/conv_sum_broadcast.cpp | 4 ---- .../functional/subgraph_tests/src/convs_and_sums.cpp | 2 -- .../functional/subgraph_tests/src/denormal_check.cpp | 3 +-- .../functional/subgraph_tests/src/eltwise_chain.cpp | 2 -- .../src/fullyconnected_strided_inputs_outputs.cpp | 2 -- .../src/fuse_conv_fq_with_shared_constants.cpp | 4 +--- .../subgraph_tests/src/fuse_muladd_ewsimple.cpp | 6 ------ .../subgraph_tests/src/fuse_non0_output_port.cpp | 4 +--- .../src/fuse_scaleshift_and_fakequantize.cpp | 2 -- .../src/fuse_split_concat_pair_to_interpolate.cpp | 2 -- .../subgraph_tests/src/fuse_transpose_reorder.cpp | 10 ---------- .../subgraph_tests/src/gather_add_avgpool.cpp | 2 -- .../src/input_noreorder_eltwise_bf16.cpp | 2 -- .../functional/subgraph_tests/src/input_tensor_roi.cpp | 2 -- .../functional/subgraph_tests/src/interaction.cpp | 3 +-- .../src/matmul_strided_inputs_outputs.cpp | 2 -- .../tests/functional/subgraph_tests/src/mha.cpp | 4 ---- .../subgraph_tests/src/not_fused_conv_simple_op.cpp | 2 -- .../subgraph_tests/src/param_result_custom_blob.cpp | 6 +----- .../functional/subgraph_tests/src/reshape_chain.cpp | 4 +--- .../tests/functional/subgraph_tests/src/reshape_fc.cpp | 2 -- .../functional/subgraph_tests/src/reshape_inplace.cpp | 4 +--- .../functional/subgraph_tests/src/seq_native_order.cpp | 2 -- .../functional/subgraph_tests/src/static_zero_dims.cpp | 4 +--- .../src/subgraph_with_blocked_format.cpp | 1 - .../subgraph_tests/src/tile_with_two_output_edges.cpp | 4 +--- .../tests/functional/test_utils/cpu_test_utils.cpp | 6 ++++++ 114 files changed, 34 insertions(+), 251 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/generate_proposals.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/generate_proposals.cpp index 302366b99ee..6e7da1c9b21 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/generate_proposals.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/generate_proposals.cpp @@ -237,7 +237,6 @@ INSTANTIATE_TEST_SUITE_P( struct GenerateProposalsBenchmarkTest : ov::test::BenchmarkLayerTest {}; TEST_P(GenerateProposalsBenchmarkTest, DISABLED_GenerateProposals_Benchmark) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run_benchmark("GenerateProposals", std::chrono::milliseconds(2000), 10000); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/activation.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/activation.cpp index ec472b9111e..66be6b53013 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/activation.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/activation.cpp @@ -123,8 +123,6 @@ protected: }; TEST_P(ActivationLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Eltwise"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp index 9378c0de8b0..ceec9372fb1 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/adaptive_pooling.cpp @@ -177,7 +177,6 @@ private: }; TEST_P(AdaPoolLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "AdaptivePooling"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp index d2d13309c28..7132cc8f2d2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_cell.cpp @@ -106,8 +106,6 @@ protected: }; TEST_P(AUGRUCellCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNCell"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp index 4eba8188e31..cff5e65ab93 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/augru_sequence.cpp @@ -166,8 +166,6 @@ protected: }; TEST_P(AUGRUSequenceCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNSeq"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp index 28fd1baa200..81f9f424100 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/batch_to_space.cpp @@ -84,8 +84,6 @@ protected: }; TEST_P(BatchToSpaceCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "BatchToSpace"); }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/broadcast.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/broadcast.cpp index 1244e5d7143..7da9752055c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/broadcast.cpp @@ -187,8 +187,6 @@ protected: }; TEST_P(BroadcastLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Broadcast"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/bucketize.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/bucketize.cpp index 9c449f0201a..86532674300 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/bucketize.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/bucketize.cpp @@ -103,7 +103,6 @@ protected: }; TEST_P(BucketizeLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp index 34a55ed0ec4..6957ea9289c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/concat.cpp @@ -88,8 +88,6 @@ protected: }; TEST_P(ConcatLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Concatenation"); } @@ -675,4 +673,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Concat_inPlace, ConcatLayerCPUTest, } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/conversion.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/conversion.cpp index 3469cb4185e..76590873e85 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/conversion.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/conversion.cpp @@ -110,8 +110,6 @@ private: }; TEST_P(ConvertCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Convert"); @@ -179,4 +177,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvertCPULayerTest_BOOL, ConvertCPULayerTest, ::testing::Values(CPUSpecificParams({nchw}, {nchw}, {}, {}))), ConvertCPULayerTest::getTestCaseName); -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convert_to_plugin_specific_node.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convert_to_plugin_specific_node.cpp index d83f70931d0..b631bb0398e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convert_to_plugin_specific_node.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convert_to_plugin_specific_node.cpp @@ -67,8 +67,6 @@ protected: }; TEST_P(ConvertToPluginSpecificNode, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckNumberOfNodesWithType(executableNetwork, "Const", constNodeNum); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp index 9303511ada2..39b5a7e189a 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution.cpp @@ -91,6 +91,8 @@ protected: InferenceEngine::SizeVector kernel, dilation; void checkBiasFusing(ov::CompiledModel &execNet) const { + if (!execNet) return; + auto execGraph = execNet.get_runtime_model(); ASSERT_NE(nullptr, execGraph); @@ -202,8 +204,6 @@ protected: }; TEST_P(ConvolutionLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - // Skip tests for sse41 convolution where ic or oc cannot be exactly divided by the block size, // since tails processing for sse41 nspc layout is not supported yet (see 52736). if (!inFmts.empty() && (inFmts.front() == nwc || inFmts.front() == nhwc || inFmts.front() == ndhwc) && selectedType.find("jit_sse") != std::string::npos) { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp index 58fb11ba6e0..d148db03639 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/convolution_backprop_data.cpp @@ -254,8 +254,6 @@ private: }; TEST_P(DeconvolutionLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - if (!fusedOps.empty()) { bool isSupportedParams = stride[stride.size() - 1] <= kernel[kernel.size() - 1]; if (stride.size() > 1) diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp index a8d8a4b8e82..b261dcf70d2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder.cpp @@ -130,7 +130,6 @@ protected: }; TEST_P(CTCGreedyDecoderLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); CheckPluginRelatedResults(compiledModel, "CTCGreedyDecoder"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index f60d3ad3ccf..8a08a07acbd 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -170,7 +170,6 @@ protected: }; TEST_P(CTCGreedyDecoderSeqLenLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); CheckPluginRelatedResults(compiledModel, "CTCGreedyDecoderSeqLen"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp index 2f3a0dde38a..d75fa786e57 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/ctc_loss.cpp @@ -186,8 +186,6 @@ private: }; TEST_P(CTCLossLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); - run(); CheckPluginRelatedResults(compiledModel, "CTCLoss"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp index ed7c8d27ea4..1b5ea7ddead 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp @@ -67,8 +67,6 @@ protected: }; TEST_P(CumSumLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "CumSum"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp index 160f5b6f9ca..1b9e688f2fe 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/deformable_convolution.cpp @@ -184,7 +184,6 @@ protected: }; TEST_P(DefConvLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "DeformableConvolution"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp index 4540015525e..4d8bfce683e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/depth_to_space.cpp @@ -78,8 +78,6 @@ protected: }; TEST_P(DepthToSpaceLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "DepthToSpace"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp index 3e40227f61f..edf02f98f4e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/detection_output.cpp @@ -243,7 +243,6 @@ private: }; TEST_P(DetectionOutputLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eltwise.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eltwise.cpp index 73c5fd5a86a..616530dfac2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eltwise.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eltwise.cpp @@ -168,8 +168,6 @@ private: }; TEST_P(EltwiseLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Eltwise"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_offsets_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_offsets_sum.cpp index 826e2854ec7..854decccb17 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_offsets_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_offsets_sum.cpp @@ -97,7 +97,6 @@ public: }; TEST_P(EmbeddingBagOffsetsSumLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "embeddingBagOffsetsSum"); } @@ -165,4 +164,4 @@ INSTANTIATE_TEST_SUITE_P(smoke, EmbeddingBagOffsetsSumLayerCPUTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), EmbeddingBagOffsetsSumLayerCPUTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_packed_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_packed_sum.cpp index d77b4b0e669..7dbb8329c6b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_packed_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_bag_packed_sum.cpp @@ -87,7 +87,6 @@ protected: }; TEST_P(EmbeddingBagPackedSumLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "embeddingBagPackedSum"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_segments_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_segments_sum.cpp index d92c4fe5852..42f256ae325 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_segments_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/embedding_segments_sum.cpp @@ -101,7 +101,6 @@ protected: }; TEST_P(EmbeddingSegmentsSumLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "embeddingSegmentsSum"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp index fdf15b71703..b5c1607f935 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/extract_image_patches.cpp @@ -67,7 +67,6 @@ protected: }; TEST_P(ExtractImagePatchesLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ExtractImagePatches"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp index e40f6baa573..796438f8609 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/eye.cpp @@ -129,7 +129,6 @@ protected: }; TEST_P(EyeLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "Eye"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp index 3445e05a82b..56e9411714a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/fake_quantize.cpp @@ -149,7 +149,6 @@ private: }; TEST_P(FakeQuantizeLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, layerName); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp index f4d171c2545..5de2e7d9d69 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp @@ -147,8 +147,6 @@ protected: }; TEST_P(GatherLayerTestCPU, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Gather"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp index 879c54606a3..fd61f2d4587 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather_nd.cpp @@ -90,14 +90,10 @@ protected: }; TEST_P(GatherNDLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } TEST_P(GatherND8LayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } @@ -190,4 +186,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_GatherND8DynamicBD_2, GatherND8LayerCPUTest, subs } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp index 62239b0d999..4f62318df5e 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp @@ -129,8 +129,6 @@ protected: }; TEST_P(GridSampleLayerTestCPU, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "GridSample"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp index 530f11444c9..6edaf63b385 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution.cpp @@ -200,8 +200,6 @@ protected: }; TEST_P(GroupConvolutionLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); if (isBias) { checkBiasFusing(compiledModel); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp index 344dde1e15f..75f8669af7a 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/group_convolution_backprop_data.cpp @@ -256,8 +256,6 @@ private: }; TEST_P(GroupDeconvolutionLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - if (!fusedOps.empty()) { bool isSupportedParams = stride[stride.size() - 1] <= kernel[kernel.size() - 1]; if (stride.size() > 1) @@ -908,4 +906,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_AutoPadding_FP32, GroupDeconvoluti } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp index 03378b40de9..c2d0566f466 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_cell.cpp @@ -103,8 +103,6 @@ protected: }; TEST_P(GRUCellCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNCell"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp index b6f18d9aaa8..269b203c733 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp @@ -167,8 +167,6 @@ protected: }; TEST_P(GRUSequenceCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNSeq"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp index 8d7c1ef30de..8a839cad20c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/interpolate.cpp @@ -262,8 +262,6 @@ protected: }; TEST_P(InterpolateLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Interpolate"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp index 6a8cc1fda0f..c73114d4bee 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/log_softmax.cpp @@ -73,8 +73,6 @@ protected: }; TEST_P(LogSoftmaxLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "logSoftmax"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/logical.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/logical.cpp index 55342f92326..ed3758ded79 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/logical.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/logical.cpp @@ -76,8 +76,6 @@ protected: }; TEST_P(LogicalLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckPluginRelatedResults(executableNetwork, "Eltwise"); } @@ -155,4 +153,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Logical_Eltwise_CPU_BF16, LogicalLayerCPUTest, Lo INSTANTIATE_TEST_SUITE_P(smoke_Logical_Not_Eltwise_CPU_BF16, LogicalLayerCPUTest, LogicalTestParamsNot, LogicalLayerCPUTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp index ffd2730bd72..7f971a43563 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/loop.cpp @@ -362,26 +362,18 @@ protected: }; TEST_P(LoopLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } TEST_P(LoopWhileLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } TEST_P(LoopForDiffShapesLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } TEST_P(LoopForConcatLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp index 7f1b23d0a6e..c3d0a5b8b40 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lrn.cpp @@ -63,8 +63,6 @@ protected: }; TEST_P(LRNLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "LRN"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp index 3a0d6bbd79d..d1dec40887a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_cell.cpp @@ -102,8 +102,6 @@ protected: }; TEST_P(LSTMCellLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNCell"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp index 1dbdfe01094..74767c5b199 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp @@ -175,8 +175,6 @@ protected: }; TEST_P(LSTMSequenceCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNSeq"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp index 435c5e90ee9..331ca07165a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul.cpp @@ -172,7 +172,6 @@ protected: }; TEST_P(MatMulLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() // due to disabled BF16 fakequant fusing: src/plugins/intel_cpu/src/graph_optimizer.cpp#L755, skip this case if (inType == ElementType::bf16) { if (cpuNodeType == "FullyConnected") { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/mvn.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/mvn.cpp index d9e039674bd..e9b4d33d300 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/mvn.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/mvn.cpp @@ -108,8 +108,6 @@ protected: }; TEST_P(MvnLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "MVN"); } @@ -505,4 +503,4 @@ const auto Mvn5DStatic = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn5D_Static, MvnLayerCPUTest, Mvn5DStatic, MvnLayerCPUTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp index 4bc79855e69..29bfaf35319 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp @@ -396,7 +396,6 @@ private: }; TEST_P(NmsLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); // CheckPluginRelatedResults(compiledModel, "NonMaxSuppression"); }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp index 0d388a9773b..50e90c11778 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/nonzero.cpp @@ -94,7 +94,6 @@ protected: }; TEST_P(NonZeroLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "NonZero"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp index 6be7455a98b..25e7ea59464 100755 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/normalize.cpp @@ -97,8 +97,6 @@ protected: }; TEST_P(NormalizeL2LayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "NormalizeL2"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp index 4d227ac7a80..47a10d1209a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/one_hot.cpp @@ -158,8 +158,6 @@ protected: }; TEST_P(OneHotLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "OneHot"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp index 298ec19c410..d71095ef945 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pad.cpp @@ -74,10 +74,7 @@ protected: }; TEST_P(PadLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); - CheckPluginRelatedResults(compiledModel, "Pad"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp index fe94768f52d..c22ac214a01 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/pooling.cpp @@ -205,15 +205,11 @@ protected: }; TEST_P(PoolingLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Pooling"); } TEST_P(MaxPoolingV8LayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Pooling"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp index 279b1bd7cc4..c4a13eb3d36 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box.cpp @@ -152,7 +152,6 @@ protected: }; TEST_P(PriorBoxLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "PriorBox"); } @@ -226,4 +225,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_PriorBox, PriorBoxLayerCPUTest, PriorBoxLayerCPUTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp index 3193a3968f7..3e49a9de004 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/prior_box_clustered.cpp @@ -139,7 +139,6 @@ protected: }; TEST_P(PriorBoxClusteredLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "PriorBoxClustered"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp index 7e0561e7339..3725e0ab278 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/proposal.cpp @@ -191,8 +191,6 @@ protected: }; TEST_P(ProposalLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Proposal"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/psroi_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/psroi_pooling.cpp index 9b627afa37c..1616b27f3c2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/psroi_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/psroi_pooling.cpp @@ -101,7 +101,6 @@ protected: }; TEST_P(PSROIPoolingLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() Run(); CheckPluginRelatedResults(executableNetwork, "PSROIPooling"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/range.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/range.cpp index 57e219b8afb..a5220cdfe5b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/range.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/range.cpp @@ -130,8 +130,7 @@ //}; // //TEST_P(RangeLayerCPUTest, CompareWithRefs) { -// SKIP_IF_CURRENT_TEST_IS_DISABLED() -// Run(); +// run(); // CheckPluginRelatedResults(executableNetwork, "Range"); //} // diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp index 0d1aec181c3..077ae8b48bd 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp @@ -90,8 +90,6 @@ protected: }; TEST_P(RDFTTestCPU, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RDFT"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/reduce_ops.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/reduce_ops.cpp index e4405d77fd9..bee3c86af71 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/reduce_ops.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/reduce_ops.cpp @@ -179,8 +179,6 @@ private: }; TEST_P(ReduceCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Reduce"); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp index 2d197d37b25..b598e9620d5 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/region_yolo.cpp @@ -90,7 +90,6 @@ protected: }; TEST_P(RegionYoloCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "RegionYolo"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp index 3d2097f7b23..4d31f478262 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_cell.cpp @@ -98,8 +98,6 @@ protected: }; TEST_P(RNNCellCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNCell"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp index 8d04347142a..4256709e59c 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp @@ -161,8 +161,6 @@ protected: }; TEST_P(RNNSequenceCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "RNNSeq"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp index 4f7d4f08528..4d3196e9776 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp @@ -218,7 +218,6 @@ protected: }; TEST_P(ROIPoolingCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ROIPooling"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp index 9193f02918e..e7c2f8c96e2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roialign.cpp @@ -166,7 +166,6 @@ protected: }; TEST_P(ROIAlignLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ROIAlign"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp index b0a6a0f7d38..419bcea1e38 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_ND_update.cpp @@ -115,7 +115,6 @@ protected: }; TEST_P(ScatterNDUpdateLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ScatterUpdate"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp index 061dff3afda..9738c0653ba 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_elements_update.cpp @@ -120,7 +120,6 @@ protected: }; TEST_P(ScatterElementsUpdateLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ScatterUpdate"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp index ed98b2e8fc6..e1ccc238b8a 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/scatter_update.cpp @@ -80,7 +80,6 @@ protected: }; TEST_P(ScatterUpdateLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ScatterUpdate"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp index 2fd37765f81..e46472daf37 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/select.cpp @@ -72,9 +72,7 @@ //}; // //TEST_P(SelectLayerCPUTest, CompareWithRefs) { -// SKIP_IF_CURRENT_TEST_IS_DISABLED() -// -// Run(); +// run(); // CheckPluginRelatedResults(executableNetwork, "Select"); //} // @@ -173,4 +171,4 @@ // //INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNone_dynamic, SelectLayerCPUTest, noneCases, SelectLayerCPUTest::getTestCaseName); // -//} // namespace CPULayerTestsDefinitions \ No newline at end of file +//} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp index c288ea254f6..7da9bcdbb9f 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp @@ -161,8 +161,6 @@ private: }; TEST_P(ShapeOpsCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Reshape"); } @@ -272,4 +270,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_dynamic_const, ShapeOpsCPUTest, p } // namespace unsqueezeTest -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp index 1bcf1de6891..9a20cd19407 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shapeof.cpp @@ -77,7 +77,6 @@ protected: }; TEST_P(ShapeOfLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "ShapeOf"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp index daa0e3ccee0..00bdfde376b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shuffle_channels.cpp @@ -73,8 +73,6 @@ protected: }; TEST_P(ShuffleChannelsLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "ShuffleChannels"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp index 7535fe0462a..922b5d80cbf 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/slice.cpp @@ -79,8 +79,6 @@ protected: }; TEST_P(Slice8LayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Slice8"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp index a1b74253905..3a938a46eff 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/softmax.cpp @@ -80,7 +80,6 @@ protected: }; TEST_P(SoftMaxLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckPluginRelatedResults(compiledModel, "Softmax"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp index 35f2b0ba681..900f07b6143 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_batch.cpp @@ -78,8 +78,6 @@ protected: }; TEST_P(SpaceToBatchCPULayerTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CPUTestsBase::CheckPluginRelatedResults(compiledModel, "SpaceToBatch"); }; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp index 9c384de0bdd..49591fe8675 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/space_to_depth.cpp @@ -79,8 +79,6 @@ protected: }; TEST_P(SpaceToDepthLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CPUTestsBase::CheckPluginRelatedResults(compiledModel, "SpaceToDepth"); } @@ -269,4 +267,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_CPUSpaceToDepthDynamicCPUSpecific5D, SpaceToDepth /* *========================* *==================* *========================* */ } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp index 0ff7bc52bc4..a9b76d32903 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/split.cpp @@ -91,8 +91,6 @@ protected: }; TEST_P(SplitLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); // CheckPluginRelatedResults(executableNetwork, "Split"); } @@ -552,4 +550,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Block16inPlace, SplitLayerCPUTest, } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp index 07d2f6d71d1..749b917ded7 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/strided_slice.cpp @@ -82,8 +82,6 @@ protected: }; TEST_P(StridedSliceLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "StridedSlice"); } @@ -415,8 +413,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_5D_Subset2, Stride class StridedSliceLayerDescriptorCPUTest : public StridedSliceLayerCPUTest {}; TEST_P(StridedSliceLayerDescriptorCPUTest, DescriptorsCheck) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - ASSERT_THROW(compile_model(), ov::Exception); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp index 9fadb9b21fb..6e84c581bf1 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tensor_iterator.cpp @@ -87,8 +87,6 @@ protected: }; TEST_P(TensorIteratorCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tile.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tile.cpp index d0405a18156..16b364e8231 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/tile.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/tile.cpp @@ -138,8 +138,6 @@ protected: }; TEST_P(TileLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Tile"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp index 306e443dee4..db73e5eed7d 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/topk.cpp @@ -218,8 +218,6 @@ private: }; TEST_P(TopKLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "TopK"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/transpose.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/transpose.cpp index 32ffc7920a6..af9fb594de9 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/transpose.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/transpose.cpp @@ -81,8 +81,6 @@ protected: }; TEST_P(TransposeLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Transpose"); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp index 3a69562d94d..6445a0eaec8 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/variadic_split.cpp @@ -75,8 +75,6 @@ protected: }; TEST_P(VariadicSplitLayerCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Split"); } @@ -501,4 +499,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_VariadicSplit4D_CPU_zero_dims_nspc_ncsp, Variadic } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/add_convert_to_reorder.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/add_convert_to_reorder.cpp index ad190d1f48b..1278decaadf 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/add_convert_to_reorder.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/add_convert_to_reorder.cpp @@ -65,12 +65,10 @@ namespace { Output[FP32] */ TEST_F(AddConvertToReorderTest, smoke_TestAddReorder_CPU) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - BuildGraph(ngraph::element::i8); Run(); CheckNumberOfNodesWithType(executableNetwork, "Convert", 0); CheckNumberOfNodesWithType(executableNetwork, "Reorder", 1); } } // namespace -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/align_matmul_input_ranks.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/align_matmul_input_ranks.cpp index bf2e33c4392..36ad2875f1e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/align_matmul_input_ranks.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/align_matmul_input_ranks.cpp @@ -67,8 +67,6 @@ protected: }; TEST_P(AlignMatMulInputRanksTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckNumberOfNodesWithType(executableNetwork, "Reshape", expectedNumOfReshapes); // Squeeze / Unsqueeze turns into Reshape CheckPluginRelatedResults(executableNetwork, "MatMul"); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/any_layout.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/any_layout.cpp index 48293ce6c8d..e8af2156ffb 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/any_layout.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/any_layout.cpp @@ -77,7 +77,6 @@ protected: }; TEST_P(AnyLayoutOnInputsAndOutputs, CheckExpectedResult) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_const_inplace.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_const_inplace.cpp index 3f07b59f8e0..8adaa778265 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_const_inplace.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_const_inplace.cpp @@ -69,8 +69,6 @@ public: namespace { TEST_P(ConcatConstantInPlaceTest, smoke_ConcatConstantInPlaceTest_CPU) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); if (this->GetParam() == Precision::BF16) CheckNumberOfNodesWithType(executableNetwork, "Reorder", 4); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_conv_sum_inplace.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_conv_sum_inplace.cpp index 2e8d557004a..6d79f8d8939 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_conv_sum_inplace.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/concat_conv_sum_inplace.cpp @@ -75,9 +75,7 @@ public: namespace { TEST_F(ReLuConcatConvSumInPlaceTest, smoke_ReLuConcatConvSumInPlace_CPU) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } } // namespace -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv3d_reshape.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv3d_reshape.cpp index d2cee9b4baf..179e7cff0f4 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv3d_reshape.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv3d_reshape.cpp @@ -79,8 +79,6 @@ protected: }; TEST_P(Conv3dReshapeTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_concat.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_concat.cpp index 887f3174ff7..281fdf73636 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_concat.cpp @@ -112,8 +112,6 @@ void ConvConcatSubgraphTest::SetUp() { } TEST_P(ConvConcatSubgraphTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckPluginRelatedResults(executableNetwork, pluginTypeNode); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_maxpool_activ.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_maxpool_activ.cpp index f635da02274..67bab77e65e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_maxpool_activ.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_maxpool_activ.cpp @@ -74,8 +74,6 @@ protected: }; TEST_P(ConvPoolActivTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckPluginRelatedResults(executableNetwork, "Convolution"); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp index 6199fa266f3..fb63e724488 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp @@ -146,8 +146,6 @@ protected: }; TEST_P(ConcatConvSumInPlaceTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Convolution"); @@ -212,8 +210,6 @@ public: }; TEST_P(ConcatConvSumInPlaceTestInt8, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Convolution"); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convs_and_sums.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convs_and_sums.cpp index cac5d952fa6..4c7d45504cf 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convs_and_sums.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/convs_and_sums.cpp @@ -74,8 +74,6 @@ protected: }; TEST_F(ConvsAndSums, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/denormal_check.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/denormal_check.cpp index 6127fb524fb..47bd2e91d41 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/denormal_check.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/denormal_check.cpp @@ -77,7 +77,6 @@ void SetUp() override { }; TEST_F(DenormalNullifyCheck, smoke_CPU_Denormal_Check) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() using indexInterval = std::pair; size_t elemsCount = pConstStorage->size(); const indexInterval intervals[] = { @@ -107,4 +106,4 @@ TEST_F(DenormalNullifyCheck, smoke_CPU_Denormal_Check) { run(); } } -}// namespace SubgraphTestsDefinitions \ No newline at end of file +}// namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp index 7f137fe4031..f30978e0ca2 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/eltwise_chain.cpp @@ -136,8 +136,6 @@ protected: }; TEST_P(EltwiseChainTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fullyconnected_strided_inputs_outputs.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fullyconnected_strided_inputs_outputs.cpp index 919c7e35b86..aeb0bfcc1c3 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fullyconnected_strided_inputs_outputs.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fullyconnected_strided_inputs_outputs.cpp @@ -93,8 +93,6 @@ protected: */ TEST_P(FullyConnectedStridedInputsOutputsTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_conv_fq_with_shared_constants.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_conv_fq_with_shared_constants.cpp index 57153513b99..682afbe9354 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_conv_fq_with_shared_constants.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_conv_fq_with_shared_constants.cpp @@ -54,10 +54,8 @@ public: namespace { TEST_F(ConvAndFQWithSharedConstants, smoke_ConvAndFQWithSharedConstants_CPU) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "Convolution"); } } // namespace -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_muladd_ewsimple.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_muladd_ewsimple.cpp index 93c3e13830e..5de9ebd5826 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_muladd_ewsimple.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_muladd_ewsimple.cpp @@ -54,8 +54,6 @@ void FuseMulAddAndEwSimpleTest1::CreateGraph() { } TEST_P(FuseMulAddAndEwSimpleTest1, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } @@ -79,8 +77,6 @@ void FuseMulAddAndEwSimpleTest2::CreateGraph() { } TEST_P(FuseMulAddAndEwSimpleTest2, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } @@ -103,8 +99,6 @@ void FuseMulAddAndEwSimpleTest3::CreateGraph() { } TEST_P(FuseMulAddAndEwSimpleTest3, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_non0_output_port.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_non0_output_port.cpp index 3160370178c..ffbd2553e49 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_non0_output_port.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_non0_output_port.cpp @@ -58,9 +58,7 @@ class FuseNon0OuputPort : public SubgraphBaseTest { }; TEST_F(FuseNon0OuputPort, smoke_FuseNon0OuputPort) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp index 32cbb8f5525..bf2433eb2de 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp @@ -80,8 +80,6 @@ protected: }; TEST_P(FuseScaleShiftAndFakeQuantizeTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_split_concat_pair_to_interpolate.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_split_concat_pair_to_interpolate.cpp index 29354dac772..3d977513618 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_split_concat_pair_to_interpolate.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_split_concat_pair_to_interpolate.cpp @@ -71,8 +71,6 @@ protected: }; TEST_P(FuseSplitConcatPairToInterpolateTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_transpose_reorder.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_transpose_reorder.cpp index db1faa023db..6f1353cc3dd 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_transpose_reorder.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/fuse_transpose_reorder.cpp @@ -91,8 +91,6 @@ void FuseTransposeAndReorderTest::CreateGraph() { } TEST_P(FuseTransposeAndReorderTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckTransposeCount(0); } @@ -168,8 +166,6 @@ void FuseTransposeAndReorderTest1::CreateGraph() { // Test disabled temporarily, it conflicts with TransposeFuse transformation in common optimizations step TEST_P(FuseTransposeAndReorderTest1, DISABLED_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckTransposeCount(2); } @@ -230,8 +226,6 @@ void FuseTransposeAndReorderTest2::CreateGraph() { } TEST_P(FuseTransposeAndReorderTest2, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckTransposeCount(1); } @@ -285,8 +279,6 @@ void FuseTransposeAndReorderTest3::CreateGraph() { } TEST_P(FuseTransposeAndReorderTest3, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckTransposeCount(1); } @@ -343,8 +335,6 @@ void FuseTransposeAndReorderTest4::CreateGraph() { } TEST_P(FuseTransposeAndReorderTest4, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckTransposeCount(0); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/gather_add_avgpool.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/gather_add_avgpool.cpp index 13aa7b47d7b..ccb0ba4c2f2 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/gather_add_avgpool.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/gather_add_avgpool.cpp @@ -63,8 +63,6 @@ protected: }; TEST_F(GatherAddAvgpool, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_noreorder_eltwise_bf16.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_noreorder_eltwise_bf16.cpp index fd1b1d788a1..3606a7bcfad 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_noreorder_eltwise_bf16.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_noreorder_eltwise_bf16.cpp @@ -51,8 +51,6 @@ protected: Output[BF16] */ TEST_F(InputNoReorderEltwiseBF16, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); CheckNumberOfNodesWithType(executableNetwork, "Reorder", 0); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_tensor_roi.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_tensor_roi.cpp index 9c8c16a0f81..e4c5ea8353b 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_tensor_roi.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/input_tensor_roi.cpp @@ -98,8 +98,6 @@ protected: }; TEST_P(InputTensorROI, SetInputTensorROI) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - switch (GetParam().type) { case ov::element::Type_t::f32: { Run(); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/interaction.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/interaction.cpp index 4631e5cbad5..41c6d7040dc 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/interaction.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/interaction.cpp @@ -175,7 +175,6 @@ protected: }; TEST_P(IntertactionCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() run(); CheckNumberOfNodesWithType(compiledModel, "Interaction", 1); } @@ -219,4 +218,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Interaction, IntertactionCPUTest, } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_strided_inputs_outputs.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_strided_inputs_outputs.cpp index 8566d9377b7..ebabbc4f215 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_strided_inputs_outputs.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/matmul_strided_inputs_outputs.cpp @@ -84,8 +84,6 @@ protected: */ TEST_P(MatmulStridedInputsOutputsTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } 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 ba151dcaef7..aa0c4bbe28e 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 @@ -219,8 +219,6 @@ protected: }; TEST_P(MHATest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - std::vector inputShapes; std::vector inputPrecisions; std::vector matMulIn0Precisions; @@ -491,8 +489,6 @@ protected: }; TEST_P(MHAQuantTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - std::vector inputShapes; std::vector inputPrecisions; std::vector matMulIn0Precisions; diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/not_fused_conv_simple_op.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/not_fused_conv_simple_op.cpp index 49bb8ef419d..ef7abc610fd 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/not_fused_conv_simple_op.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/not_fused_conv_simple_op.cpp @@ -40,8 +40,6 @@ protected: }; TEST_F(NotFusedConvSimpleOp, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/param_result_custom_blob.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/param_result_custom_blob.cpp index 2fe0804c225..0c72c5a61ce 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/param_result_custom_blob.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/param_result_custom_blob.cpp @@ -43,8 +43,6 @@ class ParameterResultCustomBlobTest : public ParameterResultSubgraphTestLegacyAp }; TEST_P(ParameterResultCustomBlobTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - // Just to show that it is not possible to set different precisions for inputs and outputs with the same name. // If it was possible, the input would have I8 precision and couldn't store data from the custom blob. inPrc = Precision::I8; @@ -76,8 +74,6 @@ protected: }; TEST_P(ParameterResultSameBlobTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } namespace { @@ -87,4 +83,4 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ParameterResultSubgraphTestBase::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp index f3a18b1d817..1378713f1dd 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_chain.cpp @@ -37,9 +37,7 @@ class ReshapeChain : public SubgraphBaseTest { }; TEST_F(ReshapeChain, smoke_ReshapeChain) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp index b24488289da..365f24ab320 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_fc.cpp @@ -93,8 +93,6 @@ protected: }; TEST_P(ReshapeFcCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckPluginRelatedResults(compiledModel, "FullyConnected"); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp index 5ea0c4ab76a..33e8462a2d7 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp @@ -83,8 +83,6 @@ protected: }; TEST_F(InPlaceReshapeFromConstantCheck, smoke_CPU_InPlaceReshapeFromConstantCheck) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp index cf788cd3cdc..587508dc66c 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/seq_native_order.cpp @@ -268,8 +268,6 @@ private: }; TEST_P(SequenceCPUTest, CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); CheckNumberOfNodesWithType(compiledModel, "RNNSeq", 1); CheckNumberOfNodesWithType(compiledModel, "Transpose", 0); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp index 7d8db39af3d..c9784634c3a 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/static_zero_dims.cpp @@ -54,9 +54,7 @@ protected: }; TEST_F(StaticZeroDims, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - run(); } -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/subgraph_with_blocked_format.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/subgraph_with_blocked_format.cpp index 816f6380402..0cc49b8ae7c 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/subgraph_with_blocked_format.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/subgraph_with_blocked_format.cpp @@ -49,7 +49,6 @@ protected: }; TEST_F(SubgraphWithBlockedFormat, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() Run(); } diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/tile_with_two_output_edges.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/tile_with_two_output_edges.cpp index 063530d5238..c5c83eadccd 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/tile_with_two_output_edges.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/tile_with_two_output_edges.cpp @@ -33,9 +33,7 @@ protected: }; TEST_F(TileWithTwoOutputEdges, smoke_CompareWithRefs) { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - Run(); } -} // namespace SubgraphTestsDefinitions \ No newline at end of file +} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp b/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp index f2dc81a4f35..69469bcdefe 100644 --- a/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp +++ b/src/plugins/intel_cpu/tests/functional/test_utils/cpu_test_utils.cpp @@ -116,6 +116,7 @@ std::string CPUTestsBase::impls2str(const std::vector &priority) { } void CPUTestsBase::CheckPluginRelatedResults(InferenceEngine::ExecutableNetwork &execNet, const std::string& nodeType) const { + if (!execNet) return; if (nodeType.empty()) return; ASSERT_TRUE(!selectedType.empty()) << "Node type is not defined."; @@ -125,6 +126,7 @@ void CPUTestsBase::CheckPluginRelatedResults(InferenceEngine::ExecutableNetwork } void CPUTestsBase::CheckPluginRelatedResults(const ov::CompiledModel &execNet, const std::string& nodeType) const { + if (!execNet) return; if (nodeType.empty()) return; ASSERT_TRUE(!selectedType.empty()) << "Node type is not defined."; @@ -371,11 +373,15 @@ inline void CheckNumberOfNodesWithTypeImpl(std::shared_ptr func } void CheckNumberOfNodesWithType(ov::CompiledModel &compiledModel, std::string nodeType, size_t expectedCount) { + if (!compiledModel) return; + std::shared_ptr function = compiledModel.get_runtime_model(); CheckNumberOfNodesWithTypeImpl(function, nodeType, expectedCount); } void CheckNumberOfNodesWithType(InferenceEngine::ExecutableNetwork &execNet, std::string nodeType, size_t expectedCount) { + if (!execNet) return; + InferenceEngine::CNNNetwork execGraphInfo = execNet.GetExecGraphInfo(); std::shared_ptr function = execGraphInfo.getFunction(); CheckNumberOfNodesWithTypeImpl(function, nodeType, expectedCount);