diff --git a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_with_blocked_format.cpp b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_with_blocked_format.cpp index 096a28a43c5a1e..d6af9a59cf2c32 100644 --- a/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_with_blocked_format.cpp +++ b/src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_with_blocked_format.cpp @@ -54,20 +54,18 @@ class SubgraphWithBlockedFormat : virtual public SubgraphBaseStaticTest { } void TearDown() override { - if (compiledModel) { - auto runtime_function = compiledModel.get_runtime_model(); - int nodes_found = 0; - for (const auto& n : runtime_function->get_ordered_ops()) { - auto layer_type = n->get_rt_info().at(ov::exec_model_info::LAYER_TYPE).as(); - if (layer_type == "Subgraph") { - nodes_found++; - auto output_layout = n->get_rt_info().at(ov::exec_model_info::OUTPUT_LAYOUTS).as(); - // convolution maybe chooses 'nhwc' and the subgraph will follow it - ASSERT_TRUE(output_layout == "aBcd8b" || output_layout == "aBcd16b" || output_layout == "acdb"); - } + auto runtime_function = compiledModel.get_runtime_model(); + int nodes_found = 0; + for (const auto& n : runtime_function->get_ordered_ops()) { + auto layer_type = n->get_rt_info().at(ov::exec_model_info::LAYER_TYPE).as(); + if (layer_type == "Subgraph") { + nodes_found++; + auto output_layout = n->get_rt_info().at(ov::exec_model_info::OUTPUT_LAYOUTS).as(); + // convolution maybe chooses 'nhwc' and the subgraph will follow it + ASSERT_TRUE(output_layout == "aBcd8b" || output_layout == "aBcd16b" || output_layout == "acdb"); } - ASSERT_GT(nodes_found, 0); } + ASSERT_GT(nodes_found, 0); } }; 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 ced018e03d0b35..67e65645de06ee 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 @@ -302,14 +302,15 @@ std::vector disabledTestPatterns() { R"(.*smoke_matmulBrgemmInt8/MatmulBrgemmInt8Test.CompareWithRefs.*MatMul.*InputType=i8_OutputType=i8.*)", R"(.*smoke_Snippets_MHAWOTransposeOnInputs_4D/MHAWOTransposeOnInputs.CompareWithRefImpl.*)", // fill_data_random fix - // R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/.*trip_count=5_exec_cond=1_netType=i8.*)", - // R"(.*smoke_Interpolate_Basic/InterpolateLayerTest.Inference/.*_InterpolateMode=cubic_ShapeCalcMode=scales_CoordinateTransformMode=tf_half_pixel_.*PB=\(0.0.0.0\)_PE=\(0.0.0.0\)_.*_netType=f32.*)", - // R"(.*smoke_Interpolate_Basic/InterpolateLayerTest.Inference/.*_InterpolateMode=cubic_ShapeCalcMode=scales_CoordinateTransformMode=asymmetric_.*_netType=f32.*)", - // R"(.*smoke_Interpolate_Basic_Down_Sample_Tail/InterpolateLayerTest.Inference/.*_InterpolateMode=cubic_ShapeCalcMode=scales_CoordinateTransformMode=tf_half_pixel_.*_PB=\(0.0.1.1\)_.*_netType=f32_.*)", - // R"(.*smoke_Snippets_ConvAdd/ConvEltwise.CompareWithRefImpl/IS\[0\]=\(1.10.16.16\)_IS\[1\]=\(1.10.16.16\)_Op=Add.*)", - // R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/Input0_IS=\[\?.1.\?\]_TS=\(10.1.10\)_\(1.1.1\)_\(1.1.1\)_\(5.1.3\)_Input1_IS=\[\?.\?.\?\]_TS=.*_Input2_IS=\[\?.1.\?\]_.*_types=0_0_1_trip_count_type=PARAMETER_trip_count=1_exec_cond=1_netType=i8.*)", - // R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/Input0_IS=\[1..10.1.1..10\]_.*_Input1_IS=\[1..8.1.1..8\]_.*_Input2_IS=\[1..10.\?.1..10\]_TS=.*_types=0_0_1_trip_count_type=PARAMETER_trip_count=1_exec_cond=1_netType=i8.*)", - // R"(.*SubgraphWithBlockedFormat.*)", + R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/.*trip_count=5_exec_cond=1_netType=i8.*)", + R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/Input0_IS=\[\?.1.\?\]_TS=\(10.1.10\)_\(1.1.1\)_\(1.1.1\)_\(5.1.3\)_Input1_IS=\[\?.\?.\?\]_TS=.*_Input2_IS=\[\?.1.\?\]_.*_types=0_0_1_trip_count_type=PARAMETER_trip_count=1_exec_cond=1_netType=i8.*)", + R"(.*smoke_LoopForCommon/LoopLayerCPUTest.CompareWithRefs/Input0_IS=\[1..10.1.1..10\]_.*_Input1_IS=\[1..8.1.1..8\]_.*_Input2_IS=\[1..10.\?.1..10\]_TS=.*_types=0_0_1_trip_count_type=PARAMETER_trip_count=1_exec_cond=1_netType=i8.*)", + R"(.*smoke_static/GridSampleLayerTestCPU.CompareWithRefs/.*_TS=.*(1.7.5.3|2.6.3.10).*_interpMode=NEAREST_padMode=REFLECTION_alignCorners=False_dataPrc=(f32|i32)_gridPrc=f32_.*)", + R"(.*smoke_static/GridSampleLayerTestCPU.CompareWithRefs/.*_TS=.*5.3.2.13.*_interpMode=BICUBIC_padMode=REFLECTION_alignCorners=True_dataPrc=f32_gridPrc=f32_.*)", + R"(.*smoke_static/GridSampleLayerTestCPU.CompareWithRefs/.*_TS=.*2.1.6.16.*_interpMode=NEAREST_padMode=(BORDER|REFLECTION)_alignCorners=(True|False)_dataPrc=(f32|i32)_gridPrc=f32_.*)", + R"(.*smoke_dynamic/GridSampleLayerTestCPU.CompareWithRefs/IS=\(\[2..15.\?.\?.\?\]_\[\?.3.7.2\]\)_.*_interpMode=NEAREST_padMode=REFLECTION_alignCorners=False_dataPrc=f32_gridPrc=f32_.*)", + R"(.*smoke_dynamic/GridSampleLayerTestCPU.CompareWithRefs/IS=\(\[\?.\?.\?.\?\]_\[\?.\?.\?.\?\]\).*interpMode=NEAREST_padMode=REFLECTION_alignCorners=False_dataPrc=f32_gridPrc=f32_.*)", + R"(.*smoke_dynamic/GridSampleLayerTestCPU.CompareWithRefs/IS=\(\[\?.3.\?.\?\]_\[\?.\?.\?.2\]\).*interpMode=BICUBIC_padMode=REFLECTION_alignCorners=True_dataPrc=f32_gridPrc=f32_.*)", }; #if defined(OPENVINO_ARCH_X86) @@ -362,11 +363,7 @@ std::vector disabledTestPatterns() { retVector.emplace_back(R"(smoke_VariableStateBasic/InferRequestVariableStateTest.*)"); retVector.emplace_back(R"(smoke_VariableState/OVInferRequestVariableStateTest.*)"); // fill_data_random fix - // retVector.emplace_back(R"(.*smoke_MVNMultiplyAdd_3D/MVNMultiplyAdd.CompareWithRefs/IS=\(2.17.9\)_CS=\(1.1.9\)_DataET=f32_AxET=i64_Ax=\(2\)_NormVariance=TRUE_Eps=1e-09_EM=(inside|outside)_sqrt.*)"); - // retVector.emplace_back(R"(.*smoke_Activation5D_dynamicMath_CPU/ActivationLayerCPUTest.CompareWithRefs/Log_IS=\(\[\?.\?\]\)_TS=\(1.50\)_\(5.128\)_\(3.64\)_AS=\(\)_ConstantsValue=\(\)_netPRC=f32_inPRC=f32_outPRC=f32.*)"); - // retVector.emplace_back(R"(.*smoke_Activation5D_dynamicMath_CPU/ActivationLayerCPUTest.CompareWithRefs/Log_IS=\(\[1..5.128\]\)_TS=\(1.128\)_\(3.128\)_\(5.128\)_AS=\(\)_ConstantsValue=\(\)_netPRC=f32_inPRC=f32_outPRC=f32.*)"); - // retVector.emplace_back(R"(.*smoke_Interpolate_Basic/InterpolateLayerTest.Inference/.*_InterpolateMode=(linear|linear_onnx)_ShapeCalcMode=scales_CoordinateTransformMode=asymmetric_NearestMode=round_prefer_floor_cube_.*_PB=\(0.0.0.0\)_PE=\(0.0.0.0\)_Axes=\(0.1.2.3\)_.*_netType=f32.*)"); - // retVector.emplace_back(R"(.*smoke_arm_Deconv_2D_Planar_FP16/DeconvolutionLayerCPUTest.*)"); + retVector.emplace_back(R"(.*smoke_arm_Deconv_2D_Planar_FP16/DeconvolutionLayerCPUTest.*INFERENCE_PRECISION_HINT=f16.*)"); #endif #if defined(OPENVINO_ARCH_ARM) @@ -503,8 +500,8 @@ std::vector disabledTestPatterns() { retVector.emplace_back(R"(.*smoke_Snippets_MHABF16_4D/MHA.CompareWithRefImpl/.*\[1.58.16.34\]_IS\[1\]=\[1.58.16.34\]_IS\[2\]=\[1.1.1.58\]_IS\[3\]=\[1.58.16.34\].*)"); retVector.emplace_back(R"(.*smoke_Snippets_MHAWOTransposeBF16_(3|4)D/MHAWOTranspose.*)"); // fill_data_random_fix - // retVector.emplace_back(R"(.*smoke_Deconv_(2|3)D_NSPC_INT8_AMX/DeconvolutionLayerCPUTest.*)"); - // retVector.emplace_back(R"(.*smoke_Deconv_(2|3)D_NSPC_INT8_AMX/DeconvolutionLayerCPUTest.*)"); + retVector.emplace_back(R"(.*smoke_Deconv_(2|3)D_NSPC_INT8_AMX/DeconvolutionLayerCPUTest.*)"); + retVector.emplace_back(R"(.*smoke_Deconv_(2|3)D_NSPC_INT8_AMX/DeconvolutionLayerCPUTest.*)"); } if (ov::with_cpu_x86_avx512_core_fp16()) { 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 931ecb0ecf0d05..2b2c2c92f71d29 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 @@ -201,17 +201,6 @@ std::vector disabledTestPatterns() { R"(.*smoke_RDFT_5d_last_axis/RDFTLayerTest.Inference/IS=\(10.4.8.2.5\)_modelType=f32_Axes=\(0.1.2.3.4\)_SignalSize=\(\).*)", // Issue: 136862 R"(.*smoke_ConditionGPUTest_static/StaticConditionLayerGPUTest.CompareWithRefs/IS=\(3.6\)_netPRC=i8_ifCond=PARAM_targetDevice=GPU_.*)", - // fill_data_randoom fix - // R"(.*smoke_CTCLoss_Set2/CTCLossLayerTest.Inference/IS=.*_TS=.*3.6.8.*_LL=.*6.5.6.*_A=.*2.1.5.3.2.6.*3.3.3.3.3.3.*6.5.6.5.6.5.*_AL=\(4.3.5\)_BI=0_PCR=(1|0)_CMR=(1|0)_U=0_PF=f16_PI=(i64|i32)_.*)", - // R"(.*smoke_CTCLoss_Set2/CTCLossLayerTest.Inference/IS=.*_TS=.*3.6.8.*_LL=.*6.5.6.*_A=.*2.1.5.3.2.6.*3.3.3.3.3.3.*6.5.6.5.6.5.*_AL=\(4.3.5\)_BI=0_PCR=(1|0)_CMR=1_U=1_PF=f16_PI=(i64|i32)_.*)", - // R"(.*smoke_DeformablePSROIPooling/DeformablePSROIPoolingLayerTest.Inference/IS=.*_TS=\{\((1.8.67.32|3.8.16.16)\)_\(10.5\)\}_out_dim=2_group_size=2_scale=0.5_bins_x=3_bins_y=3_trans_std=(0|0.01|0.5)_part_size=2_prec=f16_dev=GPU.*)", - // R"(.*smoke_DeformablePSROIPooling/DeformablePSROIPoolingLayerTest.Inference/IS=.*_TS=\{\((1.8.67.32|3.8.16.16)\)_\(10.5\)_\(10.2.2.2\)\}_out_dim=2_group_size=2_scale=0.5_bins_x=3_bins_y=3_trans_std=0_part_size=2_prec=f16_dev=GPU.*)", - // R"(.*smoke_DetectionOutput3In/DetectionOutputLayerTest.Inference/.*LOC=\((1|2).660\)_CONF=\((1|2).165\)_PRIOR=.*_decrId=1.*)", - // R"(.*smoke_GenerateProposalsLayerTest_(f32|f16)/GenerateProposalsLayerTest.GenerateProposalsLayerTests/im_info=\[\]_\(\[2,3\]\)_anchors=\[\]_\(\[2,6,3,4\]\)_deltas=\[\]_\(\[2,12,2,6\]\)_scores=\[\]_\(\[2,3,2,6\]\).*)", - // R"(.*smoke_MVN_4D/Mvn6LayerTest.Inference/IS=.*_TS=.*1.10.5.17.*_ModelType=f16_AxType=(i32|i64)_Ax=\(1.2.3\).*_EM=(inside|outside)_sqrt.*)", - // R"(.*smoke_GPUDetectionOutputDynamic3In2/DetectionOutputLayerGPUTest.Inference/.*_\(\[1,660\].\[1,1320\]\)_.*=\(50\)_codeType=caffe.PriorBoxParameter.CORNER_.*_clipAfterNms=1_clipBeforeNms=1_decrId=1_norm=(1|0)_inH=(1|10)_inW=(1|10)_OS=0.4.*)", - // R"(.*smoke_ROIPoolingGPU_bilinear/ROIPoolingLayerGPUTest.Inference/netPRC=f32_\[1..8.3..5.7..60.5..50\]_\[1..5.5\]_TS=.*3.4.50.50.*1.3.7.8.*8.5.59.5.*1.3.7.8.*1.5.*2.5.*1.5.*2.5.*PS=\(6.6\)_Scale=1_Bilinear__RandomProposal.*)", - // R"(.*smoke_RMSNormDecomposition_basic/RMSNormDecomposition.Inference.*IS=\(\[\?.\?.\?\]_\)_TS=\(\(1.2.16\)\)_input_precision=f16.*)", #if defined(_WIN32) // by calc abs_threshold with expected value R"(.*smoke_RemoteTensor/OVRemoteTensorBatched_Test.NV12toBGR_buffer/(num_batch_4|num_batch_2).*)", diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/rms_norm_decomposition.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/rms_norm_decomposition.cpp index 161b8139708dde..bf515ed78fec5a 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/rms_norm_decomposition.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/rms_norm_decomposition.cpp @@ -129,12 +129,10 @@ class RMSNormDecomposition : public testing::WithParamInterface{}( std::string(::testing::UnitTest::GetInstance()->current_test_info()->test_suite_name()) + diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index f22ef411fd069b..d4df10444caac8 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -237,7 +237,7 @@ void inline fill_data_random(T* pointer, start_from = 0; } for (std::size_t i = 0; i < size; i++) { - pointer[i] = static_cast(start_from + static_cast(random.Generate(k_range)) / k); + pointer[i] = static_cast(start_from + static_cast(random.Generate(k_range)) / k); } }