diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp index 30a999ccbc8..1f698a16b60 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp @@ -82,11 +82,7 @@ INSTANTIATE_TEST_SUITE_P(Convolution2D_ExplicitPaddingDynamicShape, ConvolutionL ::testing::Values(std::vector>>( {{{1, 10}, {3, 30}, {30, 300}, {30, 300}}})), ::testing::Values(std::vector>>({{{1, 3, 30, 30}}}), - std::vector>>({{{2, 4, 31, 31}}}), - std::vector>>({{{1, 3, 30, 30}}, - {{2, 4, 31, 31}}}), - std::vector>>({{{2, 4, 31, 31}}, - {{1, 3, 30, 30}}})), + std::vector>>({{{2, 4, 31, 31}}})), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), ConvolutionLayerTest::getTestCaseName); // ! [test_convolution:instantiate] diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp index f68db9c3b08..b7c2948420d 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp @@ -44,7 +44,8 @@ INSTANTIATE_TEST_SUITE_P( ::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(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -56,7 +57,8 @@ INSTANTIATE_TEST_SUITE_P( ::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(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp index 6a5df9b958f..02d0f93e72e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -22,6 +22,7 @@ const std::vector inputLayouts2D = { const std::vector>>> inputStaticShape2D = { {NULL_RANGE} }; + const std::vector>> inputShapes2D = { {{InferenceEngine::SizeVector{1, 100}}}, {{InferenceEngine::SizeVector{100, 1}}}, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp index 7231ec975f4..6368c87a91e 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp @@ -47,9 +47,9 @@ const std::vector> padEndsH1 = {{1, 0}, {1, 3}}; const std::vector> dilationsH1 = {{1, 1}, {1, 3}}; -const std::vector> inputShapesH1 = {{1, 1, 1, 32}, - {1, 32, 1, 160}, - {1, 8, 1, 64}}; +const std::vector>>> inputShapesH1 = {{{{1, 1, 1, 32}, + {1, 32, 1, 160}, + {1, 8, 1, 64}}}}; const std::vector> kernelsW1 = {{3, 1}, {5, 1}}; const std::vector> stridesW1 = {{1, 1}, @@ -60,9 +60,9 @@ const std::vector> padEndsW1 = {{0, 1}, {3, 1}}; const std::vector> dilationsW1 = {{1, 1}, {3, 1}}; -const std::vector> inputShapesW1 = {{1, 1, 32, 1}, - {1, 32, 160, 1}, - {1, 8, 64, 1}}; +const std::vector>>> inputShapesW1 = {{{{1, 1, 32, 1}, + {1, 32, 160, 1}, + {1, 8, 64, 1}}}}; const std::vector numOutCannels = {4, 8, 12}; const std::vector> kernels2D = { @@ -85,11 +85,11 @@ const std::vector> dilations2D = { {1, 1}, }; const std::vector numOutCannels2D = { 8, 16, 32}; -const std::vector input2DNCHW = { 1, 8, 20, 16 }; +const std::vector>> input2DNCHW = {{{1, 8, 20, 16}}}; -const std::vector> inputShapesMapTo1d = {{1, 1, 56, 5}, - {1, 32, 56, 5}, - {1, 2, 64, 5}}; +const std::vector>>> inputShapesMapTo1d = {{{{1, 1, 56, 5}, + {1, 32, 56, 5}, + {1, 2, 64, 5}}}}; const auto conv2DParams_Kernels2D = ::testing::Combine( ::testing::ValuesIn(kernels2D), @@ -155,6 +155,7 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Height1, C ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesH1), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -167,6 +168,7 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Width1, Co ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesW1), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -179,6 +181,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_Height1, ConvolutionLa ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesH1), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -191,6 +194,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_Width1, ConvolutionLay ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesW1), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -203,6 +207,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_MapTo1d, ConvolutionLa ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesMapTo1d), ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); @@ -215,6 +220,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_Kernels2D, GnaConvolutionLayerTest, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::Values(input2DNCHW), ::testing::Values(CommonTestUtils::DEVICE_GNA)), GnaConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp index 2235a2b90fa..3640a8f25ea 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp @@ -53,14 +53,16 @@ const std::vector> dilations2DInvalid = { {2, 2}, const std::vector numOutChannels2D = { 32 }; const std::vector numOutChannels2DInvalid = { 1, 7, 9, 400 }; -const std::vector> input2DNCHWFine = { { 1, 8, 20, 16 } }; +const std::vector>>> input2DNCHWFine = {{{{1, 8, 20, 16}}}}; -const std::vector> input2DNCHWInvalidInputC = { - { 1, 7, 20, 16 }, - { 1, 9, 20, 16 }, - { 1, 400, 20, 16 } }; -const std::vector> input2DNCHWInvalidInputH = { { 1, 8, 15, 16 }, { 1, 8, 400, 16 } }; -const std::vector> input2DNCHWInvalidInputW = { { 1, 8, 20, 14 }, { 1, 8, 20, 400 } }; +const std::vector>>> input2DNCHWInvalidInputC = {{{ + {1, 7, 20, 16}, + {1, 9, 20, 16}, + {1, 400, 20, 16}}}}; +const std::vector>>> input2DNCHWInvalidInputH = { + {{{1, 8, 15, 16}, {1, 8, 400, 16}}}}; +const std::vector>>> input2DNCHWInvalidInputW = { + {{{1, 8, 20, 14}, {1, 8, 20, 400}}}}; const auto conv2DParametersFine = ::testing::Combine( ::testing::ValuesIn(kernels2D), @@ -159,6 +161,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_GnaConv2DNegativeTestInvalid##whats_wrong, GnaCon ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), \ ::testing::Values(InferenceEngine::Layout::ANY), \ ::testing::Values(InferenceEngine::Layout::ANY), \ + ::testing::Values(std::vector>>(NULL_RANGE)), \ ::testing::ValuesIn(input2DNCHW##suffix_input), \ ::testing::Values(CommonTestUtils::DEVICE_GNA)), \ GnaConv2DNegativeTest##whats_wrong::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp index 94e77a1a4a7..e390b9e4686 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -58,7 +58,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTe ::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(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); @@ -70,7 +71,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::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(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); /* ============= 3D Convolution ============= */ @@ -105,7 +107,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_Basic1, ConvolutionLayerTest, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector({1, 3, 10, 10, 10})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 10, 10, 10}}})), ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp index ad797508c6f..78627fce6cf 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -19,10 +19,14 @@ const std::vector inputLayouts2D = { InferenceEngine::Layout::NC, }; -const std::vector inputShapes2D = { - InferenceEngine::SizeVector {1, 100}, - InferenceEngine::SizeVector {100, 1}, - InferenceEngine::SizeVector {10, 10}, +const std::vector>>> inputStaticShape2D = { + {NULL_RANGE} +}; + +const std::vector>> inputShapes2D = { + {{InferenceEngine::SizeVector{1, 100}}}, + {{InferenceEngine::SizeVector{100, 1}}}, + {{InferenceEngine::SizeVector{10, 10}}}, }; const std::vector axis2D = { @@ -35,6 +39,7 @@ const auto params2D = testing::Combine( testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::ValuesIn(inputLayouts2D), testing::Values(InferenceEngine::Layout::ANY), + testing::ValuesIn(inputStaticShape2D), testing::ValuesIn(inputShapes2D), testing::ValuesIn(axis2D), testing::Values(CommonTestUtils::DEVICE_GPU), @@ -48,10 +53,14 @@ INSTANTIATE_TEST_SUITE_P( SoftMaxLayerTest::getTestCaseName ); -const std::vector inputShapes4D = { - InferenceEngine::SizeVector {1, 100, 1, 1}, - InferenceEngine::SizeVector {1, 3, 4, 3}, - InferenceEngine::SizeVector {2, 3, 4, 5}, +const std::vector>>> inputStaticShape4D = { + {NULL_RANGE} +}; + +const std::vector>> inputShapes4D = { + {{InferenceEngine::SizeVector{1, 100, 1, 1}}}, + {{InferenceEngine::SizeVector{1, 3, 4, 3}}}, + {{InferenceEngine::SizeVector{2, 3, 4, 5}}}, }; const std::vector axis4D = {0, 1, 2, 3}; @@ -62,6 +71,7 @@ const auto params4D = testing::Combine( testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::NCHW), testing::Values(InferenceEngine::Layout::ANY), + testing::ValuesIn(inputStaticShape4D), testing::ValuesIn(inputShapes4D), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp index c1b559d2a82..ae72e25242b 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp @@ -155,8 +155,6 @@ protected: virtual void setTargetStaticShape(std::vector& desiredTargetStaticShape) {} - virtual bool updateFunctionRefs() {return false;} - virtual void Validate(); virtual std::vector>> CalculateRefs(); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp index c6dfbba1133..16d4c1ebf14 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convolution.hpp @@ -46,7 +46,6 @@ protected: void SetUp() override; std::shared_ptr makeConvolution(const std::string& name = ""); void setTargetStaticShape(std::vector& desiredTargetStaticShape) override; - bool updateFunctionRefs() override; private: InferenceEngine::Precision::ePrecision netPrecision = InferenceEngine::Precision::UNSPECIFIED; diff --git a/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp index bccc9b8516f..0d128d086b3 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp @@ -49,7 +49,6 @@ void LayerTestsCommon::Run() { LoadNetwork(); for (auto&& tss : targetStaticShapes) { setTargetStaticShape(tss); - updateFunctionRefs(); GenerateInputs(); Infer(); Validate(); diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp index 2240e6ea4f4..dae6003935f 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convolution.cpp @@ -88,18 +88,4 @@ void ConvolutionLayerTest::setTargetStaticShape(std::vector& desi targetStaticShape = desiredTargetStaticShape; } -bool ConvolutionLayerTest::updateFunctionRefs() { - auto params = functionRefs->get_parameters()[0]; - if (!params) { - return false; - } - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto params_new = std::make_shared(ngPrc, targetStaticShape.front()); - params_new->set_friendly_name(params->get_friendly_name()); - ngraph::copy_runtime_info(params, params_new); - ngraph::replace_node(params, params_new); - functionRefs->validate_nodes_and_infer_types(); - return true; -} - } // namespace LayerTestsDefinitions