From 0245e05cc852cda081d273cb2ea71eacdb3438f4 Mon Sep 17 00:00:00 2001 From: Steve Yoo Date: Thu, 9 Sep 2021 10:18:54 +0900 Subject: [PATCH] Remove comments used for indivisual testing Change unproper function names Remove unnecessary template<> --- .../single_layer_tests/convolution.cpp | 75 +++++++++---------- .../single_layer_tests/softmax.cpp | 51 ++++++++++--- .../single_layer/convolution.hpp | 2 +- .../single_layer/softmax.hpp | 2 +- .../src/base/layer_test_utils.cpp | 12 +-- .../src/single_layer/convolution.cpp | 4 +- .../src/single_layer/softmax.cpp | 4 +- .../common_test_utils/common_utils.hpp | 1 - 8 files changed, 88 insertions(+), 63 deletions(-) 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 6b9aa41e8ba..07b8290a49f 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 @@ -85,19 +85,18 @@ INSTANTIATE_TEST_SUITE_P(Convolution2D_ExplicitPadding, ConvolutionLayerTest, ConvolutionLayerTest::getTestCaseName); // ! [test_convolution:instantiate] -//INSTANTIATE_TEST_SUITE_P(Convolution2D_AutoPadValid, ConvolutionLayerTest, -// ::testing::Combine( -// conv2DParams_AutoPadValid, -// ::testing::ValuesIn(netPrecisions), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(std::vector>(NULL_RANGE), -// std::vector>({{1, 10}, {3, 30}, {30, 300}, {30, 300}})), -// ::testing::Values(std::vector({1, 3, 30, 30})), -// ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), -// ConvolutionLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(Convolution2D_AutoPadValidStaticShape, ConvolutionLayerTest, + ::testing::Combine( + conv2DParams_AutoPadValid, + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector>({{1, 3, 30, 30}})), + ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), + ConvolutionLayerTest::getTestCaseName); /* ============= 3D Convolution ============= */ @@ -130,32 +129,30 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -//INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTest, -// ::testing::Combine( -// conv3DParams_ExplicitPadding, -// ::testing::ValuesIn(netPrecisions), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(std::vector>(NULL_RANGE), -// std::vector>({{1, 10}, {3, 30}, {10, 100}, {10, 100}, {10, 100}})), -// ::testing::Values(std::vector({1, 3, 10, 10, 10})), -// ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), -// ConvolutionLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_ExplicitPaddingStaticShape, ConvolutionLayerTest, + ::testing::Combine( + conv3DParams_ExplicitPadding, + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector >({{1, 3, 10, 10, 10}})), + ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), + ConvolutionLayerTest::getTestCaseName); -//INSTANTIATE_TEST_SUITE_P(nightly_Convolution3D_AutoPadValid, ConvolutionLayerTest, -// ::testing::Combine( -// conv3DParams_AutoPadValid, -// ::testing::ValuesIn(netPrecisions), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::Values(std::vector>(NULL_RANGE), -// std::vector>({{1, 10}, {3, 30}, {10, 100}, {10, 100}, {10, 100}})), -// ::testing::Values(std::vector({1, 3, 10, 10, 10})), -// ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), -// ConvolutionLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(nightly_Convolution3D_AutoPadValidStaticShape, ConvolutionLayerTest, + ::testing::Combine( + conv3DParams_AutoPadValid, + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(std::vector>(NULL_RANGE)), + ::testing::Values(std::vector >({{1, 3, 10, 10, 10}})), + ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)), + ConvolutionLayerTest::getTestCaseName); } // namespace diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index c63814926db..f334f938f56 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp @@ -78,31 +78,60 @@ 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>> inputShape4D = { + {{1, 200}, {1, 200}, {1, 200}, {1, 200}} +}; + +const std::vector> targetShapes4D = { + {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}; +const auto params4DStaticShape = testing::Combine( + testing::ValuesIn(netPrecision), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Precision::UNSPECIFIED), + testing::Values(InferenceEngine::Layout::NCHW), + testing::Values(InferenceEngine::Layout::ANY), + testing::ValuesIn(inputStaticShape4D), + testing::ValuesIn(targetShapes4D), + testing::ValuesIn(axis4D), + testing::Values(CommonTestUtils::DEVICE_TEMPLATE), + testing::Values(std::map()) +); + const auto params4D = testing::Combine( testing::ValuesIn(netPrecision), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::NCHW), testing::Values(InferenceEngine::Layout::ANY), - testing::ValuesIn(inputShapes4D), + testing::ValuesIn(inputShape4D), + testing::ValuesIn(targetShapes4D), testing::ValuesIn(axis4D), testing::Values(CommonTestUtils::DEVICE_TEMPLATE), testing::Values(std::map()) ); -//INSTANTIATE_TEST_SUITE_P( -// smoke_SoftMax4D, -// SoftMaxLayerTest, -// params4D, -// SoftMaxLayerTest::getTestCaseName -//); +INSTANTIATE_TEST_SUITE_P( + smoke_SoftMax4DStaticShape, + SoftMaxLayerTest, + params4DStaticShape, + SoftMaxLayerTest::getTestCaseName +); + +INSTANTIATE_TEST_SUITE_P( + smoke_SoftMax4D, + SoftMaxLayerTest, + params4D, + SoftMaxLayerTest::getTestCaseName +); } // namespace 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 df6543d00f3..71d660ebf11 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 @@ -44,7 +44,7 @@ public: protected: void SetUp() override; - void makeConvolutionFunction(); + void makeConvolution(); private: InferenceEngine::Precision::ePrecision netPrecision = InferenceEngine::Precision::UNSPECIFIED; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp index aa85a15f500..4d2a08d29e8 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/softmax.hpp @@ -36,7 +36,7 @@ public: protected: void SetUp() override; - void makeSoftMaxFunction(); + void makeSoftMax(); private: InferenceEngine::Precision netPrecision; 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 3b41b976e0d..9d197e0f880 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 @@ -317,13 +317,13 @@ void LayerTestsCommon::ConfigureNetwork() { } } - std::map shapes; - auto isdm = cnnNetwork.getInputsInfo(); - for (auto&& idm : isdm) { - shapes[idm.first] = isdm[idm.first]->getInputData()->getPartialShape(); - shapes[idm.first] = std::vector(inputDynamicShape); + std::map inputShapes; + auto inputsDataMap = cnnNetwork.getInputsInfo(); + for (auto&& inputDataMap : inputsDataMap) { + inputShapes[inputDataMap.first] = inputsDataMap[inputDataMap.first]->getInputData()->getPartialShape(); + inputShapes[inputDataMap.first] = std::vector(inputDynamicShape); } - cnnNetwork.reshape(shapes); + cnnNetwork.reshape(inputShapes); } void LayerTestsCommon::LoadNetwork() { 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 ceae9ad0d68..380982fd48b 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 @@ -57,10 +57,10 @@ void ConvolutionLayerTest::SetUp() { std::tie(kernel, stride, padBegin, padEnd, dilation, convOutChannels, padType) = convParams; setTargetStaticShape(targetStaticShapes[0]); - makeConvolutionFunction(); + makeConvolution(); } -void ConvolutionLayerTest::makeConvolutionFunction() { +void ConvolutionLayerTest::makeConvolution() { auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); auto params = ngraph::builder::makeParams(ngPrc, {targetStaticShape}); auto paramOuts = ngraph::helpers::convert2OutputVector( diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp index 0ddcae83317..a1b01c53fd5 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/softmax.cpp @@ -45,10 +45,10 @@ void SoftMaxLayerTest::SetUp() { inputDynamicShape = FuncTestUtils::PartialShapeUtils::vec2partialshape(inputShape, targetStaticShapes[0]); - makeSoftMaxFunction(); + makeSoftMax(); } -void SoftMaxLayerTest::makeSoftMaxFunction() { +void SoftMaxLayerTest::makeSoftMax() { const auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); const auto params = ngraph::builder::makeParams(ngPrc, {targetStaticShape}); const auto paramOuts = diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp index efefacb861c..ae57481f1fd 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp +++ b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp @@ -53,7 +53,6 @@ inline std::string pair2str(const std::pair& p) { return result.str(); } -template<> inline std::string vec2str(const std::vector> &vec) { std::ostringstream result; for (const auto &p : vec) {