From 15bef9ec70b1a56ee5a10146fbf0c437b4ff6594 Mon Sep 17 00:00:00 2001
From: Gabriele Galiero Casay <gabriele.galiero.casay@intel.com>
Date: Mon, 6 Sep 2021 12:32:05 +0200
Subject: [PATCH] Remove deprecated mvn class for SLTs (#7340)

---
 .../shared/include/single_layer_tests/mvn.hpp |  5 ---
 .../shared_test_classes/single_layer/mvn.hpp  | 17 ----------
 .../src/single_layer/mvn.cpp                  | 32 -------------------
 3 files changed, 54 deletions(-)

diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp
index d1a9ff52a10..eda13543172 100644
--- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/mvn.hpp
@@ -8,11 +8,6 @@
 
 namespace LayerTestsDefinitions {
 
-// DEPRECATED, remove MvnLayerTest when KMB and ARM plugin will switch to use Mvn1LayerTest (#60420)
-TEST_P(MvnLayerTest, CompareWithRefs) {
-    Run();
-};
-
 TEST_P(Mvn1LayerTest, CompareWithRefs) {
     Run();
 };
diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp
index 747e0940da7..9876e825034 100644
--- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp
+++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/mvn.hpp
@@ -11,23 +11,6 @@
 
 namespace LayerTestsDefinitions {
 
-// DEPRECATED, remove MvnLayerTest when KMB and ARM plugin will switch to use Mvn1LayerTest (#60420)
-typedef std::tuple<
-        InferenceEngine::SizeVector, // Input shapes
-        InferenceEngine::Precision,  // Input precision
-        bool,                        // Across channels
-        bool,                        // Normalize variance
-        double,                      // Epsilon
-        std::string> mvnParams;      // Device name
-
-class MvnLayerTest : public testing::WithParamInterface<mvnParams>, virtual public LayerTestsUtils::LayerTestsCommon {
-public:
-    static std::string getTestCaseName(const testing::TestParamInfo<mvnParams>& obj);
-
-protected:
-    void SetUp() override;
-};
-
 typedef std::tuple<
         InferenceEngine::SizeVector, // Input shapes
         InferenceEngine::Precision,  // Input precision
diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp
index d4e2a0c0df8..5c04c6f177e 100644
--- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp
+++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/mvn.cpp
@@ -7,38 +7,6 @@
 
 namespace LayerTestsDefinitions {
 
-// DEPRECATED, remove MvnLayerTest when KMB and ARM plugin will switch to use Mvn1LayerTest (#60420)
-std::string MvnLayerTest::getTestCaseName(const testing::TestParamInfo<mvnParams>& obj) {
-    InferenceEngine::SizeVector inputShapes;
-    InferenceEngine::Precision inputPrecision;
-    bool acrossChannels, normalizeVariance;
-    double eps;
-    std::string targetDevice;
-    std::tie(inputShapes, inputPrecision, acrossChannels, normalizeVariance, eps, targetDevice) = obj.param;
-    std::ostringstream result;
-    result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_";
-    result << "Precision=" << inputPrecision.name() << "_";
-    result << "AcrossChannels=" << (acrossChannels ? "TRUE" : "FALSE") << "_";
-    result << "NormalizeVariance=" << (normalizeVariance ? "TRUE" : "FALSE") << "_";
-    result << "Epsilon=" << eps << "_";
-    result << "TargetDevice=" << targetDevice;
-    return result.str();
-}
-
-void MvnLayerTest::SetUp() {
-    InferenceEngine::SizeVector inputShapes;
-    InferenceEngine::Precision inputPrecision;
-    bool acrossChanels, normalizeVariance;
-    double eps;
-    std::tie(inputShapes, inputPrecision, acrossChanels, normalizeVariance, eps, targetDevice) = this->GetParam();
-    auto inType = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision);
-    auto param = ngraph::builder::makeParams(inType, {inputShapes});
-    auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ngraph::op::Parameter>(param));
-    auto mvn = std::dynamic_pointer_cast<ngraph::op::MVN>(ngraph::builder::makeMVN(paramOuts[0], acrossChanels, normalizeVariance, eps));
-    ngraph::ResultVector results{std::make_shared<ngraph::opset1::Result>(mvn)};
-    function = std::make_shared<ngraph::Function>(results, param, "mvn");
-}
-
 std::string Mvn1LayerTest::getTestCaseName(const testing::TestParamInfo<mvn1Params>& obj) {
     InferenceEngine::SizeVector inputShapes;
     InferenceEngine::Precision inputPrecision;