From 04ff7a6eded18a011aeb6f545885b4989f7c7652 Mon Sep 17 00:00:00 2001 From: Szymon Durawa Date: Wed, 11 Aug 2021 05:25:02 +0200 Subject: [PATCH] Move back to ConvolutionBackpropDataLayerTest name. (#6944) --- .../single_layer/convolution_backprop.cpp | 8 ++-- .../convolution_backprop_data.cpp | 42 +++++++++---------- .../convolution_backprop_data.cpp | 16 +++---- .../convolution_backprop_data.cpp | 34 +++++++-------- .../convolution_backprop_data.hpp | 4 +- .../convolution_backprop_data.cpp | 22 +++++++--- 6 files changed, 69 insertions(+), 57 deletions(-) diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp index 0e29deb207e..20ef9cc1a96 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp @@ -4,13 +4,13 @@ #include -#include "shared_test_classes/single_layer/convolution_backprop.hpp" +#include "shared_test_classes/single_layer/convolution_backprop_data.hpp" using namespace LayerTestsDefinitions; namespace { -TEST_P(ConvolutionBackpropLayerTest, Serialize) { +TEST_P(ConvolutionBackpropDataLayerTest, Serialize) { Serialize(); } @@ -42,7 +42,7 @@ const auto convolutionBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(pad_types), ::testing::ValuesIn(outPadding)); INSTANTIATE_TEST_SUITE_P( - smoke_convolutionBackpropData2D_Serialization, ConvolutionBackpropLayerTest, + smoke_convolutionBackpropData2D_Serialization, ConvolutionBackpropDataLayerTest, ::testing::Combine( convolutionBackpropData2DParams, ::testing::ValuesIn(precisions), @@ -53,6 +53,6 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(inputShapes), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); } // namespace 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 7fe868eccba..fb8e870c4f2 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 @@ -4,7 +4,7 @@ #include -#include "single_layer_tests/convolution_backprop.hpp" +#include "single_layer_tests/convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; @@ -51,7 +51,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -62,9 +62,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convol ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -75,12 +75,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, Convoluti ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> inputShape2D = {{1, 3, 9, 12}}; const std::vector> outputShapes2D = {{6, 6}, {4, 9}}; -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_OutputShapeDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_OutputShapeDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -91,7 +91,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_OutputShapeDefined, Con ::testing::ValuesIn(inputShape2D), ::testing::ValuesIn(outputShapes2D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> outputPadding2D = {{1, 1}, {2, 2}}; const std::vector> testStrides2D = {{3, 3}}; @@ -117,7 +117,7 @@ const auto conv2DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding2D) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -128,9 +128,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputP ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -141,7 +141,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddi ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); /* ============= 3D ConvolutionBackpropData ============= */ const std::vector> inputShapes3D = {{1, 3, 10, 10, 10}, @@ -174,7 +174,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -185,9 +185,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convol ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -198,12 +198,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, Convoluti ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> inputShape3D = {{1, 3, 10, 10, 10}}; const std::vector> outputShapes3D = {{8, 8, 8}, {10, 10, 10}}; -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_OutputShapeDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_OutputShapeDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -214,7 +214,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_OutputShapeDefined, Con ::testing::ValuesIn(inputShape3D), ::testing::ValuesIn(outputShapes3D), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> outputPadding3D = {{1, 1, 1}, {2, 2, 2}}; const std::vector> testStrides3D = {{3, 3, 3}}; @@ -240,7 +240,7 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding3D) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -251,9 +251,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputP ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -264,6 +264,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddi ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp index 69544f12e1f..df0fdc1e2ab 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp @@ -8,18 +8,18 @@ #include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include +#include using namespace InferenceEngine; using namespace CPUTestUtils; namespace CPULayerTestsDefinitions { -using LayerTestsDefinitions::convBackpropSpecificParams; -using LayerTestsDefinitions::convBackpropLayerTestParamsSet; +using LayerTestsDefinitions::convBackpropDataSpecificParams; +using LayerTestsDefinitions::convBackpropDataLayerTestParamsSet; typedef std::tuple< - convBackpropLayerTestParamsSet, + convBackpropDataLayerTestParamsSet, CPUSpecificParams, fusingSpecificParams, std::map > deconvLayerCPUTestParamsSet; @@ -28,14 +28,14 @@ class DeconvolutionLayerCPUTest : public testing::WithParamInterface obj) { - convBackpropLayerTestParamsSet basicParamsSet; + convBackpropDataLayerTestParamsSet basicParamsSet; CPUSpecificParams cpuParams; fusingSpecificParams fusingParams; std::map additionalConfig; std::tie(basicParamsSet, cpuParams, fusingParams, additionalConfig) = obj.param; std::ostringstream result; - result << LayerTestsDefinitions::ConvolutionBackpropLayerTest::getTestCaseName(testing::TestParamInfo( + result << LayerTestsDefinitions::ConvolutionBackpropDataLayerTest::getTestCaseName(testing::TestParamInfo( basicParamsSet, 0)); result << CPUTestsBase::getTestCaseName(cpuParams); @@ -52,7 +52,7 @@ public: } protected: void SetUp() override { - convBackpropLayerTestParamsSet basicParamsSet; + convBackpropDataLayerTestParamsSet basicParamsSet; CPUSpecificParams cpuParams; fusingSpecificParams fusingParams; std::map additionalConfig; @@ -63,7 +63,7 @@ protected: std::tie(inFmts, outFmts, priority, selectedType) = cpuParams; std::tie(postOpMgrPtr, fusedOps) = fusingParams; - convBackpropSpecificParams convParams; + convBackpropDataSpecificParams convParams; std::vector inputShape; std::vector outputShape; auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; 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 a34a5b75e1b..ad7515c6f5c 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 @@ -4,7 +4,7 @@ #include -#include "single_layer_tests/convolution_backprop.hpp" +#include "single_layer_tests/convolution_backprop_data.hpp" #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; @@ -56,7 +56,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions2D), @@ -67,9 +67,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convol ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions2D), @@ -80,7 +80,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, Convoluti ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> outputPadding2D = {{1, 1}, {2, 2}}; const std::vector> testStrides2D = {{3, 3}}; @@ -106,7 +106,7 @@ const auto conv2DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding2D) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -117,9 +117,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputP ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -130,7 +130,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddi ::testing::ValuesIn(inputShapes2D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); /* ============= 3D ConvolutionBackpropData ============= */ const std::vector netPrecisions3D = { @@ -166,7 +166,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions3D), @@ -177,9 +177,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convol ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions3D), @@ -190,7 +190,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, Convoluti ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); const std::vector> outputPadding3D = {{1, 1, 1}, {2, 2, 2}}; const std::vector> testStrides3D = {{3, 3, 3}}; @@ -216,7 +216,7 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding3D) ); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -227,9 +227,9 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputP ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropDataLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -240,6 +240,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddi ::testing::ValuesIn(inputShapes3D), ::testing::ValuesIn(emptyOutputShape), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvolutionBackpropLayerTest::getTestCaseName); + ConvolutionBackpropDataLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp index 9aeb9a1a2be..933f3d6d89b 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution_backprop_data.hpp @@ -24,7 +24,8 @@ typedef std::tuple< std::vector, // Pad end InferenceEngine::SizeVector, // Dilation size_t, // Num out channels - ngraph::op::PadType // Padding type + ngraph::op::PadType, // Padding type + std::vector // Output padding > convBackpropDataSpecificParams; typedef std::tuple< convBackpropDataSpecificParams, @@ -34,6 +35,7 @@ typedef std::tuple< InferenceEngine::Layout, // Input layout InferenceEngine::Layout, // Output layout InferenceEngine::SizeVector, // Input shapes + InferenceEngine::SizeVector, // Output shapes LayerTestsUtils::TargetDevice // Device name > convBackpropDataLayerTestParamsSet; diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp index f2656a3c2ab..c1e642d6764 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution_backprop_data.cpp @@ -14,21 +14,24 @@ std::string ConvolutionBackpropDataLayerTest::getTestCaseName(testing::TestParam InferenceEngine::Precision inPrc, outPrc; InferenceEngine::Layout inLayout, outLayout; InferenceEngine::SizeVector inputShapes; + InferenceEngine::SizeVector outputShapes; std::string targetDevice; - std::tie(convBackpropDataParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, targetDevice) = obj.param; + std::tie(convBackpropDataParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, outputShapes, targetDevice) = obj.param; ngraph::op::PadType padType; InferenceEngine::SizeVector kernel, stride, dilation; - std::vector padBegin, padEnd; + std::vector padBegin, padEnd, outPadding; size_t convOutChannels; - std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convBackpropDataParams; + std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType, outPadding) = convBackpropDataParams; std::ostringstream result; result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; + result << "OS=" << CommonTestUtils::vec2str(outputShapes) << "_"; result << "K" << CommonTestUtils::vec2str(kernel) << "_"; result << "S" << CommonTestUtils::vec2str(stride) << "_"; result << "PB" << CommonTestUtils::vec2str(padBegin) << "_"; result << "PE" << CommonTestUtils::vec2str(padEnd) << "_"; result << "D=" << CommonTestUtils::vec2str(dilation) << "_"; + result << "OP=" << CommonTestUtils::vec2str(outPadding) << "_"; result << "O=" << convOutChannels << "_"; result << "AP=" << padType << "_"; result << "netPRC=" << netPrecision.name() << "_"; @@ -43,20 +46,27 @@ std::string ConvolutionBackpropDataLayerTest::getTestCaseName(testing::TestParam void ConvolutionBackpropDataLayerTest::SetUp() { convBackpropDataSpecificParams convBackpropDataParams; std::vector inputShape; + std::vector outputShape; auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; - std::tie(convBackpropDataParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShape, targetDevice) = this->GetParam(); + std::tie(convBackpropDataParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShape, outputShape, targetDevice) = this->GetParam(); ngraph::op::PadType padType; InferenceEngine::SizeVector kernel, stride, dilation; - std::vector padBegin, padEnd; + std::vector padBegin, padEnd, outPadding; size_t convOutChannels; - std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convBackpropDataParams; + std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType, outPadding) = convBackpropDataParams; auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {inputShape}); auto paramOuts = ngraph::helpers::convert2OutputVector( ngraph::helpers::castOps2Nodes(params)); auto convBackpropData = std::dynamic_pointer_cast( ngraph::builder::makeConvolutionBackpropData(paramOuts[0], ngPrc, kernel, stride, padBegin, + padEnd, dilation, padType, convOutChannels, false, outPadding)); + if (!outputShape.empty()) { + auto outShape = ngraph::opset3::Constant::create(ngraph::element::i64, {outputShape.size()}, outputShape); + convBackpropData = std::dynamic_pointer_cast( + ngraph::builder::makeConvolutionBackpropData(paramOuts[0], outShape, ngPrc, kernel, stride, padBegin, padEnd, dilation, padType, convOutChannels)); + } ngraph::ResultVector results{std::make_shared(convBackpropData)}; function = std::make_shared(results, params, "convolutionBackpropData"); }