From 65620c614e9630ed2ee976accb448c3a78cadfa7 Mon Sep 17 00:00:00 2001 From: Patryk Elszkowski Date: Tue, 29 Jun 2021 08:53:26 +0200 Subject: [PATCH] remove temporary ReshapeLayerTestRevise (#6371) --- .../single_layer/reshape.hpp | 25 ----------- .../src/single_layer/reshape.cpp | 42 ------------------- 2 files changed, 67 deletions(-) diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp index e6c4fbd5c8dd3d..ead04a5f4e9fb9 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp @@ -37,29 +37,4 @@ class ReshapeLayerTest : public testing::WithParamInterface, void SetUp() override; }; - -//TODO: Drop this Revise impl when all pluging will switch back to ReshapeLayerTest -typedef std::tuple, // Input shapes - std::vector, // OutForm Shapes - std::string, // Device name - std::map // Config - > - reshapeParamsRevise; - -class ReshapeLayerTestRevise - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { -public: - static std::string getTestCaseName( - testing::TestParamInfo obj); - -protected: - void SetUp() override; -}; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp index 59e95716088f2e..27fd61ea169fca 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp @@ -47,46 +47,4 @@ void ReshapeLayerTest::SetUp() { function = std::make_shared(results, paramsIn, "Reshape"); } -std::string ReshapeLayerTestRevise::getTestCaseName(testing::TestParamInfo obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::Precision inPrc, outPrc; - InferenceEngine::Layout inLayout, outLayout; - InferenceEngine::SizeVector inputShapes; - std::vector outFormShapes; - std::string targetDevice; - std::map config; - bool specialZero; - std::tie(specialZero, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, outFormShapes, targetDevice, config) = obj.param; - std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; - result << "OS=" << CommonTestUtils::vec2str(outFormShapes) << "_"; - result << "specialZero=" << specialZero << "_"; - result << "netPRC=" << netPrecision.name() << "_"; - result << "inPRC=" << inPrc.name() << "_"; - result << "outPRC=" << outPrc.name() << "_"; - result << "inL=" << inLayout << "_"; - result << "outL=" << outLayout << "_"; - result << "trgDev=" << targetDevice; - return result.str(); -} - -void ReshapeLayerTestRevise::SetUp() { - InferenceEngine::SizeVector inputShapes; - std::vector outFormShapes; - bool specialZero; - InferenceEngine::Precision netPrecision; - std::tie(specialZero, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, outFormShapes, targetDevice, configuration) = - this->GetParam(); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - auto paramsIn = ngraph::builder::makeParams(ngPrc, {inputShapes}); - auto paramIn = ngraph::helpers::convert2OutputVector( - ngraph::helpers::castOps2Nodes(paramsIn)); - auto constNode = std::make_shared( - ngraph::element::Type_t::i64, ngraph::Shape{outFormShapes.size()}, outFormShapes); - auto reshape = std::dynamic_pointer_cast( - std::make_shared(paramIn[0], constNode, specialZero)); - ngraph::ResultVector results{std::make_shared(reshape)}; - function = std::make_shared(results, paramsIn, "Reshape"); -} - } // namespace LayerTestsDefinitions