From 20ea316b0d06d82aeafd9d85e129f5310b28fc86 Mon Sep 17 00:00:00 2001 From: Steve Yoo Date: Mon, 27 Sep 2021 16:52:39 +0900 Subject: [PATCH] Apply Eltwise stype input shape to cpuFuncTests --- .../single_layer_tests/convolution.cpp | 29 +++---- .../single_layer_tests/softmax.cpp | 20 ++--- .../cpu/single_layer_tests/convolution.cpp | 80 ++++++++++--------- .../behavior/infer_request/dynamic_batch.cpp | 1 + 4 files changed, 68 insertions(+), 62 deletions(-) diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp index 35c8e001df8..eb0ab9b510c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -43,8 +43,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{1, 3, 30}})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -56,8 +56,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{1, 3, 30}})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 3, 30}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -89,8 +89,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::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); @@ -102,8 +102,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::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); @@ -131,8 +131,9 @@ namespace specificWeightLayout { ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{1, 1, 50, 75}})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>( + {{{1, 1, 50, 75}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); } // namespace specificWeightLayout @@ -164,8 +165,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::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_CPU)), ConvolutionLayerTest::getTestCaseName); @@ -177,8 +178,8 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::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_CPU)), ConvolutionLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp index 144c44fcb7d..6a5df9b958f 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 @@ -19,13 +19,13 @@ const std::vector inputLayouts2D = { InferenceEngine::Layout::NC, }; -const std::vector>> inputStaticShape2D = { +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>> inputShapes2D = { + {{InferenceEngine::SizeVector{1, 100}}}, + {{InferenceEngine::SizeVector{100, 1}}}, + {{InferenceEngine::SizeVector{10, 10}}}, }; const std::vector axis2D = { @@ -52,14 +52,14 @@ INSTANTIATE_TEST_SUITE_P( SoftMaxLayerTest::getTestCaseName ); -const std::vector>> inputStaticShape4D = { +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>> 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}; diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp index f9cf9f0a4d8..40c8a64276c 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp @@ -93,8 +93,8 @@ protected: isBias = (postOpMgrPtr->getFusedOpsNames() == "Add(PerChannel)" && selectedType != "jit_avx512_winograd"); convSpecificParams convParams; - std::vector> inputDynamicShape; - std::vector> inputShape; + std::vector>> inputDynamicShape; + std::vector>> inputShape; auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; std::tie(convParams, netPrecision, inPrc, outPrc, inLayout, outLayout, inputDynamicShape, inputShape, targetDevice) = basicParamsSet; @@ -113,7 +113,7 @@ protected: std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convParams; auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto inputParams = ngraph::builder::makeParams(ngraph::element::f32, { inputShape }); + auto inputParams = ngraph::builder::makeParams(ngraph::element::f32, { inputShape[0].front() }); auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(inputParams)); auto convolutionNode = ngraph::builder::makeConvolution(paramOuts.front(), ngPrc, kernel, stride, padBegin, @@ -192,8 +192,10 @@ const std::vector strides2d = { {1, 1}, {2, 2} }; const std::vector> padBegins2d = { {0, 0}, {1, 1} }; const std::vector> padEnds2d = { {0, 0} }; const std::vector dilations2d = { {1, 1}, {2, 2} }; -const std::vector> inputShapes2d = { { {1, 64, 7, 7}, {1, 67, 7, 7} } }; -const std::vector> inputShapesPlain2Blocked2d = { { {1, 1, 7, 7}, {1, 2, 7, 7}, {1, 3, 7, 7} } }; +const std::vector>> inputShapes2d = { { { {1, 64, 7, 7}, {1, 67, 7, 7} } } }; +const std::vector>> inputShapesPlain2Blocked2d = { + { { {1, 1, 7, 7}, {1, 2, 7, 7}, {1, 3, 7, 7} } } +}; /* ============= Convolution params (3D) ============= */ const std::vector kernels3d = { {3, 3, 3}, {1, 1, 1} }; @@ -201,8 +203,10 @@ const std::vector strides3d = { {1, 1, 1}, {2, 2, 2} }; const std::vector> padBegins3d = { {0, 0, 0}, {1, 1, 1} }; const std::vector> padEnds3d = { {0, 0, 0} }; const std::vector dilations3d = { {1, 1, 1}, {2, 2, 2} }; -const std::vector> inputShapes3d = { { {1, 64, 7, 7, 7}, {1, 67, 7, 7, 7} } }; -const std::vector> inputShapesPlain2Blocked3d = { { {1, 1, 7, 7, 7}, {1, 2, 7, 7, 7}, {1, 3, 7, 7, 7} } }; +const std::vector>> inputShapes3d = { { { {1, 64, 7, 7, 7}, {1, 67, 7, 7, 7} } } }; +const std::vector>> inputShapesPlain2Blocked3d = { + { { {1, 1, 7, 7, 7}, {1, 2, 7, 7, 7}, {1, 3, 7, 7, 7} } } +}; /* ============= */ /* INSTANCES */ @@ -231,8 +235,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_2D)), ::testing::ValuesIn(fusingParamsSet), @@ -248,8 +252,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_2D)), ::testing::ValuesIn(fusingParamsSetBF16), @@ -265,8 +269,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_I8, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_2D)), ::testing::Values(fusingSum), @@ -298,8 +302,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_3D)), ::testing::ValuesIn(fusingParamsSet), @@ -315,8 +319,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_3D)), ::testing::ValuesIn(fusingParamsSetBF16), @@ -332,8 +336,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_I8, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 12, 7, 7, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 12, 7, 7, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_GEMM_3D)), ::testing::Values(fusingSum), @@ -369,7 +373,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_2D)), @@ -386,7 +390,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_BF16, ConvolutionLayerCPUTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice({conv_avx512_2D, conv_avx512_2D_nspc})), @@ -403,7 +407,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_I8, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_2D)), @@ -426,7 +430,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_2D_FP32, ConvolutionLayerCPUT ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesPlain2Blocked2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_2D_plain_to_blocked)), @@ -443,7 +447,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_2D_BF16, ConvolutionLayerCPUT ::testing::Values(Precision::BF16, Precision::FP32), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesPlain2Blocked2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice({conv_avx512_plain_to_blocked_2D})), @@ -479,7 +483,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_3D)), @@ -496,7 +500,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_BF16, ConvolutionLayerCPUTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice({conv_avx512_3D, conv_avx512_3D_nspc})), @@ -513,7 +517,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_I8, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_3D)), @@ -535,7 +539,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_3D_FP32, ConvolutionLayerCPUT ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesPlain2Blocked3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_3D_plain_to_blocked)), @@ -552,7 +556,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_3D_BF16, ConvolutionLayerCPUT ::testing::Values(Precision::BF16, Precision::FP32), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapesPlain2Blocked3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice({conv_avx512_plain_to_blocked_3D})), @@ -590,7 +594,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_1x1_2D)), @@ -607,7 +611,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_BF16, ConvolutionLayerCPUTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice({conv_avx512_2D_1x1, conv_avx512_2D_1x1_nspc})), @@ -624,7 +628,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_I8, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_1x1_2D)), @@ -665,8 +669,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_1D, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 2, 64, 7 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{2, 64, 7}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_1D)), ::testing::Values(fusingAddPerChannel), @@ -701,7 +705,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_Jit_Planar_2D_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes2d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Jit_Planar_2D)), @@ -735,7 +739,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_Jit_Planar_3D_FP32, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>>(NULL_RANGE)), ::testing::ValuesIn(inputShapes3d), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(CPUParams_Jit_Planar_3D)), @@ -785,8 +789,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_Conv_winograd, ConvolutionLayerCPUTest, ::testing::Values(Precision::UNSPECIFIED), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(std::vector>(NULL_RANGE)), - ::testing::Values(std::vector>({{ 1, 16, 10, 10 }})), + ::testing::Values(std::vector>>(NULL_RANGE)), + ::testing::Values(std::vector>>({{{1, 16, 10, 10}}})), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(filterCPUInfoForDevice(std::vector{conv_winograd})), ::testing::ValuesIn(fusingParamsSet), diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/infer_request/dynamic_batch.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/infer_request/dynamic_batch.cpp index 59ce119cd39..7c3ecae7f44 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/infer_request/dynamic_batch.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/infer_request/dynamic_batch.cpp @@ -47,6 +47,7 @@ namespace ConfigurationTestsDefinitions { max_batch_size = *std::max_element(batch_sizes.begin(), batch_sizes.end()); function = ngraph::builder::subgraph::makeSingleConv(); + functionRefs = ngraph::clone_function(*function); } void DynamicBatchTest::LoadNetwork() {