diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp index 9af16858c87..d4a5dd02f09 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp @@ -62,9 +62,9 @@ INSTANTIATE_TEST_CASE_P(Convolution2D_ExplicitPadding, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values("TEMPLATE")), ConvolutionLayerTest::getTestCaseName); // ! [test_convolution:instantiate] @@ -75,9 +75,9 @@ INSTANTIATE_TEST_CASE_P(Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values("TEMPLATE")), ConvolutionLayerTest::getTestCaseName); @@ -118,9 +118,9 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_ExplicitPadding, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values("TEMPLATE")), ConvolutionLayerTest::getTestCaseName); @@ -130,9 +130,9 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values("TEMPLATE")), ConvolutionLayerTest::getTestCaseName); diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp index 43c8f3d8f2d..f9c0fc623d1 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp @@ -18,6 +18,10 @@ INSTANTIATE_TEST_CASE_P(ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values("TEMPLATE"), @@ -28,6 +32,10 @@ INSTANTIATE_TEST_CASE_P(ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({10, 10, 10, 10})), ::testing::Values(std::vector({10, 0, 100})), ::testing::Values("TEMPLATE"), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index 036a83b1f67..0d6df87ff32 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp @@ -31,7 +31,10 @@ const std::vector axis2D = { const auto params2D = testing::Combine( testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::ValuesIn(inputLayouts2D), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes2D), testing::ValuesIn(axis2D), testing::Values("TEMPLATE"), @@ -55,7 +58,10 @@ const std::vector axis4D = {0, 1, 2, 3}; const auto params4D = testing::Combine( testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::NCHW), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes4D), testing::ValuesIn(axis4D), testing::Values("TEMPLATE"), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp index 704278d4dc5..57485249ee3 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp @@ -16,6 +16,10 @@ INSTANTIATE_TEST_CASE_P(NumSplitsCheck, SplitLayerTest, ::testing::Values(1, 2, 3, 5, 6, 10, 30), ::testing::Values(0, 1, 2, 3), ::testing::Values(InferenceEngine::Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values("TEMPLATE")), SplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp index 81416b4ab89..e349baa626d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp @@ -70,6 +70,10 @@ std::map, std::vector>> preluBasic = { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(activationTypes)), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), ::testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -77,6 +81,10 @@ const auto basicCases = ::testing::Combine( const auto basicPreluCases = ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(activationParamTypes)), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(CommonTestUtils::combineParams(preluBasic)), ::testing::Values(CommonTestUtils::DEVICE_CPU) ); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp index 05eefaad02c..7e579f3a2fe 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp @@ -31,6 +31,10 @@ const std::vector> inputShapes = { const auto batchNormParams = testing::Combine( testing::ValuesIn(epsilon), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_CPU) ); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp index 186595283ba..32c3d453bcf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp @@ -13,15 +13,40 @@ namespace { batchToSpaceParamsTuple bts_only_test_cases[] = { batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 1, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 3, 1, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {8, 1, 1, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), batchToSpaceParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {12, 1, 2, 1, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), }; INSTANTIATE_TEST_CASE_P(smoke_MKLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp index 32cb0b38eee..24afe0d4622 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp @@ -29,6 +29,10 @@ INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConcatLayerTest, ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConcatLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp index b22e5a5158f..826e9e833e4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp @@ -24,6 +24,8 @@ INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConvertLayerTest, ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvertLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp index 7985d6fff75..90c79a740bf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp @@ -25,6 +25,8 @@ INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConvertLikeLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvertLikeLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp index b86b543972b..3973890d55b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -58,9 +58,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTes ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -70,9 +70,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); /* ============= 3D Convolution ============= */ @@ -111,9 +111,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTes ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -123,9 +123,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 0c469cf3e85..177b3514850 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -51,6 +51,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convolu ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -59,6 +63,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, Convolutio ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -96,6 +104,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convolu ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -104,6 +116,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, Convolutio ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp index d1444af8056..185f9badbf1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -52,6 +52,9 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp index 0d68f84d380..bd16056e144 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp @@ -40,6 +40,9 @@ INSTANTIATE_TEST_CASE_P(smoke_layers_CPU, ExtractImagePatchesTest, ::testing::ValuesIn(rates), ::testing::ValuesIn(autoPads), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ExtractImagePatchesTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp index b7c75abffb4..d134a04f6d1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -36,6 +36,10 @@ INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(config)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp index debbd4a8a9b..f6debc6a199 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp @@ -36,6 +36,10 @@ const auto params = testing::Combine( testing::ValuesIn(axes), testing::ValuesIn(inputShapes), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_CPU) ); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp index 9c510449601..358c44589b2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp @@ -28,6 +28,10 @@ INSTANTIATE_TEST_CASE_P(Basic_smoke, GatherTreeLayerTest, ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GatherTreeLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp index c4637c6af45..54488970d99 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp @@ -49,6 +49,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_ExplicitPadding, GroupConvoluti ::testing::Combine( groupConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 16, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -57,6 +61,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_AutoPadValid, GroupConvolutionL ::testing::Combine( groupConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 16, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -93,6 +101,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_ExplicitPadding, GroupConvoluti ::testing::Combine( groupConv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 4, 10, 10, 10})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -101,6 +113,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_AutoPadValid, GroupConvolutionL ::testing::Combine( groupConv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 4, 10, 10, 10})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp index e9b0d88f478..521a815e449 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp @@ -52,6 +52,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConv ::testing::Combine( groupConvBackpropData2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); @@ -60,6 +64,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBac ::testing::Combine( groupConvBackpropData2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); @@ -98,6 +106,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConv ::testing::Combine( groupConvBackpropData3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); @@ -106,6 +118,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBac ::testing::Combine( groupConvBackpropData3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp index 23f0a7811ac..75b79f15423 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -11,7 +11,7 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector prc = { +const std::vector netPrecisions = { InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32, }; @@ -108,7 +108,11 @@ const auto interpolateCases = ::testing::Combine( INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearest, - ::testing::ValuesIn(prc), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), ::testing::Values(CommonTestUtils::DEVICE_CPU)), @@ -116,7 +120,11 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( interpolateCases, - ::testing::ValuesIn(prc), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), ::testing::Values(CommonTestUtils::DEVICE_CPU)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp index cc0ab2950b3..b7e2c79842d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp @@ -52,19 +52,25 @@ std::map additional_config = {}; const auto LogicalTestParams = ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapes)), - ::testing::ValuesIn(inputsPrecisions), ::testing::ValuesIn(logicalOpTypes), ::testing::ValuesIn(secondInputTypes), ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(inputsPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); const auto LogicalTestParamsNot = ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapesNot)), - ::testing::ValuesIn(inputsPrecisions), ::testing::Values(ngraph::helpers::LogicalTypes::LOGICAL_NOT), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(inputsPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp index 1a37ca4e7d2..51edd93c978 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp @@ -29,6 +29,8 @@ INSTANTIATE_TEST_CASE_P(smoke_LrnCheck, LrnLayerTest, ::testing::Values(size), ::testing::Values(std::vector({1})), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(std::vector({10, 10, 3, 2})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), LrnLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp index f118b4d2eef..46abeb35f10 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -30,6 +30,9 @@ std::vector secondaryInputTypes = { INSTANTIATE_TEST_CASE_P(smoke_MatMul, MatMulTest, ::testing::Combine( ::testing::ValuesIn(inputPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(shapesA), ::testing::ValuesIn(shapesB), ::testing::Values(false), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 7dffba57789..79b2631754c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -40,6 +40,10 @@ INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputType), ::testing::Values(CommonTestUtils::DEVICE_CPU)), MaxMinLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp index f897971b9f2..dbcecaf9d21 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp @@ -29,6 +29,9 @@ const auto pad2DConstparams = testing::Combine( testing::ValuesIn(argPadValue), testing::Values(ngraph::helpers::PadMode::CONSTANT), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{13, 5}), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -46,6 +49,9 @@ const auto pad2Dparams = testing::Combine( testing::Values(0), testing::ValuesIn(padMode), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{13, 5}), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -66,6 +72,9 @@ const auto pad4DConstparams = testing::Combine( testing::ValuesIn(argPadValue), testing::Values(ngraph::helpers::PadMode::CONSTANT), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 5, 10, 11}), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -83,6 +92,9 @@ const auto pad4Dparams = testing::Combine( testing::Values(0), testing::ValuesIn(padMode), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 5, 10, 11}), testing::Values(CommonTestUtils::DEVICE_CPU) ); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp index aa5f24dc155..87a0f1f4528 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp @@ -50,6 +50,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTes ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); @@ -70,6 +74,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); @@ -93,6 +101,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); @@ -106,6 +118,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding_corner, PoolingLa ::testing::Combine( ::testing::ValuesIn(psParams), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 1024, 6, 6})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); @@ -127,6 +143,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTes ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); @@ -149,6 +169,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp index fe5976b0944..32702894f54 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp @@ -26,6 +26,10 @@ INSTANTIATE_TEST_CASE_P(smoke_Basic, RangeLayerTest, ::testing::ValuesIn(stop), ::testing::ValuesIn(step), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp index 25cbc9ad782..16c91031953 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp @@ -68,6 +68,9 @@ const auto paramsOneAxis = testing::Combine( testing::Values(true, false), testing::ValuesIn(reductionTypes), testing::Values(InferenceEngine::Precision::FP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -79,6 +82,9 @@ const auto params_Precisions = testing::Combine( testing::Values(ngraph::helpers::ReductionType::Sum), testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::I32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{2, 2, 2, 2}), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -89,6 +95,9 @@ const auto params_InputShapes = testing::Combine( testing::ValuesIn(keepDims), testing::Values(ngraph::helpers::ReductionType::Mean), testing::Values(InferenceEngine::Precision::FP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3}, std::vector{3, 5}, std::vector{2, 4, 6}, @@ -104,6 +113,9 @@ const auto params_Axes = testing::Combine( testing::ValuesIn(keepDims), testing::Values(ngraph::helpers::ReductionType::Mean), testing::Values(InferenceEngine::Precision::FP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -114,6 +126,9 @@ const auto params_ReductionTypes = testing::Combine( testing::ValuesIn(keepDims), testing::ValuesIn(reductionTypes), testing::Values(InferenceEngine::Precision::FP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{2, 9, 2, 9}), testing::Values(CommonTestUtils::DEVICE_CPU) ); @@ -163,6 +178,9 @@ INSTANTIATE_TEST_CASE_P( testing::Values(ngraph::helpers::ReductionType::Sum), testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::I32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector {2, 10}), testing::Values(CommonTestUtils::DEVICE_CPU)), ReduceOpsLayerWithSpecificInputTest::getTestCaseName diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp index 32c0a385db1..17fab593ab1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -19,6 +19,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU), @@ -29,6 +33,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({10, 10, 10, 10})), ::testing::Values(std::vector({10, 0, 100})), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp index 65ad5430d61..0d7807a90d2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp @@ -36,6 +36,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerTest, ::testing::Combine( shuffleChannelsParams4D, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({6, 6, 6, 6})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); @@ -44,6 +48,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannelsNegativeAxis4D, ShuffleChannelsLaye ::testing::Combine( shuffleChannelsParamsNegativeAxis4D, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({6, 6, 6, 6})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp index 916e39ed4f6..db9f26dc639 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -31,7 +31,10 @@ const std::vector axis2D = { const auto params2D = testing::Combine( testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::ValuesIn(inputLayouts2D), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes2D), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_CPU), @@ -55,7 +58,10 @@ const std::vector axis4D = {0, 1, 2, 3}; const auto params4D = testing::Combine( testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::NCHW), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes4D), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp index 0037c2357b2..2065af13ea9 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp @@ -13,15 +13,40 @@ namespace { spaceToBatchParamsTuple stb_only_test_cases[] = { spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 3, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 4, 4}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 2}, {0, 0, 0, 0}, {2, 1, 2, 4}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), spaceToBatchParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {1, 1, 3, 2, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_CPU), }; INSTANTIATE_TEST_CASE_P( diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp index 24d0d779634..76cb74a1dc5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp @@ -21,6 +21,10 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(1), ::testing::Values(0, 1, 2, 3), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), SplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp index d560ce0f795..2cc394428da 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp @@ -34,6 +34,10 @@ INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, ::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), SqueezeUnsqueezeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp index d31e44abaa1..8056732261f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -11,83 +11,68 @@ using namespace LayerTestsDefinitions; namespace { -std::vector ss_only_test_cases = { - StridedSliceParams{ { { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, +std::vector ss_only_test_cases = { + StridedSliceSpecificParams{ { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, { 0, 1, 1 }, { 0, 1, 1 }, { 1, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1}, + StridedSliceSpecificParams{ { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1}, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 1, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, -1, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, -1, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 1, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 11, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 11, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 1, 0 }, { 0, -1, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 1, 0 }, { 0, -1, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 7, 0 }, { -1, -1, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 7, 0 }, { -1, -1, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 7, 0 }, { 0, 9, 0 }, { -1, 1, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 7, 0 }, { 0, 9, 0 }, { -1, 1, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 4, 0 }, { 0, 9, 0 }, { -1, 2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 4, 0 }, { 0, 9, 0 }, { -1, 2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 4, 0 }, { 0, 10, 0 }, { -1, 2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 4, 0 }, { 0, 10, 0 }, { -1, 2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 10, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 10, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 11, 0 }, { 0, 0, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 11, 0 }, { 0, 0, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, -6, 0 }, { 0, -8, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, -6, 0 }, { 0, -8, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 12, 100, 1, 1 }, { 0, -1, 0, 0 }, { 0, 0, 0, 0 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100, 1, 1 }, { 0, -1, 0, 0 }, { 0, 0, 0, 0 }, { 1, 1, 1, 1 }, { 1, 0, 1, 0 }, { 1, 0, 1, 0 }, { }, { 0, 1, 0, 1 }, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {0, 0, 0, 0}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {0, 0, 0, 0}, {0, 0, 0, 0}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 3 }, { 0, 0, 0, 0 }, { 2, 2, 4, 3 }, { 1, 1, 2, 1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 3 }, { 0, 0, 0, 0 }, { 2, 2, 4, 3 }, { 1, 1, 2, 1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 2 }, { 1, 0, 0, 1 }, { 2, 2, 4, 2 }, { 1, 1, 2, 1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 2 }, { 1, 0, 0, 1 }, { 2, 2, 4, 2 }, { 1, 1, 2, 1 }, {0, 1, 1, 0}, {1, 1, 0, 0}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 1, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, {0, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 2, 3, 4, 5, 6 }, { 0, 1, 0, 0, 0 }, { 2, 3, 4, 5, 6 }, { 1, 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 3, 4, 5, 6 }, { 0, 1, 0, 0, 0 }, { 2, 3, 4, 5, 6 }, { 1, 1, 1, 1, 1 }, {1, 0, 1, 1, 1}, {1, 0, 1, 1, 1}, {}, {0, 1, 0, 0, 0}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 10, 12 }, { -1, 1 }, { -9999, 0 }, { -1, 1 }, + StridedSliceSpecificParams{ { 10, 12 }, { -1, 1 }, { -9999, 0 }, { -1, 1 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}}, - StridedSliceParams{ { { 5, 5, 5, 5 }, { -1, 0, -1, 0 }, { -50, 0, -60, 0 }, { -1, 1, -1, 1 }, + StridedSliceSpecificParams{ { 5, 5, 5, 5 }, { -1, 0, -1, 0 }, { -50, 0, -60, 0 }, { -1, 1, -1, 1 }, { 0, 0, 0, 0 }, { 0, 1, 0, 1 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_CPU, {}} }; INSTANTIATE_TEST_CASE_P( - smoke_MKLDNN, StridedSliceLayerTest, ::testing::ValuesIn(ss_only_test_cases), + smoke_MKLDNN, StridedSliceLayerTest, + ::testing::Combine( + ::testing::ValuesIn(ss_only_test_cases), + ::testing::Values(InferenceEngine::Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(CommonTestUtils::DEVICE_CPU), + ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp index f4b86a114fe..4adcded448d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp @@ -25,6 +25,10 @@ INSTANTIATE_TEST_CASE_P(smoke_Tile, TileLayerTest, ::testing::Combine( ::testing::ValuesIn(repeats), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 3, 4})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), TileLayerTest::getTestCaseName); @@ -33,6 +37,10 @@ INSTANTIATE_TEST_CASE_P(smoke_Tile6d, TileLayerTest, ::testing::Combine( ::testing::Values(std::vector({1, 1, 1, 2, 1, 2})), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 4, 3, 1, 3, 1})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), TileLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp index 31865189c6a..6495a9a850f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp @@ -46,6 +46,9 @@ INSTANTIATE_TEST_CASE_P(smoke_TopK, TopKLayerTest, ::testing::ValuesIn(modes), ::testing::ValuesIn(sortTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({10, 10, 10})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), TopKLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp index bdbbd14fad3..9f88c22658a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp @@ -27,6 +27,10 @@ const std::vector> inputOrder = { const auto params = testing::Combine( testing::ValuesIn(inputOrder), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_CPU) ); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp index 346b46c0650..cc3e7390cb2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp @@ -30,6 +30,10 @@ namespace { ::testing::ValuesIn(numSplits), ::testing::Values(0, 1, 2, 3), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), VariadicSplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp index 5f518e60623..39f85d5fe10 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp @@ -30,6 +30,10 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicPositive, RangeAddSubgraphTest, ::testing::ValuesIn(positiveStop), ::testing::ValuesIn(positiveStep), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeAddSubgraphTest::getTestCaseName); @@ -39,6 +43,10 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicNegative, RangeAddSubgraphTest, ::testing::ValuesIn(negativeStop), ::testing::ValuesIn(negativeStep), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeAddSubgraphTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp index 7fb422e638a..a5b9f09fbc8 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp @@ -42,7 +42,7 @@ protected: groupConvSpecificParams groupConvParams; std::vector inputShape; auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; - std::tie(groupConvParams, netPrecision, inputShape, targetDevice) = basicParamsSet; + std::tie(groupConvParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShape, targetDevice) = basicParamsSet; ngraph::op::PadType padType; InferenceEngine::SizeVector kernel, stride, dilation; @@ -171,6 +171,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_Planar_FP32, GroupConvolutionLayerCPU ::testing::Combine( groupConvParams_ExplicitPadding_Planar_2D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 12, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Planar_2D))), @@ -197,6 +201,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_Planar_FP32, GroupConvolutionLayerCPU ::testing::Combine( groupConvParams_ExplicitPadding_Planar_3D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 12, 7, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Planar_3D))), @@ -225,6 +233,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_Blocked_FP32, GroupConvolutionLayerCP ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_2D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 64, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Blocked_2D))), @@ -253,6 +265,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_Blocked_FP32, GroupConvolutionLayerCP ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_3D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 64, 7, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Blocked_3D))), @@ -281,6 +297,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_DW_FP32, GroupConvolutionLayerCPUTest ::testing::Combine( groupConvParams_ExplicitPadding_DW_2D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 32, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_DW_2D))), @@ -309,6 +329,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_DW_FP32, GroupConvolutionLayerCPUTest ::testing::Combine( groupConvParams_ExplicitPadding_DW_3D, ::testing::Values(Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 32, 7, 7, 7})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_DW_3D))), @@ -330,7 +354,11 @@ groupConvLayerCPUTestParamsSet makeSingleGroupConvCPUTestCase(SizeVector kernels inputShapes.insert(inputShapes.end(), spDims.begin(), spDims.end()); groupConvSpecificParams specificParams(kernels, strides, padBegins, padEnds, dilations, outChannels, groups, padType); - groupConvLayerTestParamsSet basicParamsSet(specificParams, Precision::FP32, inputShapes, CommonTestUtils::DEVICE_CPU); + groupConvLayerTestParamsSet basicParamsSet(specificParams, Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, inputShapes, CommonTestUtils::DEVICE_CPU); return groupConvLayerCPUTestParamsSet(basicParamsSet, CPUParams); } diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp index 256c441a9f4..16ac5956492 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp @@ -43,7 +43,7 @@ protected: std::vector inputShape; std::vector targetShape; auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; - std::tie(interpolateParams, netPrecision, inputShape, targetShape, targetDevice) = basicParamsSet; + std::tie(interpolateParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShape, targetShape, targetDevice) = basicParamsSet; ngraph::op::v4::Interpolate::InterpolateMode mode; ngraph::op::v4::Interpolate::ShapeCalcMode shapeCalcMode; @@ -196,6 +196,10 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateNN_Layout_Test, InterpolateLayerCPUTest ::testing::Combine( interpolateCasesNN, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 1, 40, 40})), ::testing::Values(std::vector({1, 1, 50, 60})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), @@ -207,6 +211,10 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinearOnnx_Layout_Test, InterpolateLaye ::testing::Combine( interpolateCasesLinearOnnx, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 1, 40, 40})), ::testing::Values(std::vector({1, 1, 50, 60})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp index ea402c2e921..c77802de5c4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp @@ -44,6 +44,10 @@ std::map, std::vector>> basic = { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(activationTypes)), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), ::testing::Values(CommonTestUtils::DEVICE_GNA) ); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp index 31cad5d6267..d056a2659da 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp @@ -29,6 +29,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_NoReshape, ConcatLayerTest, ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConcatLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp index 5bcdaed5653..1cd43be2201 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp @@ -59,9 +59,9 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_ExplicitPadding, Convolutio ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 1})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -71,9 +71,9 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_AutoPadValid, ConvolutionLa ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 1})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp index 6bc3c3e13ec..d1a8312ff8c 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -53,6 +53,9 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp index ed3ddbf63fe..18363a72bbf 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -60,6 +60,10 @@ INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::ValuesIn(gnaQuantModes)), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp index 52c6c8859e7..e045f8626ba 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp @@ -45,6 +45,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MaxPool_ExplicitPad_FloorRpunding, Poolin ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), PoolingLayerTest::getTestCaseName); @@ -66,6 +70,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MaxPool_ExplicitPad_CeilRpunding, Pooling ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), PoolingLayerTest::getTestCaseName); @@ -90,6 +98,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_AvgPool_ExplicitPad_CeilRounding, Pooling ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), PoolingLayerTest::getTestCaseName); @@ -111,6 +123,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_AvgPool_ExplicitPad_FloorRounding, Poolin ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), PoolingLayerTest::getTestCaseName); @@ -133,6 +149,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTes ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), PoolingLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp index 59e8b1f2d4b..3266252cdc6 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp @@ -38,6 +38,10 @@ namespace { ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::ValuesIn(Power)), PowerLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp index 9992f043b8d..65e0a2550fc 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp @@ -21,6 +21,10 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(1), ::testing::Values(0, 1), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GNA)), SplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp index e3b439f7997..6584d247427 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp @@ -55,6 +55,10 @@ std::map, std::vector>> basic = { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(activationTypes)), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), ::testing::Values(CommonTestUtils::DEVICE_GPU) ); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp index 5f6a65ae047..21f4245ff88 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp @@ -13,35 +13,110 @@ namespace { batchToSpaceParamsTuple bts_only_test_cases[] = { batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 1, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 3, 1, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {8, 1, 1, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {24, 1, 2, 1, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 1, 1}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 3, 1, 1}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 2, 2}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {8, 1, 1, 2}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {24, 1, 2, 1, 2}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 1, 1}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 3, 1, 1}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {4, 1, 2, 2}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {8, 1, 1, 2}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), batchToSpaceParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {24, 1, 2, 1, 2}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU) + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU) }; INSTANTIATE_TEST_CASE_P(smoke_CLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp index 6bebe02658a..861e7f31549 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp @@ -29,6 +29,10 @@ INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConcatLayerTest, ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConcatLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp index 41a52096919..ad63526b0c3 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -56,9 +56,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTes ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); @@ -68,9 +68,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); /* ============= 3D Convolution ============= */ @@ -103,9 +103,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_Basic1, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 971697c227e..510c0949242 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -56,6 +56,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convolu ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions2D), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -64,6 +68,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, Convolutio ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions2D), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -104,6 +112,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convolu ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions3D), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); @@ -112,6 +124,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, Convolutio ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions3D), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropDataLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp index 2f19f7840f4..e0664e1951c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp @@ -18,6 +18,10 @@ namespace { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({ 10, 1, 16 }), std::vector({ 20, 2, 8 })), ::testing::Values(true, false), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp index 3cb1ca45e8d..69234ee1d61 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -53,6 +53,9 @@ const auto multiply_params = ::testing::Combine( ::testing::ValuesIn(secondaryInputTypes), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp index 88421e5ca16..a9bb644e016 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp @@ -64,6 +64,9 @@ INSTANTIATE_TEST_CASE_P(smoke_layers_GPU, ExtractImagePatchesTest, ::testing::ValuesIn(rates), ::testing::ValuesIn(autoPads), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ExtractImagePatchesTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp index 6e28b17f895..d5db9f3518d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp @@ -57,6 +57,10 @@ const auto Gather6dAxes5 = testing::Combine( testing::ValuesIn(axes5), testing::ValuesIn(inputShapes6DAxes5), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -90,6 +94,10 @@ const auto GatherAxes4 = testing::Combine( testing::ValuesIn(axes4), testing::ValuesIn(inputShapesAxes4), testing::ValuesIn(netPrecisionsFP16), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -106,6 +114,10 @@ const auto Gather6dAxes4 = testing::Combine( testing::ValuesIn(axes4), testing::ValuesIn(inputShapes6DAxes4), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -150,6 +162,10 @@ const auto GatherAxes3 = testing::Combine( testing::ValuesIn(axes3), testing::ValuesIn(inputShapesAxes3), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -166,6 +182,10 @@ const auto Gather6dAxes3 = testing::Combine( testing::ValuesIn(axes3), testing::ValuesIn(inputShapes6DAxes3), testing::ValuesIn(netPrecisionsI32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -210,6 +230,10 @@ const auto GatherAxes2 = testing::Combine( testing::ValuesIn(axes2), testing::ValuesIn(inputShapesAxes2), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -226,6 +250,10 @@ const auto Gather6dAxes2 = testing::Combine( testing::ValuesIn(axes2), testing::ValuesIn(inputShapes6DAxes2), testing::ValuesIn(netPrecisionsFP16), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -270,6 +298,10 @@ const auto GatherAxes1 = testing::Combine( testing::ValuesIn(axes1), testing::ValuesIn(inputShapesAxes1), testing::ValuesIn(netPrecisionsI32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -286,6 +318,10 @@ const auto Gather6dAxes1 = testing::Combine( testing::ValuesIn(axes1), testing::ValuesIn(inputShapes6DAxes1), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -330,6 +366,10 @@ const auto GatherAxes0 = testing::Combine( testing::ValuesIn(axes0), testing::ValuesIn(inputShapesAxes0), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); @@ -346,6 +386,10 @@ const auto Gather6dAxes0 = testing::Combine( testing::ValuesIn(axes0), testing::ValuesIn(inputShapes6DAxes0), testing::ValuesIn(netPrecisionsFP32), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), + testing::Values(InferenceEngine::Layout::ANY), testing::Values(CommonTestUtils::DEVICE_GPU) ); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp index cb3349cddd3..c1eb14f2845 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp @@ -18,6 +18,10 @@ namespace { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({ 1, 3, 30, 30 }), std::vector({ 2, 16, 15, 20})), ::testing::Values(0.33f, 1.1f), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp index 23377df97aa..fab226558f2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp @@ -49,6 +49,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_ExplicitPadding, GroupConvoluti ::testing::Combine( groupConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 16, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -57,6 +61,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_AutoPadValid, GroupConvolutionL ::testing::Combine( groupConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 16, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -93,6 +101,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_ExplicitPadding, GroupConvoluti ::testing::Combine( groupConv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 4, 10, 10, 10})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); @@ -101,6 +113,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_AutoPadValid, GroupConvolutionL ::testing::Combine( groupConv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 4, 10, 10, 10})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp index 4263872bf05..f3391fd1169 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -11,7 +11,7 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector prc = { +const std::vector netPrecisions = { InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32, }; @@ -108,7 +108,11 @@ const auto interpolateCasesNearesMode = ::testing::Combine( INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearest, - ::testing::ValuesIn(prc), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), ::testing::Values(CommonTestUtils::DEVICE_GPU)), @@ -116,7 +120,11 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearesMode, - ::testing::ValuesIn(prc), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), ::testing::Values(CommonTestUtils::DEVICE_GPU)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp index cc0ab2950b3..b7e2c79842d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp @@ -52,19 +52,25 @@ std::map additional_config = {}; const auto LogicalTestParams = ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapes)), - ::testing::ValuesIn(inputsPrecisions), ::testing::ValuesIn(logicalOpTypes), ::testing::ValuesIn(secondInputTypes), ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(inputsPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); const auto LogicalTestParamsNot = ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapesNot)), - ::testing::ValuesIn(inputsPrecisions), ::testing::Values(ngraph::helpers::LogicalTypes::LOGICAL_NOT), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(inputsPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp index 55ae7d0f233..e7d0828931e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp @@ -27,6 +27,8 @@ INSTANTIATE_TEST_CASE_P(smoke_LrnCheck, LrnLayerTest, ::testing::Values(size), ::testing::Values(std::vector({1})), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(std::vector({10, 10, 3, 2})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), LrnLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp index 608247a72c4..4663aef6586 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp @@ -45,6 +45,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTes ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), PoolingLayerTest::getTestCaseName); @@ -66,6 +70,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), PoolingLayerTest::getTestCaseName); @@ -89,6 +97,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), PoolingLayerTest::getTestCaseName); @@ -110,6 +122,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTes ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), PoolingLayerTest::getTestCaseName); @@ -132,6 +148,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), PoolingLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp index 540c7d44408..b3fc244102f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp @@ -60,6 +60,10 @@ INSTANTIATE_TEST_CASE_P(smoke_PriorBoxClustered_Basic, PriorBoxClusteredLayerTes ::testing::Combine( layerSpeficParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({ 1, 16, 4, 4 })), ::testing::Values(std::vector({ 1, 3, 50, 50 })), ::testing::Values(CommonTestUtils::DEVICE_GPU)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp index c701ce0ac10..64028dc1498 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp @@ -43,6 +43,9 @@ namespace { testing::Values(true, false), testing::ValuesIn(reductionTypes), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_GPU)); @@ -58,6 +61,9 @@ namespace { testing::Values(true, false), testing::ValuesIn(reductionTypes), testing::ValuesIn(netPrecisions), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), testing::Values(CommonTestUtils::DEVICE_GPU)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp index cadcfe89b55..2ed4a30f6af 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -20,6 +20,10 @@ INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 16, 16, 16})), ::testing::Values(std::vector({1, 0, 256})), ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -30,6 +34,10 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({10, 10, 10, 10})), ::testing::Values(std::vector({10, 0, 100})), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp index 7ca57f5102b..5a3ef40c14b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp @@ -8,7 +8,7 @@ using namespace LayerTestsDefinitions; -const std::vector inputPrecision = { +const std::vector netPrecisions = { InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16, InferenceEngine::Precision::U8, @@ -25,7 +25,11 @@ const std::vector> shuffleParameters = { }; const auto testCases = ::testing::Combine(::testing::ValuesIn(shuffleParameters), - ::testing::ValuesIn(inputPrecision), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes), ::testing::Values(CommonTestUtils::DEVICE_GPU)); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp index 80732788e35..ffc5815a65f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp @@ -13,35 +13,110 @@ namespace { spaceToBatchParamsTuple stb_only_test_cases[] = { spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 3, 2, 2}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 4, 4}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 2}, {0, 0, 0, 0}, {2, 1, 2, 4}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {1, 1, 3, 2, 1}, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::FP32, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 2, 2}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 3, 2, 2}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 4, 4}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 2}, {0, 0, 0, 0}, {2, 1, 2, 4}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {1, 1, 3, 2, 1}, - InferenceEngine::Precision::I8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::I8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 2, 2}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 3, 2, 2}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 0}, {0, 0, 0, 0}, {1, 1, 4, 4}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 2, 2}, {0, 0, 0, 2}, {0, 0, 0, 0}, {2, 1, 2, 4}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), spaceToBatchParamsTuple({1, 1, 3, 2, 2}, {0, 0, 1, 0, 3}, {0, 0, 2, 0, 0}, {1, 1, 3, 2, 1}, - InferenceEngine::Precision::U8, CommonTestUtils::DEVICE_GPU), + InferenceEngine::Precision::U8, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Precision::UNSPECIFIED, + InferenceEngine::Layout::ANY, + InferenceEngine::Layout::ANY, + CommonTestUtils::DEVICE_GPU), }; INSTANTIATE_TEST_CASE_P(smoke_CLDNN, SpaceToBatchLayerTest, ::testing::ValuesIn(stb_only_test_cases), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp index 71919ce9d60..bcbd26b4f44 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp @@ -22,6 +22,10 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(1), ::testing::Values(0, 1, 2, 3), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), SplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp index 3464f4c8d55..53afa5d2db9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -11,90 +11,88 @@ using namespace LayerTestsDefinitions; namespace { -std::vector ss_only_test_cases = { - StridedSliceParams{ { { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, +std::vector ss_only_test_cases_fp32 = { + StridedSliceSpecificParams{ { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, { 0, 1, 1 }, { 0, 1, 1 }, { 1, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1}, + StridedSliceSpecificParams{ { 128, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1}, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 1, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, -1, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, -1, 0 }, { 0, 0, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 1, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 11, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 11, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 1, 0 }, { 0, -1, 0 }, { 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 1, 0 }, { 0, -1, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 7, 0 }, { -1, -1, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 7, 0 }, { -1, -1, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 7, 0 }, { 0, 9, 0 }, { -1, 1, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 7, 0 }, { 0, 9, 0 }, { -1, 1, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 4, 0 }, { 0, 9, 0 }, { -1, 2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 4, 0 }, { 0, 9, 0 }, { -1, 2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 4, 0 }, { 0, 10, 0 }, { -1, 2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 4, 0 }, { 0, 10, 0 }, { -1, 2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 9, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 10, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 10, 0 }, { 0, 4, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, 11, 0 }, { 0, 0, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, 11, 0 }, { 0, 0, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100 }, { 0, -6, 0 }, { 0, -8, 0 }, { -1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 12, 100 }, { 0, -6, 0 }, { 0, -8, 0 }, { -1, -2, -1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 12, 100, 1, 1 }, { 0, -1, 0, 0 }, { 0, 0, 0, 0 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 1, 12, 100, 1, 1 }, { 0, -1, 0, 0 }, { 0, 0, 0, 0 }, { 1, 1, 1, 1 }, { 1, 0, 1, 0 }, { 1, 0, 1, 0 }, { }, { 0, 1, 0, 1 }, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {0, 0, 0, 0}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, {0, 0, 0, 0}, {0, 0, 0, 0}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 3 }, { 0, 0, 0, 0 }, { 2, 2, 4, 3 }, { 1, 1, 2, 1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 3 }, { 0, 0, 0, 0 }, { 2, 2, 4, 3 }, { 1, 1, 2, 1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 2 }, { 1, 0, 0, 1 }, { 2, 2, 4, 2 }, { 1, 1, 2, 1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 2 }, { 1, 0, 0, 1 }, { 2, 2, 4, 2 }, { 1, 1, 2, 1 }, {0, 1, 1, 0}, {1, 1, 0, 0}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 1, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, + StridedSliceSpecificParams{ { 1, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, + StridedSliceSpecificParams{ { 2, 2, 4, 2 }, { 1, 0, 0, 0 }, { 1, 2, 4, 2 }, { 1, 1, -2, -1 }, {0, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, - {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, - InferenceEngine::Precision::I64, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, - {0, 0, 0, 0}, {0, 0, 0, 0}, {}, {}, {} }, - InferenceEngine::Precision::I64, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 2, 3, 4, 5, 6 }, { 0, 1, 0, 0, 0 }, { 2, 3, 4, 5, 6 }, { 1, 1, 1, 1, 1 }, + StridedSliceSpecificParams{ { 2, 3, 4, 5, 6 }, { 0, 1, 0, 0, 0 }, { 2, 3, 4, 5, 6 }, { 1, 1, 1, 1, 1 }, {1, 0, 1, 1, 1}, {1, 0, 1, 1, 1}, {}, {0, 1, 0, 0, 0}, {} }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 10, 12 }, { -1, 1 }, { -9999, 0 }, { -1, 1 }, + StridedSliceSpecificParams{ { 10, 12 }, { -1, 1 }, { -9999, 0 }, { -1, 1 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}}, - StridedSliceParams{ { { 5, 5, 5, 5 }, { -1, 0, -1, 0 }, { -50, 0, -60, 0 }, { -1, 1, -1, 1 }, + StridedSliceSpecificParams{ { 5, 5, 5, 5 }, { -1, 0, -1, 0 }, { -50, 0, -60, 0 }, { -1, 1, -1, 1 }, { 0, 0, 0, 0 }, { 0, 1, 0, 1 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }, - InferenceEngine::Precision::FP32, CommonTestUtils::DEVICE_GPU, {}} +}; + +std::vector ss_only_test_cases_i64 = { + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 0, 0, 0, 0 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + {1, 1, 1, 1}, {1, 1, 1, 1}, {}, {}, {} }, + StridedSliceSpecificParams{ { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, { 2, 2, 2, 2 }, { 1, 1, 1, 1 }, + {0, 0, 0, 0}, {0, 0, 0, 0}, {}, {}, {} }, }; INSTANTIATE_TEST_CASE_P( - smoke_CLDNN, StridedSliceLayerTest, ::testing::ValuesIn(ss_only_test_cases), + smoke_CLDNN_FP32, StridedSliceLayerTest, + ::testing::Combine( + ::testing::ValuesIn(ss_only_test_cases_fp32), + ::testing::Values(InferenceEngine::Precision::FP32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(CommonTestUtils::DEVICE_GPU), + ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); +INSTANTIATE_TEST_CASE_P( + smoke_CLDNN_I64, StridedSliceLayerTest, + ::testing::Combine( + ::testing::ValuesIn(ss_only_test_cases_i64), + ::testing::Values(InferenceEngine::Precision::I64), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(CommonTestUtils::DEVICE_GPU), + ::testing::Values(std::map())), + StridedSliceLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp index 9ab613f2709..3adbc720288 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp @@ -35,6 +35,10 @@ std::map, std::vector>> basic = { const auto basicCases = ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(activationTypes)), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp index d629da265e9..a6311022a1b 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp @@ -25,6 +25,10 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat_Basic, ConcatLayerTest, ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConcatLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp index 76f6658b51f..ef772b7df69 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp @@ -66,9 +66,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTes ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConvolutionLayerTest::getTestCaseName); @@ -78,9 +78,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConvolutionLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_BigDimensionValid, ConvolutionLayerTest, @@ -89,9 +89,9 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_BigDimensionValid, ConvolutionLayerT ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 1, 2500})), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp index 77f5792ec9d..3a1631cb3a2 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -63,6 +63,9 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseMathFP, ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(fpTypes), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), EltwiseLayerTest::getTestCaseName); @@ -75,6 +78,9 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseMathInt, ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(intTypes), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), EltwiseLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp index 85ff32ef2b4..adcf5f56ef8 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp @@ -23,10 +23,10 @@ class LogicalLayerTestVPU : public LogicalLayerTest { protected: void SetUp() override { const auto& inputShapes = std::get<0>(GetParam()); - const auto& ngInputsPrecision = std::get<1>(GetParam()); - const auto& logicalOpType = std::get<2>(GetParam()); + const auto& ngInputsPrecision = std::get<4>(GetParam()); + const auto& logicalOpType = std::get<1>(GetParam()); targetDevice = std::get<5>(GetParam()); - const auto& additionalConfig = std::get<6>(GetParam()); + const auto& additionalConfig = std::get<9>(GetParam()); configuration.insert(additionalConfig.begin(), additionalConfig.end()); outPrc = ngInputsPrecision; @@ -76,10 +76,13 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalInt, LogicalLayerTestVPU, ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapes)), - ::testing::Values(InferenceEngine::Precision::I32), ::testing::ValuesIn(eltwiseLogicalTypesInt), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::I32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(additional_config)), LogicalLayerTest::getTestCaseName); @@ -88,10 +91,13 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalNotInt, LogicalLayerTest, ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapesNot)), - ::testing::Values(InferenceEngine::Precision::I32), ::testing::Values(ngraph::helpers::LogicalTypes::LOGICAL_NOT), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::I32), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(additional_config)), LogicalLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 9539debff57..a08fb354d88 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -38,6 +38,10 @@ INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputType), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), MaxMinLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp index 3a1f21eaabe..50148850b9b 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp @@ -45,6 +45,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTes ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), PoolingLayerTest::getTestCaseName @@ -68,6 +72,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), PoolingLayerTest::getTestCaseName @@ -93,6 +101,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), PoolingLayerTest::getTestCaseName @@ -115,6 +127,10 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTes ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), PoolingLayerTest::getTestCaseName @@ -138,6 +154,10 @@ INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), PoolingLayerTest::getTestCaseName @@ -160,6 +180,10 @@ INSTANTIATE_TEST_CASE_P(smoke_GlobalAvgPool, GlobalPoolingLayerTest, ::testing::Combine( avgGlobalPoolParams, ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(3, 101), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), GlobalPoolingLayerTest::getTestCaseName diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp index 069335d64dc..6cfd995ef87 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp @@ -23,6 +23,10 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, // The sum of the dimensions on the axis(0) is not equal out_sizes: [30] ::testing::Values(1, 2, 3), ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), SplitLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp index 58a388b4933..b7fdd89949b 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -35,7 +35,7 @@ std::vector testCases = { { { 1, 3, 4, 5, 6 }, { 0, 1, 0, 0, 0 }, { 1, 3, 4, 5, 6 }, { 1, 1, 1, 1, 1 }, {1, 0, 1, 1, 1}, {1, 0, 1, 1, 1}, {}, {}, {} }, }; -std::vector precisions = { +std::vector netPrecisions = { InferenceEngine::Precision::FP32, InferenceEngine::Precision::I32 }; @@ -51,7 +51,11 @@ Config getConfig() { INSTANTIATE_TEST_CASE_P(smoke_StridedSlice_tests, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(testCases), - ::testing::ValuesIn(precisions), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(getConfig())), StridedSliceLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp index d4adc10568e..44b02479ee0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp @@ -76,6 +76,10 @@ static std::map activationNames = typedef std::tuple< std::pair>, // Activation type and constant value InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::pair, std::vector>, std::string> activationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp index ced8a2e40c0..065c276e4af 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_norm.hpp @@ -10,6 +10,10 @@ typedef std::tuple< double, // epsilon InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice // Target device name > BatchNormLayerTestParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp index a6cdd8c5af5..d1711387a32 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/batch_to_space.hpp @@ -19,6 +19,10 @@ using batchToSpaceParamsTuple = typename std::tuple< std::vector, // crops end std::vector, // Input shapes InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name>; class BatchToSpaceLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp index 8bc8081b46d..65f7c164b22 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/concat.hpp @@ -20,6 +20,10 @@ using concatParamsTuple = typename std::tuple< size_t, // Concat axis std::vector>, // Input shapes InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name class ConcatLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp index a70c7ba8ad0..ede69da9102 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp @@ -19,6 +19,8 @@ using ConvertParamsTuple = typename std::tuple< std::vector>, // Input shapes InferenceEngine::Precision, // Source precision InferenceEngine::Precision, // Target precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name class ConvertLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp index ec2140fe7b7..5619810b1e9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp @@ -20,6 +20,8 @@ using ConvertLikeParamsTuple = typename std::tuple< InferenceEngine::Precision, // Input1 precision std::vector>, // Input2 shapes InferenceEngine::Precision, // Input2 precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name class ConvertLikeLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp index 75e7a22cc08..3e982e4ee0f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution.hpp @@ -26,11 +26,11 @@ typedef std::tuple< typedef std::tuple< convSpecificParams, InferenceEngine::Precision, // Net precision - InferenceEngine::Precision, // in precision - InferenceEngine::Precision, // out precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes - InferenceEngine::Layout, // in layout - InferenceEngine::Layout, // out layout LayerTestsUtils::TargetDevice // Device name > convLayerTestParamsSet; namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp index dbc772cf55c..18809f8113e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convolution_backprop_data.hpp @@ -25,6 +25,10 @@ typedef std::tuple< typedef std::tuple< convBackpropDataSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice // Device name > convBackpropDataLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp index 75b032843cf..7372446ebef 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/ctc_greedy_decoder.hpp @@ -31,6 +31,10 @@ namespace LayerTestsDefinitions { typedef std::tuple< InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, bool, std::string> ctcGreedyDecoderParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp index afa55afdea7..83823bd33d1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/eltwise.hpp @@ -23,6 +23,9 @@ typedef std::tuple< ngraph::helpers::InputLayerType, // secondary input type CommonTestUtils::OpType, // op type InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout std::string, // Device name std::map // Additional network configuration > EltwiseTestParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp index 5583c0f6f08..b910997e7d8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/extract_image_patches.hpp @@ -20,6 +20,9 @@ using extractImagePatchesTuple = typename std::tuple< std::vector, // rates ngraph::op::PadType, // pad type InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout LayerTestsUtils::TargetDevice>; // Device name class ExtractImagePatchesTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp index a23db9b030c..18412b31fa2 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/fake_quantize.hpp @@ -22,6 +22,10 @@ typedef std::tuple< typedef std::tuple< fqSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice, // Device name diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp index 86d8994088d..83b2d23e3bc 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather.hpp @@ -21,6 +21,10 @@ typedef std::tuple< int, // Gather axis std::vector, // Input shapes InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string // Device name > gatherParamsTuple; class GatherLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp index 8042b648772..56ce9d7de32 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/gather_tree.hpp @@ -19,6 +19,10 @@ using GatherTreeParamsTuple = typename std::tuple< std::vector, // Input tensors shape ngraph::helpers::InputLayerType, // Secondary input type InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name class GatherTreeLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp index 357361a21c4..41e4d484f6d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/grn.hpp @@ -31,6 +31,10 @@ namespace LayerTestsDefinitions { typedef std::tuple< InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, float, std::string> grnParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp index 5483a97ed20..d853838ef59 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution.hpp @@ -25,6 +25,10 @@ typedef std::tuple< typedef std::tuple< groupConvSpecificParams, InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, LayerTestsUtils::TargetDevice> groupConvLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp index 4fa792ca866..9d06059ce72 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/group_convolution_backprop_data.hpp @@ -25,6 +25,10 @@ typedef std::tuple< typedef std::tuple< groupConvBackpropDataSpecificParams, InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, LayerTestsUtils::TargetDevice> groupConvBackpropDataLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp index 17b6386bcd7..b5484c58ea1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/interpolate.hpp @@ -32,6 +32,10 @@ typedef std::tuple< typedef std::tuple< InterpolateSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes InferenceEngine::SizeVector, // Target shapes LayerTestsUtils::TargetDevice // Device name diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp index 40dc8a497fb..d41deecae03 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp @@ -19,10 +19,13 @@ using InputShapesTuple = std::pair, std::vector>; typedef std::tuple< LogicalParams::InputShapesTuple, // Input shapes tuple - InferenceEngine::Precision, // Inputs precision ngraph::helpers::LogicalTypes, // Logical op type ngraph::helpers::InputLayerType, // Second input type InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string, // Device name std::map // Additional network configuration > LogicalTestParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp index 917768e16c6..002cd4ea4b9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/lrn.hpp @@ -24,6 +24,8 @@ typedef std::tuple< size_t, // Size std::vector, // Reduction axes InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision InferenceEngine::SizeVector, // Input shapes std::string // Device name > lrnLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp index d8bce666f43..31db51fe1d5 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mat_mul.hpp @@ -13,6 +13,9 @@ typedef std::tuple< InferenceEngine::Precision, + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout InferenceEngine::SizeVector, InferenceEngine::SizeVector, bool, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp index 0f7d77960e5..bcf6333a7ef 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/minimum_maximum.hpp @@ -18,6 +18,10 @@ using MaxMinParamsTuple = typename std::tuple< std::vector>, // Input shapes ngraph::helpers::MinMaxOpType, // OperationType InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout ngraph::helpers::InputLayerType, // Secondary input type std::string>; // Device name diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp index b31f1b172d3..c055254a389 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pad.hpp @@ -18,6 +18,9 @@ typedef std::tuple< float, // argPadValue ngraph::helpers::PadMode, // padMode InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice // Target device name > padLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp index c3bc414c615..975a771dc13 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/pooling.hpp @@ -30,6 +30,10 @@ typedef std::tuple< typedef std::tuple< poolSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::vector, // Input shape std::string // Device name > poolLayerTestParamsSet; @@ -37,6 +41,10 @@ typedef std::tuple< typedef std::tuple< poolSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout size_t, // Channel number std::string // Device name > globalPoolLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp index a362cb26d12..dfc07c4827b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/power.hpp @@ -16,6 +16,10 @@ namespace LayerTestsDefinitions { using PowerParamsTuple = typename std::tuple< std::vector>, //input shapes InferenceEngine::Precision, //Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string, //Device name std::vector>; //power diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp index f62980744d7..683711d0590 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/prior_box_clustered.hpp @@ -39,6 +39,10 @@ typedef std::tuple< typedef std::tuple< priorBoxClusteredSpecificParams, InferenceEngine::Precision, // net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // input shape InferenceEngine::SizeVector, // image shape std::string> priorBoxClusteredLayerParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp index 9a7d4a9fabe..b541d5be97c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/range.hpp @@ -18,6 +18,10 @@ typedef std::tuple< float, // stop float, // step InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string // Target device name > RangeParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp index 0b5ce1b23a7..855da9fde70 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reduce_ops.hpp @@ -21,6 +21,9 @@ typedef std::tuple< bool, // Keep dims ngraph::helpers::ReductionType, // Reduce operation type InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout std::vector, // Input shapes std::string // Target device name > reduceMeanParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp index 3467f7c1036..ecf3e84eace 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/reshape.hpp @@ -17,6 +17,10 @@ namespace LayerTestsDefinitions { typedef std::tuple< bool, // SpecialZero InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::vector, // Input shapes std::vector, // OutForm Shapes std::string, // Device name diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp index 32bbc2062dd..a4335f0cb94 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/shuffle_channels.hpp @@ -18,6 +18,10 @@ typedef std::tuple< typedef std::tuple< shuffleChannelsSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice // Device name > shuffleChannelsLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp index 81f1cb55705..87dd39587e8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/softmax.hpp @@ -19,7 +19,10 @@ namespace LayerTestsDefinitions { using softMaxLayerTestParams = std::tuple< InferenceEngine::Precision, // netPrecision - InferenceEngine::Layout, // inputLayout + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // inputShape size_t, // axis std::string, // targetDevice diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp index be16f077ec7..5850ef4507b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/space_to_batch.hpp @@ -19,6 +19,10 @@ using spaceToBatchParamsTuple = typename std::tuple< std::vector, // pads_end std::vector, // Input shapes InferenceEngine::Precision, // Network precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string>; // Device name>; class SpaceToBatchLayerTest : public testing::WithParamInterface, diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp index a593ba0a790..cd427be4f3d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/split.hpp @@ -18,6 +18,10 @@ typedef std::tuple< size_t, // Num splits size_t, // Axis InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::vector, // Input shapes std::string // Target device name > splitParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp index 4aaf5f72735..cfd81d628f9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/squeeze_unsqueeze.hpp @@ -19,6 +19,10 @@ typedef std::tuple< ShapeAxesTuple, // InputShape, Squeeze indexes ngraph::helpers::SqueezeOpType, // OpType InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string // Target device name > squeezeParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp index 1355792102f..cfedd17f2e3 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/strided_slice.hpp @@ -28,6 +28,10 @@ struct StridedSliceSpecificParams { using StridedSliceParams = std::tuple< StridedSliceSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::string, // Device name std::map // Additional network configuration >; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp index 15a183c9bc1..4ed8b8284f5 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/tile.hpp @@ -18,6 +18,10 @@ typedef std::vector TileSpecificParams; typedef std::tuple< TileSpecificParams, InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes LayerTestsUtils::TargetDevice // Device name > TileLayerTestParamsSet; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp index 94e4be583b6..a20d75f9be0 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/topk.hpp @@ -17,6 +17,9 @@ typedef std::tuple< ngraph::opset4::TopK::Mode, // mode ngraph::opset4::TopK::SortType, // sort InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout InferenceEngine::SizeVector, // inputShape std::string // Target device name > TopKParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp index 76760ac7985..f546df29dde 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/transpose.hpp @@ -17,6 +17,10 @@ namespace LayerTestsDefinitions { typedef std::tuple< std::vector, // Input order InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::vector, // Input shapes std::string // Target device name > transposeParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp index 26dc0d6f0d0..bad439b7721 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/variadic_split.hpp @@ -18,6 +18,10 @@ namespace LayerTestsDefinitions { std::vector, // Num splits size_t, // Axis InferenceEngine::Precision, // Net precision + InferenceEngine::Precision, // Input precision + InferenceEngine::Precision, // Output precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout std::vector, // Input shapes std::string // Target device name > VariadicSplitParams; diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp index fc3f575d090..467d8dc756c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/activation.cpp @@ -21,10 +21,12 @@ namespace LayerTestsDefinitions { std::string ActivationLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; std::pair, std::vector> shapes; std::string targetDevice; std::pair> activationDecl; - std::tie(activationDecl, netPrecision, shapes, targetDevice) = obj.param; + std::tie(activationDecl, netPrecision, inPrc, outPrc, inLayout, outLayout, shapes, targetDevice) = obj.param; std::ostringstream result; const char separator = '_'; @@ -33,7 +35,11 @@ std::string ActivationLayerTest::getTestCaseName(const testing::TestParamInfogetTensorDesc(), &alpha, 1); - blobHardSigmoidLambda = FuncTestUtils::createAndFillBlobWithFloatArray(blobHardSigmoidLambda->getTensorDesc(), &lambda, 1); + blobHardSigmoidLambda = FuncTestUtils::createAndFillBlobWithFloatArray(blobHardSigmoidLambda->getTensorDesc(), &lambda, + 1); } default: THROW_IE_EXCEPTION << "Unsupported activation type for Params test type"; @@ -180,7 +187,7 @@ void ActivationParamLayerTest::SetUp() { InferenceEngine::Precision netPrecision; std::pair, std::vector> shapes; std::pair> activationDecl; - std::tie(activationDecl, netPrecision, shapes, targetDevice) = GetParam(); + std::tie(activationDecl, netPrecision, inPrc, outPrc, inLayout, outLayout, shapes, targetDevice) = GetParam(); activationType = activationDecl.first; constantsValue = activationDecl.second; diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp index 76c52558bc1..5428286f1f5 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_norm.cpp @@ -8,16 +8,22 @@ namespace LayerTestsDefinitions { std::string BatchNormLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; InferenceEngine::SizeVector inputShapes; double epsilon; std::string targetDevice; - std::tie(epsilon, netPrecision, inputShapes, targetDevice) = obj.param; + std::tie(epsilon, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, targetDevice) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; result << "epsilon=" << epsilon << "_"; result << "netPRC=" << netPrecision.name() << "_"; - result << "targetDevice=" << targetDevice; + result << "inPRC=" << inPrc.name() << "_"; + result << "outPRC=" << outPrc.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetDevice; return result.str(); } @@ -25,7 +31,7 @@ void BatchNormLayerTest::SetUp() { InferenceEngine::Precision netPrecision; InferenceEngine::SizeVector inputShapes; double epsilon; - std::tie(epsilon, netPrecision, inputShapes, targetDevice) = this->GetParam(); + std::tie(epsilon, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, targetDevice) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {inputShapes}); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp index 028605beb3d..3c23ffbd500 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/batch_to_space.cpp @@ -23,15 +23,21 @@ namespace LayerTestsDefinitions { std::string BatchToSpaceLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { std::vector inShapes, blockShape, cropsBegin, cropsEnd; InferenceEngine::Precision netPrc; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; std::string targetName; - std::tie(blockShape, cropsBegin, cropsEnd, inShapes, netPrc, targetName) = obj.param; + std::tie(blockShape, cropsBegin, cropsEnd, inShapes, netPrc, inPrc, outPrc, inLayout, outLayout, targetName) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inShapes) << "_"; result << "netPRC=" << netPrc.name() << "_"; + result << "inPRC=" << inPrc.name() << "_"; + result << "outPRC=" << outPrc.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; result << "BS=" << CommonTestUtils::vec2str(blockShape) << "_"; result << "CB=" << CommonTestUtils::vec2str(cropsBegin) << "_"; result << "CE=" << CommonTestUtils::vec2str(cropsEnd) << "_"; - result << "targetDevice=" << targetName << "_"; + result << "trgDev=" << targetName << "_"; return result.str(); } @@ -39,7 +45,7 @@ void BatchToSpaceLayerTest::SetUp() { SetRefMode(LayerTestsUtils::RefMode::INTERPRETER_TRANSFORMATIONS); std::vector inputShape, blockShape, cropsBegin, cropsEnd; InferenceEngine::Precision netPrecision; - std::tie(blockShape, cropsBegin, cropsEnd, inputShape, netPrecision, targetDevice) = this->GetParam(); + std::tie(blockShape, cropsBegin, cropsEnd, inputShape, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {inputShape}); auto paramOuts = ngraph::helpers::convert2OutputVector( diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp index 9f10b0b7737..073f8eed5b6 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/concat.cpp @@ -24,13 +24,19 @@ std::string ConcatLayerTest::getTestCaseName(const testing::TestParamInfo> inputShapes; InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; std::string targetName; - std::tie(axis, inputShapes, netPrecision, targetName) = obj.param; + std::tie(axis, inputShapes, netPrecision, inPrc, outPrc, inLayout, outLayout, targetName) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; result << "axis=" << axis << "_"; result << "netPRC=" << netPrecision.name() << "_"; - result << "targetDevice=" << targetName << "_"; + result << "inPRC=" << inPrc.name() << "_"; + result << "outPRC=" << outPrc.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetName << "_"; return result.str(); } @@ -38,7 +44,7 @@ void ConcatLayerTest::SetUp() { int axis; std::vector> inputShape; InferenceEngine::Precision netPrecision; - std::tie(axis, inputShape, netPrecision, targetDevice) = this->GetParam(); + std::tie(axis, inputShape, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, inputShape); auto paramOuts = ngraph::helpers::convert2OutputVector( diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp index 132ef965535..d45f2a20274 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert.cpp @@ -17,21 +17,24 @@ namespace LayerTestsDefinitions { std::string ConvertLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { InferenceEngine::Precision inputPrecision, targetPrecision; + InferenceEngine::Layout inLayout, outLayout; std::string targetName; std::vector> inputShape; - std::tie(inputShape, inputPrecision, targetPrecision, targetName) = obj.param; + std::tie(inputShape, inputPrecision, targetPrecision, inLayout, outLayout, targetName) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShape) << "_"; result << "targetPRC=" << targetPrecision.name() << "_"; result << "inputPRC=" << inputPrecision.name() << "_"; - result << "targetDevice=" << targetName; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetName; return result.str(); } void ConvertLayerTest::SetUp() { InferenceEngine::Precision inputPrecision, targetPrecision; std::vector> inputShape; - std::tie(inputShape, inputPrecision, targetPrecision, targetDevice) = GetParam(); + std::tie(inputShape, inputPrecision, targetPrecision, inLayout, outLayout, targetDevice) = GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); auto targetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(targetPrecision); auto params = ngraph::builder::makeParams(ngPrc, inputShape); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp index 04d674bb3cb..cf11f2be059 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convert_like.cpp @@ -17,22 +17,25 @@ namespace LayerTestsDefinitions { std::string ConvertLikeLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { InferenceEngine::Precision precision, targetPrecision; + InferenceEngine::Layout inLayout, outLayout; std::vector> inputShape1, inputShape2; std::string targetName; - std::tie(inputShape1, precision, inputShape2, targetPrecision, targetName) = obj.param; + std::tie(inputShape1, precision, inputShape2, targetPrecision, inLayout, outLayout, targetName) = obj.param; std::ostringstream result; result << "IS1=" << CommonTestUtils::vec2str(inputShape1) << "_"; result << "IS2=" << CommonTestUtils::vec2str(inputShape2) << "_"; result << "PRC1=" << precision.name() << "_"; result << "PRC2=" << targetPrecision.name() << "_"; - result << "targetDevice=" << targetName; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetName; return result.str(); } void ConvertLikeLayerTest::SetUp() { InferenceEngine::Precision inputPrecision, targetPrecision; std::vector> inputShape1, inputShape2; - std::tie(inputShape1, inputPrecision, inputShape2, targetPrecision, targetDevice) = GetParam(); + std::tie(inputShape1, inputPrecision, inputShape2, targetPrecision, inLayout, outLayout, targetDevice) = GetParam(); auto ngPrc1 = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); auto targetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(targetPrecision); auto params = ngraph::builder::makeParams(ngPrc1, inputShape1); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp index 393f8783ebc..9e02aeaae3a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/convolution.cpp @@ -23,11 +23,12 @@ namespace LayerTestsDefinitions { std::string ConvolutionLayerTest::getTestCaseName(testing::TestParamInfo obj) { convSpecificParams convParams; InferenceEngine::Precision netPrecision; - InferenceEngine::Precision inPrecision, outPrecision; - InferenceEngine::SizeVector inputShapes; + InferenceEngine::Precision inPrc, outPrc; InferenceEngine::Layout inLayout, outLayout; + InferenceEngine::SizeVector inputShapes; std::string targetDevice; - std::tie(convParams, netPrecision, inPrecision, outPrecision, inputShapes, inLayout, outLayout, targetDevice) = obj.param; + std::tie(convParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, targetDevice) = + obj.param; ngraph::op::PadType padType; InferenceEngine::SizeVector kernel, stride, dilation; std::vector padBegin, padEnd; @@ -44,11 +45,11 @@ std::string ConvolutionLayerTest::getTestCaseName(testing::TestParamInfo indicesShape; std::vector inputShape; InferenceEngine::Precision netPrecision; - std::tie(indices, indicesShape, axis, inputShape, netPrecision, targetDevice) = this->GetParam(); + std::tie(indices, indicesShape, axis, inputShape, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = this->GetParam(); ASSERT_EQ(ngraph::shape_size(indicesShape), indices.size()) << "Indices vector size and provided indices shape doesn't fit each other"; auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp index 172539bbf43..08cc8c0246a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gather_tree.cpp @@ -17,16 +17,22 @@ namespace LayerTestsDefinitions { std::string GatherTreeLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { std::vector inputShape; InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; ngraph::helpers::InputLayerType secondaryInputType; std::string targetName; - std::tie(inputShape, secondaryInputType, netPrecision, targetName) = obj.param; + std::tie(inputShape, secondaryInputType, netPrecision, inPrc, outPrc, inLayout, outLayout, targetName) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShape) << "_"; result << "secondaryInputType=" << secondaryInputType << "_"; result << "netPRC=" << netPrecision.name() << "_"; - result << "targetDevice=" << targetName; + result << "inPRC=" << inPrc.name() << "_"; + result << "outPRC=" << outPrc.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetName; return result.str(); } @@ -35,7 +41,7 @@ void GatherTreeLayerTest::SetUp() { InferenceEngine::Precision netPrecision; ngraph::helpers::InputLayerType secondaryInputType; - std::tie(inputShape, secondaryInputType, netPrecision, targetDevice) = GetParam(); + std::tie(inputShape, secondaryInputType, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp index 5cc98df48bd..c35cee4e454 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/grn.cpp @@ -24,10 +24,13 @@ namespace LayerTestsDefinitions { std::string GrnLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; InferenceEngine::SizeVector inputShapes; std::string targetDevice; float bias; std::tie(netPrecision, + inPrc, outPrc, inLayout, outLayout, inputShapes, bias, targetDevice) = obj.param; @@ -37,14 +40,18 @@ std::string GrnLayerTest::getTestCaseName(const testing::TestParamInfoGetParam(); + std::tie(inputShapes, opType, netPrecision, inPrc, outPrc, inLayout, outLayout, inputType, targetDevice) = this->GetParam(); if (inputShapes.size() != 2) { THROW_IE_EXCEPTION << "Unsupported inputs number for Minimum/Maximum operaton"; } diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp index 98fb6121645..08c62661b87 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/pad.cpp @@ -15,12 +15,15 @@ namespace LayerTestsDefinitions { std::string PadLayerTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout; InferenceEngine::SizeVector inputShapes; std::vector padsBegin, padsEnd; ngraph::helpers::PadMode padMode; float argPadValue; std::string targetDevice; - std::tie(padsBegin, padsEnd, argPadValue, padMode, netPrecision, inputShapes, targetDevice) = obj.param; + std::tie(padsBegin, padsEnd, argPadValue, padMode, netPrecision, inPrc, outPrc, inLayout, inputShapes, targetDevice) = + obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; @@ -31,7 +34,10 @@ std::string PadLayerTest::getTestCaseName(testing::TestParamInfo> inputShapes; InferenceEngine::Precision netPrecision; std::vector power; - std::tie(inputShapes, netPrecision, targetDevice, power) = this->GetParam(); + std::tie(inputShapes, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice, power) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto paramsIn = ngraph::builder::makeParams(ngPrc, {inputShapes[0]}); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp index fe28f1aec19..174f9209a9c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp @@ -25,11 +25,14 @@ namespace LayerTestsDefinitions { std::string PriorBoxClusteredLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; InferenceEngine::SizeVector inputShapes, imageShapes; std::string targetDevice; priorBoxClusteredSpecificParams specParams; std::tie(specParams, netPrecision, + inPrc, outPrc, inLayout, outLayout, inputShapes, imageShapes, targetDevice) = obj.param; @@ -51,6 +54,10 @@ std::string PriorBoxClusteredLayerTest::getTestCaseName(const testing::TestParam result << "IS=" << CommonTestUtils::vec2str(inputShapes) << separator; result << "imageS=" << CommonTestUtils::vec2str(imageShapes) << separator; result << "netPRC=" << netPrecision.name() << separator; + result << "inPRC=" << inPrc.name() << separator; + result << "outPRC=" << outPrc.name() << separator; + result << "inL=" << inLayout << separator; + result << "outL=" << outLayout << separator; result << "widths=" << CommonTestUtils::vec2str(widths) << separator; result << "heights=" << CommonTestUtils::vec2str(heights) << separator; result << "variances="; @@ -62,7 +69,7 @@ std::string PriorBoxClusteredLayerTest::getTestCaseName(const testing::TestParam result << "stepHeight=" << step_height << separator; result << "offset=" << offset << separator; result << "clip=" << std::boolalpha << clip << separator; - result << "targetDevice=" << targetDevice; + result << "trgDev=" << targetDevice; return result.str(); } @@ -146,6 +153,7 @@ std::vector> PriorBoxClusteredLayerTest::CalculateRefs void PriorBoxClusteredLayerTest::SetUp() { priorBoxClusteredSpecificParams specParams; std::tie(specParams, netPrecision, + inPrc, outPrc, inLayout, outLayout, inputShapes, imageShapes, targetDevice) = GetParam(); std::tie(widths, diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp index ef6dffffe77..94a87d37d00 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/range.cpp @@ -19,9 +19,11 @@ namespace LayerTestsDefinitions { std::string RangeLayerTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; float start, stop, step; std::string targetDevice; - std::tie(start, stop, step, netPrecision, targetDevice) = obj.param; + std::tie(start, stop, step, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = obj.param; std::ostringstream result; const char separator = '_'; @@ -29,7 +31,11 @@ std::string RangeLayerTest::getTestCaseName(testing::TestParamInfo result << "Stop=" << stop << separator; result << "Step=" << step << separator; result << "netPRC=" << netPrecision.name() << separator; - result << "targetDevice=" << targetDevice; + result << "inPRC=" << inPrc.name() << separator; + result << "outPRC=" << outPrc.name() << separator; + result << "inL=" << inLayout << separator; + result << "outL=" << outLayout << separator; + result << "trgDev=" << targetDevice; return result.str(); } @@ -51,7 +57,7 @@ void RangeLayerTest::Infer() { void RangeLayerTest::SetUp() { InferenceEngine::Precision netPrecision; - std::tie(start, stop, step, netPrecision, targetDevice) = GetParam(); + std::tie(start, stop, step, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {std::vector(), std::vector(), std::vector()}); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp index 7191be4060a..507944f692c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/reduce_ops.cpp @@ -21,13 +21,15 @@ namespace LayerTestsDefinitions { std::string ReduceOpsLayerTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout; bool keepDims; ngraph::helpers::ReductionType reductionType; std::vector inputShape; std::vector axes; CommonTestUtils::OpType opType; std::string targetDevice; - std::tie(axes, opType, keepDims, reductionType, netPrecision, inputShape, targetDevice) = obj.param; + std::tie(axes, opType, keepDims, reductionType, netPrecision, inPrc, outPrc, inLayout, inputShape, targetDevice) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShape) << "_"; result << "axes=" << CommonTestUtils::vec2str(axes) << "_"; @@ -35,7 +37,10 @@ std::string ReduceOpsLayerTest::getTestCaseName(testing::TestParamInfo inputShape, blockShape, padsBegin, padsEnd; InferenceEngine::Precision inputPrecision, netPrecision; - std::tie(blockShape, padsBegin, padsEnd, inputShape, netPrecision, targetDevice) = this->GetParam(); + std::tie(blockShape, padsBegin, padsEnd, inputShape, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {inputShape}); diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp index a244f2c3da5..325ebe72a76 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/split.cpp @@ -24,16 +24,22 @@ namespace LayerTestsDefinitions { std::string SplitLayerTest::getTestCaseName(testing::TestParamInfo obj) { size_t numSplits, axis; InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; InferenceEngine::SizeVector inputShapes; std::string targetDevice; - std::tie(numSplits, axis, netPrecision, inputShapes, targetDevice) = obj.param; + std::tie(numSplits, axis, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, targetDevice) = obj.param; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; result << "numSplits=" << numSplits << "_"; result << "axis=" << axis << "_"; result << "IS"; result << "netPRC=" << netPrecision.name() << "_"; - result << "targetDevice=" << targetDevice; + result << "inPRC=" << inPrc.name() << "_"; + result << "outPRC=" << outPrc.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetDevice; return result.str(); } @@ -42,7 +48,7 @@ void SplitLayerTest::SetUp() { size_t axis, numSplits; std::vector inputShape; InferenceEngine::Precision netPrecision; - std::tie(numSplits, axis, netPrecision, inputShape, targetDevice) = this->GetParam(); + std::tie(numSplits, axis, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShape, targetDevice) = this->GetParam(); auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {inputShape}); auto paramOuts = ngraph::helpers::convert2OutputVector( diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp index 04bdd462111..979511140ed 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/squeeze_unsqueeze.cpp @@ -19,10 +19,12 @@ namespace LayerTestsDefinitions { std::string SqueezeUnsqueezeLayerTest::getTestCaseName(testing::TestParamInfo obj) { InferenceEngine::Precision netPrecision; + InferenceEngine::Precision inPrc, outPrc; + InferenceEngine::Layout inLayout, outLayout; ShapeAxesTuple shapeItem; std::string targetDevice; ngraph::helpers::SqueezeOpType opType; - std::tie(shapeItem, opType, netPrecision, targetDevice) = obj.param; + std::tie(shapeItem, opType, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = obj.param; std::ostringstream result; const char separator = '_'; @@ -30,7 +32,11 @@ std::string SqueezeUnsqueezeLayerTest::getTestCaseName(testing::TestParamInfo