From 9efe7dc29dc51a762630179cc61ff8b2beb6fa9d Mon Sep 17 00:00:00 2001 From: Nadezhda Date: Wed, 30 Aug 2023 19:40:29 +0000 Subject: [PATCH] [NVIDIA][WIP] Tests --- .../convolution_biasadd_activation.cpp | 155 ++++++++---------- .../convolution_biasadd_activation.hpp | 2 +- .../group_convolution_biasadd_activation.cpp | 85 +++++++++- ...ution_biasadd_activation_autogenerated.cpp | 121 +++++++------- 4 files changed, 218 insertions(+), 145 deletions(-) diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp index 482e002d41..60c02883a3 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp @@ -80,11 +80,6 @@ TEST_P(ConvolutionBiasAddAddActivationThresholdLayerTest, CompareWithRefs) { } namespace { - -// NOTE: Default precision where difference between reference and actual -// are bigger than defined threshold -const auto defaultPrecision = InferenceEngine::Precision::FP32; - const std::vector netPrecisions = { InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32, @@ -157,7 +152,7 @@ INSTANTIATE_TEST_CASE_P( ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( - smoke_Convolution2DBiasAddActivation_ExplicitPaddingSymmetric2_FP32, + smoke_Convolution2DBiasAddActivation_ExplicitPaddingSymmetric2, ConvolutionBiasAddActivationThresholdLayerTest, ::testing::Combine(::testing::Combine(conv2DParams_ExplicitPaddingSymmetric2, ::testing::ValuesIn(netPrecisions), @@ -171,21 +166,7 @@ INSTANTIATE_TEST_CASE_P( ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( - DISABLED_smoke_Convolution2DBiasAddActivation_ExplicitPaddingSymmetric2_FP16, - ConvolutionBiasAddActivationThresholdLayerTest, - ::testing::Combine(::testing::Combine(conv2DParams_ExplicitPaddingSymmetric2, - ::testing::Values(InferenceEngine::Precision::FP16), - ::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(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(netActivations)), - ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); - -INSTANTIATE_TEST_CASE_P( - DISABLED_smoke_Convolution2DBiasAddActivation_ExplicitPaddingAsymmetric1, + smoke_Convolution2DBiasAddActivation_ExplicitPaddingAsymmetric1, ConvolutionBiasAddActivationThresholdLayerTest, ::testing::Combine(::testing::Combine(conv2DParams_ExplicitPaddingAsymmetric1, ::testing::ValuesIn(netPrecisions), @@ -199,7 +180,7 @@ INSTANTIATE_TEST_CASE_P( ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( - DISABLED_smoke_Convolution2DBiasAddActivation_ExplicitPaddingAsymmetric2, + smoke_Convolution2DBiasAddActivation_ExplicitPaddingAsymmetric2, ConvolutionBiasAddActivationThresholdLayerTest, ::testing::Combine(::testing::Combine(conv2DParams_ExplicitPaddingAsymmetric2, ::testing::ValuesIn(netPrecisions), @@ -262,7 +243,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -492,7 +473,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -653,7 +634,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(512), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -883,7 +864,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(512), // Num out channels ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -906,7 +887,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(512), // Num out channels ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -929,7 +910,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::Values(defaultPrecision), // Net precision + ::testing::ValuesIn(netPrecisions), // Net precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout @@ -1037,14 +1018,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 128, 128})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1065,14 +1046,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 16, 16})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1093,14 +1074,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 32, 32})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1121,14 +1102,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 8, 8})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1149,14 +1130,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1177,14 +1158,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 64, 64})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1205,14 +1186,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 16, 16})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1233,14 +1214,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 8, 8})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1261,14 +1242,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 128, 128})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1289,14 +1270,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 32, 32})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1317,14 +1298,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 64, 64})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1345,14 +1326,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 16, 16})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1373,14 +1354,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 32, 32})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1401,14 +1382,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 64, 64})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1429,14 +1410,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 144, 144, 144})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1457,14 +1438,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 18, 18, 18})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1485,14 +1466,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 36, 36, 36})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1520,7 +1501,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 9, 9, 9})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1541,14 +1522,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1569,14 +1550,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 72, 72, 72})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1597,14 +1578,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 18, 18, 18})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1625,14 +1606,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(256), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 9, 9, 9})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1653,14 +1634,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(16), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 144, 144, 144})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1681,14 +1662,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 36, 36, 36})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1709,14 +1690,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 72, 72, 72})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1737,14 +1718,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(128), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 18, 18, 18})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1765,14 +1746,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(64), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 36, 36, 36})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1793,14 +1774,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(32), // Num out channels ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 72, 72, 72})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1821,14 +1802,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1})), // dilations ::testing::Values(1), // Num out channels ::testing::Values(ov::op::PadType::VALID)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); @@ -1849,14 +1830,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({1, 1, 1})), // dilations ::testing::Values(1), // Num out channels ::testing::Values(ov::op::PadType::VALID)), // Padding type - ::testing::ValuesIn(std::vector{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), + ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp index 957f70c780..eb11da94c6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp @@ -120,7 +120,7 @@ class BasicConvolutionBiasAddActivationLayerTest for (size_t i = 0; i < biasShape.size(); ++i) { if (i != channel_dim_index) biasShape[i] = 1; } - auto biasLayer = std::make_shared(ngNetPrc, biasShape); + auto biasLayer = std::make_shared(ngNetPrc, biasShape, std::vector{1}); auto biasAddLayer = std::make_shared(convLayer, biasLayer); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp index fe23482bc7..38add843d6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp @@ -131,6 +131,60 @@ const auto smoke_2D_ExplicitPaddingSymmetric_Params = ::testing::Combine( ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); +const auto smoke_2D_ExplicitPaddingSymmetric_Params2 = ::testing::Combine( + ::testing::Combine(::testing::Combine(::testing::Values(std::vector({3, 3})), // kernels + ::testing::Values(std::vector({2, 2})), // strides + ::testing::Values(std::vector({1, 1})), // pads_begin + ::testing::Values(std::vector({1, 1})), // pads_end + ::testing::Values(std::vector({1, 1})), // dilations + ::testing::Values(96), // out channels + ::testing::Values(2), // groups + ::testing::Values(ov::op::PadType::EXPLICIT)), + ::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, 96, 112, 112})), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(netActivations)); + +const auto smoke_2D_ExplicitPaddingSymmetric_Params3 = ::testing::Combine( + ::testing::Combine(::testing::Combine(::testing::Values(std::vector({1, 1})), // kernels + ::testing::Values(std::vector({1, 1})), // strides + ::testing::Values(std::vector({0, 0})), // pads_begin + ::testing::Values(std::vector({0, 0})), // pads_end + ::testing::Values(std::vector({1, 1})), // dilations + ::testing::Values(160), // out channels + ::testing::Values(2), // groups + ::testing::Values(ov::op::PadType::EXPLICIT)), + ::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, 480, 14, 14})), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(netActivations)); + +const auto smoke_2D_ExplicitPaddingSymmetric_Params4 = ::testing::Combine( + ::testing::Combine(::testing::Combine(::testing::Values(std::vector({1, 1})), // kernels + ::testing::Values(std::vector({1, 1})), // strides + ::testing::Values(std::vector({0, 0})), // pads_begin + ::testing::Values(std::vector({0, 0})), // pads_end + ::testing::Values(std::vector({1, 1})), // dilations + ::testing::Values(40), // out channels + ::testing::Values(2), // groups + ::testing::Values(ov::op::PadType::EXPLICIT)), + ::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, 192, 56, 56})), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), + ::testing::ValuesIn(netActivations)); + const auto smoke_2D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( ::testing::Combine(::testing::Combine(::testing::ValuesIn(kernels2D), ::testing::ValuesIn(strides2D), @@ -159,6 +213,36 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAddAdd_2D_ExplicitPaddingSymme smoke_2D_ExplicitPaddingSymmetric_Params, GroupConvolutionBiasAddAddActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_2D_ExplicitPaddingSymmetric2, + GroupConvolutionBiasAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params2, + GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); + +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAddAdd_2D_ExplicitPaddingSymmetric2, + GroupConvolutionBiasAddAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params2, + GroupConvolutionBiasAddAddActivationLayerTest::getTestCaseName); + +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_2D_ExplicitPaddingSymmetric3, + GroupConvolutionBiasAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params3, + GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); + +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAddAdd_2D_ExplicitPaddingSymmetric3, + GroupConvolutionBiasAddAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params3, + GroupConvolutionBiasAddAddActivationLayerTest::getTestCaseName); + +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_2D_ExplicitPaddingSymmetric4, + GroupConvolutionBiasAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params4, + GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); + +INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAddAdd_2D_ExplicitPaddingSymmetric4, + GroupConvolutionBiasAddAddActivationLayerTest, + smoke_2D_ExplicitPaddingSymmetric_Params4, + GroupConvolutionBiasAddAddActivationLayerTest::getTestCaseName); + INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_smoke_2D_ExplicitPaddingAsymmetric, GroupConvolutionBiasAddActivationLayerTest, smoke_2D_ExplicitPaddingAsymmetric_Params, @@ -235,5 +319,4 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAddAdd_3D_ExplicitPaddingAsymm GroupConvolutionBiasAddAddActivationLayerTest, smoke_3D_ExplicitPaddingAsymmetric_Params, GroupConvolutionBiasAddAddActivationLayerTest::getTestCaseName); - } // namespace LayerTestsDefinitions diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp index 532bd10b43..3a8b0258bc 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp @@ -16,6 +16,15 @@ namespace LayerTestsDefinitions { namespace { +const std::vector netPrecisions = { + InferenceEngine::Precision::FP16, + InferenceEngine::Precision::FP32, +}; + +const std::vector netActivations = { + ngraph::helpers::ActivationTypes::None, +}; + // ============================================================================= // clang-format off // {AUTOGENERATED_TESTS_BEGIN_TAG} @@ -38,14 +47,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(144), // Num out channels ::testing::Values(144), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 163, 163})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -67,14 +76,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(192), // Num out channels ::testing::Values(192), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 39, 39})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -96,14 +105,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(240), // Num out channels ::testing::Values(240), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 81, 81})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -125,14 +134,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(256), // Num out channels ::testing::Values(256), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 11, 11})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -154,14 +163,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(64), // Num out channels ::testing::Values(64), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 3, 3})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -183,14 +192,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(672), // Num out channels ::testing::Values(672), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 43, 43})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -212,14 +221,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(96), // Num out channels ::testing::Values(96), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 151, 151})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -241,14 +250,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(96), // Num out channels ::testing::Values(96), // Groups ::testing::Values(ov::op::PadType::EXPLICIT)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 321, 321})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -270,14 +279,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(1152), // Num out channels ::testing::Values(1152), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -299,14 +308,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(144), // Num out channels ::testing::Values(144), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 160, 160})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -328,14 +337,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(144), // Num out channels ::testing::Values(144), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -357,14 +366,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(16), // Num out channels ::testing::Values(16), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 320, 320})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -386,14 +395,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(192), // Num out channels ::testing::Values(192), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 38, 38})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -415,14 +424,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(1920), // Num out channels ::testing::Values(1920), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1920, 20, 20})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -444,14 +453,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(32), // Num out channels ::testing::Values(32), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 150, 150})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -473,14 +482,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(32), // Num out channels ::testing::Values(32), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 320, 320})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -502,14 +511,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(384), // Num out channels ::testing::Values(384), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 19, 19})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -531,14 +540,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(480), // Num out channels ::testing::Values(480), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -560,14 +569,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(576), // Num out channels ::testing::Values(576), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -589,14 +598,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(960), // Num out channels ::testing::Values(960), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 960, 10, 10})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -618,14 +627,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(128), // Num out channels ::testing::Values(128), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 3, 3})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -647,14 +656,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(128), // Num out channels ::testing::Values(128), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 5, 5})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -676,14 +685,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(144), // Num out channels ::testing::Values(144), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -705,14 +714,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(576), // Num out channels ::testing::Values(576), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -734,14 +743,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(1152), // Num out channels ::testing::Values(1152), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -763,14 +772,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(240), // Num out channels ::testing::Values(240), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 80, 80})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -792,14 +801,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(480), // Num out channels ::testing::Values(480), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -821,14 +830,14 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(672), // Num out channels ::testing::Values(672), // Groups ::testing::Values(ov::op::PadType::SAME_UPPER)), // Padding type - ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), // Net precisions + ::testing::ValuesIn(netPrecisions), // Net precisions ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Input precision ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), // Output precision ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 40, 40})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), + ::testing::ValuesIn(netActivations)), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG}