IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced gtest deprecated macro (#7779)

Browse Source
This commit is contained in:
Ilya Lavrenov 2021-10-01 03:46:32 +03:00 committed by GitHub
parent 778cc2ddbb
commit 302eb08dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request_dynamic.cpp
View File

@ -14,7 +14,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
{}
};
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestDynamicTests,
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestDynamicTests,
::testing::Combine(
::testing::Values(ngraph::builder::subgraph::makeSplitConvConcat()),
::testing::Values(std::vector<std::pair<std::vector<size_t>, std::vector<size_t>>>{{{1, 4, 20, 20}, {1, 10, 18, 18}},

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/depth_to_space.cpp
View File

@ -30,7 +30,7 @@ const std::vector<std::vector<size_t>> inputShapesBS2 = {
{2, 16, 5, 4}, {1, 8, 1, 1, 1}, {1, 8, 2, 2, 2}, {1, 8, 3, 3, 3},
{2, 32, 3, 3, 3}, {2, 16, 5, 4, 6}};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_DepthToSpaceSerialization, DepthToSpaceLayerTest,
::testing::Combine(::testing::ValuesIn(inputShapesBS2),
::testing::ValuesIn(inputPrecisions),

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/grn.cpp
View File

@ -29,7 +29,7 @@ const auto basicCases = ::testing::Combine(
::testing::Values(1e-6f),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(smoke_GRN_Serialization, GrnLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GRN_Serialization, GrnLayerTest,
basicCases,
GrnLayerTest::getTestCaseName);
} // namespace

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/matrix_nms.cpp
View File

@ -56,5 +56,5 @@ namespace {
::testing::ValuesIn(decayFunction),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(smoke_MatrixNmsLayerTest, MatrixNmsLayerTest, nmsParams, MatrixNmsLayerTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_MatrixNmsLayerTest, MatrixNmsLayerTest, nmsParams, MatrixNmsLayerTest::getTestCaseName);
} // namespace

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/multiclass_nms.cpp
View File

@ -53,7 +53,7 @@ const auto nmsParams = ::testing::Combine(
::testing::ValuesIn(normalized)),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(smoke_MulticlassNmsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_MulticlassNmsLayerTest,
MulticlassNmsLayerTest,
nmsParams,
MulticlassNmsLayerTest::getTestCaseName);

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp
View File

@ -19,7 +19,7 @@ namespace {
InferenceEngine::Precision::FP16
};
INSTANTIATE_TEST_CASE_P(smoke_ReshapeSerialization, ReshapeLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_ReshapeSerialization, ReshapeLayerTest,
::testing::Combine(
::testing::Values(true),
::testing::ValuesIn(netPrecisions),

2
inference-engine/tests/functional/inference_engine/serialization/single_layer/space_to_depth.cpp
View File

@ -35,7 +35,7 @@ const auto SpaceToDepthBS2 = ::testing::Combine(
::testing::ValuesIn(modes), ::testing::Values(1, 2),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_SpaceToDepthSerialization, SpaceToDepthLayerTest,
::testing::Combine(::testing::ValuesIn(inputShapesBS2),
::testing::ValuesIn(inputPrecisions),

2
inference-engine/tests/functional/inference_engine/transformations/fq_mul_fusion_test.cpp
View File

@ -178,7 +178,7 @@ INSTANTIATE_TEST_SUITE_P(FQInOUt_ones__multiplier_4D_with_channel, FQMulFusion,
::testing::Values(ngraph::Shape{1, 64, 3, 3}),
::testing::Values(ngraph::Shape{1, 64, 3, 3})));
INSTANTIATE_TEST_CASE_P(FQInOUt_ones__multiplier_3D, FQMulFusion,
INSTANTIATE_TEST_SUITE_P(FQInOUt_ones__multiplier_3D, FQMulFusion,
::testing::Combine(::testing::Values(ngraph::Shape{1, 128, 512}),
::testing::Values(ngraph::Shape{1}),
::testing::Values(ngraph::Shape{1}),

4
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request/infer_requset_dynamic.cpp
View File

@ -57,7 +57,7 @@ std::shared_ptr<ngraph::Function> getFunction2() {
return std::make_shared<ngraph::Function>(concat, params, "SplitAddConcat");
}
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests_1, InferRequestDynamicTests,
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_1, InferRequestDynamicTests,
::testing::Combine(
::testing::Values(getFunction1()),
::testing::Values(std::vector<std::pair<std::vector<size_t>, std::vector<size_t>>>{
@ -67,7 +67,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests_1, InferRequestDynamicTests,
::testing::ValuesIn(configs)),
InferRequestDynamicTests::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests_2, InferRequestDynamicTests,
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_2, InferRequestDynamicTests,
::testing::Combine(
::testing::Values(getFunction2()),
::testing::Values(std::vector<std::pair<std::vector<size_t>, std::vector<size_t>>>{

6
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pad_transformation.cpp
View File

@ -77,7 +77,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),
@ -140,7 +140,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),
@ -184,7 +184,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),

10
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp
View File

@ -43,7 +43,7 @@ const auto batch_to_space_2d_tests = ::testing::Combine(
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_BatchToSpace_2D,
BatchToSpaceLayerTest,
batch_to_space_2d_tests,
@ -96,13 +96,13 @@ const auto batch_to_space_4d_channel_dim_tests = ::testing::Combine(
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_BatchToSpace_4D_spatial_dims,
BatchToSpaceLayerTest,
batch_to_space_4d_spatial_dims_tests,
BatchToSpaceLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_BatchToSpace_4D_channel_dim,
BatchToSpaceLayerTest,
batch_to_space_4d_channel_dim_tests,
@ -153,13 +153,13 @@ const auto batch_to_space_5d_channel_dim_tests = ::testing::Combine(
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_BatchToSpace_5D_spatial_dims,
BatchToSpaceLayerTest,
batch_to_space_5d_spatial_dims_tests,
BatchToSpaceLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
smoke_BatchToSpace_5D_channel_dim,
BatchToSpaceLayerTest,
batch_to_space_5d_channel_dim_tests,

2
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/grn.cpp
View File

@ -31,7 +31,7 @@ const auto basicCases = ::testing::Combine(
::testing::Values(1e-6f, 0.33f, 1.1f, 2.25f, 100.25f),
::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(smoke_GRN_Basic, GrnLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GRN_Basic, GrnLayerTest,
basicCases,
GrnLayerTest::getTestCaseName);
} // namespace

24
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp
View File

@ -54,7 +54,7 @@ const auto groupConvBackpropData1DParams_AutoPadValid = ::testing::Combine(
::testing::ValuesIn(emptyOutputPadding)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData1DParams_ExplicitPadding,
::testing::ValuesIn(netPrecisions),
@ -67,7 +67,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConv
::testing::Values(CommonTestUtils::DEVICE_CPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_AutoPadValid, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData1D_AutoPadValid, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData1DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -112,7 +112,7 @@ const auto groupConvBackpropData2DParams_AutoPadValid = ::testing::Combine(
::testing::ValuesIn(emptyOutputPadding)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData2DParams_ExplicitPadding,
::testing::ValuesIn(netPrecisions),
@ -125,7 +125,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConv
::testing::Values(CommonTestUtils::DEVICE_CPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData2DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -141,7 +141,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBac
const std::vector<std::vector<size_t >> inputShape2D = {{1, 16, 9, 12}};
const std::vector<std::vector<size_t >> outputShapes2D = {{6, 6}, {4, 9}};
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_OutputShapeDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_OutputShapeDefined, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData2DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -180,7 +180,7 @@ const auto conv2DParams_AutoPadValid_output_padding = ::testing::Combine(
::testing::ValuesIn(outputPadding2D)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_ExplicitPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
::testing::Combine(
conv2DParams_AutoPadValid_output_padding,
::testing::ValuesIn(netPrecisions),
@ -193,7 +193,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding_OutputPadd
::testing::Values(CommonTestUtils::DEVICE_CPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_AutoPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
::testing::Combine(
conv2DParams_ExplicitPadding_output_padding,
::testing::ValuesIn(netPrecisions),
@ -238,7 +238,7 @@ const auto groupConvBackpropData3DParams_AutoPadValid = ::testing::Combine(
::testing::ValuesIn(emptyOutputPadding)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData3DParams_ExplicitPadding,
::testing::ValuesIn(netPrecisions),
@ -251,7 +251,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConv
::testing::Values(CommonTestUtils::DEVICE_CPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData3DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -267,7 +267,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBac
const std::vector<std::vector<size_t >> inputShape3D = {{1, 16, 10, 10, 10}};
const std::vector<std::vector<size_t >> outputShapes3D = {{8, 8, 8}, {10, 10, 10}};
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_OutputShapeDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_OutputShapeDefined, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData3DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -306,7 +306,7 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine(
::testing::ValuesIn(outputPadding3D)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_ExplicitPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
::testing::Combine(
conv3DParams_AutoPadValid_output_padding,
::testing::ValuesIn(netPrecisions),
@ -319,7 +319,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding_OutputPadd
::testing::Values(CommonTestUtils::DEVICE_CPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_AutoPadding_OutputPaddingDefined, GroupConvBackpropLayerTest,
::testing::Combine(
conv3DParams_ExplicitPadding_output_padding,
::testing::ValuesIn(netPrecisions),

2
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/matrix_nms.cpp
View File

@ -51,4 +51,4 @@ const auto nmsParams = ::testing::Combine(::testing::ValuesIn(inShapeParams),
::testing::Values(CommonTestUtils::DEVICE_CPU)
);
INSTANTIATE_TEST_CASE_P(smoke_MatrixNmsLayerTest, MatrixNmsLayerTest, nmsParams, MatrixNmsLayerTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_MatrixNmsLayerTest, MatrixNmsLayerTest, nmsParams, MatrixNmsLayerTest::getTestCaseName);

2
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/multiclass_nms.cpp
View File

@ -34,4 +34,4 @@ const auto nmsParams = ::testing::Combine(
::testing::ValuesIn(backgroundClass), ::testing::ValuesIn(keepTopK), ::testing::ValuesIn(outType), ::testing::ValuesIn(sortResultType),
::testing::Combine(::testing::ValuesIn(sortResDesc), ::testing::ValuesIn(normalized)), ::testing::Values(CommonTestUtils::DEVICE_CPU));
INSTANTIATE_TEST_CASE_P(smoke_MulticlassNmsLayerTest, MulticlassNmsLayerTest, nmsParams, MulticlassNmsLayerTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_MulticlassNmsLayerTest, MulticlassNmsLayerTest, nmsParams, MulticlassNmsLayerTest::getTestCaseName);

2
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/nonzero.cpp
View File

@ -26,7 +26,7 @@ namespace {
ConfigMap config;
INSTANTIATE_TEST_CASE_P(smoke_nonzero, NonZeroLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_nonzero, NonZeroLayerTest,
::testing::Combine(
::testing::ValuesIn(inShapes),
::testing::ValuesIn(inputPrecisions),

2
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/concat_resize_concat.cpp
View File

@ -106,7 +106,7 @@ namespace {
const std::vector<int> channel_count = { 1, 2 };
INSTANTIATE_TEST_CASE_P(smoke_ConcResizeConc,
INSTANTIATE_TEST_SUITE_P(smoke_ConcResizeConc,
ConcatResizeConcatTest, ::testing::Combine(
::testing::Values(ngraph::opset4::Interpolate::type_info),
::testing::ValuesIn(channel_count),

2
inference-engine/tests/functional/plugin/cpu/single_layer_tests/roi_pooling.cpp
View File

@ -237,7 +237,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ROIPoolingCPU_bilinear,
::testing::ValuesIn(additionalConfig)),
ROIPoolingCPULayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_ROIPoolingCPU_bilinear_ultimateRightBorderProposal,
INSTANTIATE_TEST_SUITE_P(smoke_ROIPoolingCPU_bilinear_ultimateRightBorderProposal,
ROIPoolingCPULayerTest,
::testing::Combine(::testing::Combine(::testing::Values(std::vector<size_t> { 1, 1, 50, 50 }),
::testing::Values(std::vector<size_t> { 1, 5 }),

4
inference-engine/tests/functional/plugin/gna/pass_tests/convert_dwsc_to_scaleshifts.cpp
View File

@ -171,7 +171,7 @@ const auto convParams = ::testing::Combine(
::testing::ValuesIn(biases)
);
INSTANTIATE_TEST_CASE_P(smoke_DWSCToScaleShifts, DWSCToScaleShiftsTest,
INSTANTIATE_TEST_SUITE_P(smoke_DWSCToScaleShifts, DWSCToScaleShiftsTest,
::testing::Combine(
convParams,
::testing::ValuesIn(netPrecisions),
@ -202,7 +202,7 @@ const auto convParamsSD = ::testing::Combine(
::testing::ValuesIn(biases)
);
INSTANTIATE_TEST_CASE_P(smoke_DWSCToScaleShiftsStridesDilations, DWSCToScaleShiftsTest,
INSTANTIATE_TEST_SUITE_P(smoke_DWSCToScaleShiftsStridesDilations, DWSCToScaleShiftsTest,
::testing::Combine(
convParamsSD,
::testing::ValuesIn(netPrecisions),

6
inference-engine/tests/functional/plugin/gna/pass_tests/convert_padded_to_valid_conv.cpp
View File

@ -331,7 +331,7 @@ const auto misc2DParams = ::testing::Combine(
::testing::ValuesIn(maxpool2DStrides)
);
INSTANTIATE_TEST_CASE_P(smoke_1DPaddedToValid, PaddedToValidConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_1DPaddedToValid, PaddedToValidConvTest,
::testing::Combine(
conv1DParams,
misc1DParams,
@ -342,7 +342,7 @@ INSTANTIATE_TEST_CASE_P(smoke_1DPaddedToValid, PaddedToValidConvTest,
::testing::ValuesIn(models)),
PaddedToValidConvTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_1DPaddedToValid, Gna30PaddedToValidConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_1DPaddedToValid, Gna30PaddedToValidConvTest,
::testing::Combine(
conv1DParams,
misc1DParams,
@ -353,7 +353,7 @@ INSTANTIATE_TEST_CASE_P(smoke_1DPaddedToValid, Gna30PaddedToValidConvTest,
::testing::ValuesIn(models)),
Gna30PaddedToValidConvTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_2DPaddedToValid, Gna30PaddedToValidConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_2DPaddedToValid, Gna30PaddedToValidConvTest,
::testing::Combine(
conv2DParams,
misc2DParams,

6
inference-engine/tests/functional/plugin/gna/pass_tests/decompose_2d_conv.cpp
View File

@ -266,7 +266,7 @@ const auto miscParams = ::testing::Combine(
::testing::ValuesIn(maxpool1DStrides)
);
INSTANTIATE_TEST_CASE_P(smoke_Decompose2DConv, Decompose2DConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_Decompose2DConv, Decompose2DConvTest,
::testing::Combine(
conv2DParams,
miscParams,
@ -311,7 +311,7 @@ const auto conv2DParamsStrides = ::testing::Combine(
::testing::ValuesIn(padTypesStrides)
);
INSTANTIATE_TEST_CASE_P(smoke_Decompose2DConvStridesDilations, Decompose2DConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_Decompose2DConvStridesDilations, Decompose2DConvTest,
::testing::Combine(
conv2DParamsStrides,
miscParams,
@ -367,7 +367,7 @@ const auto miscParamsGNA30 = ::testing::Combine(
::testing::ValuesIn(maxpoo2DStridesGNA30)
);
INSTANTIATE_TEST_CASE_P(smoke_Decompose2DConvGNA30, Decompose2DConvTest,
INSTANTIATE_TEST_SUITE_P(smoke_Decompose2DConvGNA30, Decompose2DConvTest,
::testing::Combine(
conv2DParamsGNA30,
miscParamsGNA30,

4
inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_export_multi_inputs.cpp
View File

@ -96,7 +96,7 @@ const std::vector<std::map<std::string, std::string>> importConfigsUnchanged = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportMultiInputUnchanged,
INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkGNA, ImportMultiInputUnchanged,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::Values(CommonTestUtils::DEVICE_GNA),
@ -105,7 +105,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportMultiInputUnchanged,
::testing::Values("")),
ImportMultiInputUnchanged::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportMultiInputChanged,
INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkGNA, ImportMultiInputChanged,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::Values(CommonTestUtils::DEVICE_GNA),

4
inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp
View File

@ -90,7 +90,7 @@ const std::vector<std::string> appHeaders = {
"APPLICATION_HEADER"
};
INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportExportGNAModelUnchanged,
INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkGNA, ImportExportGNAModelUnchanged,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::Values(CommonTestUtils::DEVICE_GNA),
@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportExportGNAModelUnchanged,
::testing::ValuesIn(appHeaders)),
ImportExportGNAModelUnchanged::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkGNA, ImportExportGNAModelChanged,
INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkGNA, ImportExportGNAModelChanged,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::Values(CommonTestUtils::DEVICE_GNA),

2
inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/convolution_relu_sequence.cpp
View File

@ -334,7 +334,7 @@ const std::vector<convReluSpecificParamsAll> poolingStrideNotEqualWindowAll = {
}
};
INSTANTIATE_TEST_CASE_P(smoke_ConvolutionPoolingStrideNotEqualWindowTest, ConvolutionReluSequenceTest,
INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionPoolingStrideNotEqualWindowTest, ConvolutionReluSequenceTest,
::testing::Combine(
::testing::ValuesIn(poolingStrideNotEqualWindowAll),
::testing::ValuesIn(netPrecisions),

2
inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/relu_split_reshape.cpp
View File

@ -33,7 +33,7 @@ std::vector<std::map<std::string, std::string>> additional_config = {
}
};
INSTANTIATE_TEST_CASE_P(smoke_relu_split_reshape, ReluSplitReshape,
INSTANTIATE_TEST_SUITE_P(smoke_relu_split_reshape, ReluSplitReshape,
::testing::Combine(
::testing::ValuesIn(inputShape),
::testing::ValuesIn(splitAxis),

6
inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pad_transformation.cpp
View File

@ -56,7 +56,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
}
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),
@ -78,7 +78,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),
@ -106,7 +106,7 @@ const std::vector<LayerTestsDefinitions::PadTransformationParam> params = {
},
};
INSTANTIATE_TEST_CASE_P(smoke_LPT, PadTransformation,
INSTANTIATE_TEST_SUITE_P(smoke_LPT, PadTransformation,
::testing::Combine(
::testing::ValuesIn(netPrecisions),
::testing::ValuesIn(inputShapes),

40
inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_elements.cpp
View File

@ -24,7 +24,7 @@ const std::vector<InferenceEngine::Precision> idxPrecisions = {
InferenceEngine::Precision::I64,
};
INSTANTIATE_TEST_CASE_P(smoke_set1, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_set1, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>({2, 2})),
::testing::Values(std::vector<size_t>({2, 2})),
@ -34,7 +34,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set1, GatherElementsLayerTest,
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_set2, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_set2, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>({2, 2, 1})),
::testing::Values(std::vector<size_t>({4, 2, 1})),
@ -44,7 +44,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set2, GatherElementsLayerTest,
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_set3, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_set3, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>({2, 2, 3, 5})),
::testing::Values(std::vector<size_t>({2, 2, 3, 7})),
@ -54,7 +54,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set3, GatherElementsLayerTest,
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_set4, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_set4, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>({3, 2, 3, 8})),
::testing::Values(std::vector<size_t>({2, 2, 3, 8})),
@ -64,7 +64,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set4, GatherElementsLayerTest,
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_set5, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_set5, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>({3, 2, 3, 4, 8})),
::testing::Values(std::vector<size_t>({3, 2, 3, 5, 8})),
@ -74,7 +74,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set5, GatherElementsLayerTest,
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis0, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank4axis0, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{7, 7, 8, 4}),
::testing::Values(std::vector<size_t>{2, 7, 8, 4}),
@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis0, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis1, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank4axis1, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{6, 1, 8, 4}),
::testing::Values(std::vector<size_t>{6, 8, 8, 4}),
@ -94,7 +94,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis1, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis2, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank4axis2, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{6, 7, 4, 4}),
::testing::Values(std::vector<size_t>{6, 7, 2, 4}),
@ -104,7 +104,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis2, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis3, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank4axis3, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{6, 5, 8, 7}),
::testing::Values(std::vector<size_t>{6, 5, 8, 7}),
@ -114,7 +114,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank4axis3, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis0, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank5axis0, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{2, 3, 9, 4, 9}),
::testing::Values(std::vector<size_t>{1, 3, 9, 4, 9}),
@ -124,7 +124,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis0, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis1, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank5axis1, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{2, 3, 5, 4, 7}),
::testing::Values(std::vector<size_t>{2, 9, 5, 4, 7}),
@ -134,7 +134,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis1, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis2, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank5axis2, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{1, 2, 6, 8, 9}),
::testing::Values(std::vector<size_t>{1, 2, 6, 8, 9}),
@ -144,7 +144,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis2, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis3, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank5axis3, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{2, 2, 4, 7, 7}),
::testing::Values(std::vector<size_t>{2, 2, 4, 3, 7}),
@ -154,7 +154,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis3, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis4, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank5axis4, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{1, 3, 9, 3, 2}),
::testing::Values(std::vector<size_t>{1, 3, 9, 3, 9}),
@ -164,7 +164,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank5axis4, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis0, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis0, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{3, 3, 2, 4, 4, 3}),
::testing::Values(std::vector<size_t>{7, 3, 2, 4, 4, 3}),
@ -174,7 +174,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis0, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis1, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis1, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{1, 6, 2, 3, 5, 9}),
::testing::Values(std::vector<size_t>{1, 6, 2, 3, 5, 9}),
@ -184,7 +184,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis1, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis2, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis2, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{2, 3, 9, 7, 2, 1}),
::testing::Values(std::vector<size_t>{2, 3, 5, 7, 2, 1}),
@ -194,7 +194,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis2, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis3, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis3, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{1, 3, 4, 5, 1, 3}),
::testing::Values(std::vector<size_t>{1, 3, 4, 4, 1, 3}),
@ -204,7 +204,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis3, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis4, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis4, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{1, 3, 2, 4, 3, 3}),
::testing::Values(std::vector<size_t>{1, 3, 2, 4, 6, 3}),
@ -214,7 +214,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis4, GatherElementsLayerTest
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GatherElementsLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GatherElements_rank6axis5, GatherElementsLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GatherElements_rank6axis5, GatherElementsLayerTest,
::testing::Combine(
::testing::Values(std::vector<size_t>{2, 1, 7, 8, 1, 6}),
::testing::Values(std::vector<size_t>{2, 1, 7, 8, 1, 5}),

8
inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp
View File

@ -53,7 +53,7 @@ const auto groupConvBackpropData2DParams_AutoPadValid = ::testing::Combine(
::testing::ValuesIn(emptyOutputPadding)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData2DParams_ExplicitPadding,
::testing::ValuesIn(netPrecisions),
@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConv
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData2DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),
@ -111,7 +111,7 @@ const auto groupConvBackpropData3DParams_AutoPadValid = ::testing::Combine(
::testing::ValuesIn(emptyOutputPadding)
);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData3DParams_ExplicitPadding,
::testing::ValuesIn(netPrecisions),
@ -124,7 +124,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConv
::testing::Values(CommonTestUtils::DEVICE_GPU)),
GroupConvBackpropLayerTest::getTestCaseName);
INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropLayerTest,
INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropLayerTest,
::testing::Combine(
groupConvBackpropData3DParams_AutoPadValid,
::testing::ValuesIn(netPrecisions),

10
inference-engine/tests/functional/plugin/gpu/single_layer_tests/loop.cpp
View File

@ -32,7 +32,7 @@ namespace {
{1, 4, 2}
};
INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop_axis_0, StaticShapeLoopTest,
INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop_axis_0, StaticShapeLoopTest,
testing::Combine(
/* unrolling */ testing::ValuesIn(std::vector<bool>{false}),
/* static_continue_cond */ testing::Values(true),
@ -54,7 +54,7 @@ namespace {
{2, 1, 4, 6}
};
INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop_axis_1, StaticShapeLoopTest,
INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop_axis_1, StaticShapeLoopTest,
testing::Combine(
/* unrolling */ testing::ValuesIn(std::vector<bool>{false}),
/* static_continue_cond */ testing::Values(true),
@ -76,7 +76,7 @@ namespace {
{2, 4, 1, 6}
};
INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop_axis_2, StaticShapeLoopTest,
INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop_axis_2, StaticShapeLoopTest,
testing::Combine(
/* unrolling */ testing::ValuesIn(std::vector<bool>{false}),
/* static_continue_cond */ testing::Values(true),
@ -98,7 +98,7 @@ namespace {
{4, 20, 12}
};
INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop_no_auto_concat, StaticShapeLoopTest,
INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop_no_auto_concat, StaticShapeLoopTest,
testing::Combine(
/* unrolling */ testing::ValuesIn(std::vector<bool>{false}),
/* static_continue_cond */ testing::Values(true),
@ -125,7 +125,7 @@ namespace {
{4, 1, 2}
};
INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop_dynamic_exit, StaticShapeLoopTest,
INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop_dynamic_exit, StaticShapeLoopTest,
testing::Combine(
/* unrolling */ testing::ValuesIn(std::vector<bool>{false}),
/* static_continue_cond */ testing::Values(true),