From 4ecab1eeeafe5c8bf28736eec4a59f713ca4c733 Mon Sep 17 00:00:00 2001
From: Aleksandr Korolev <aleksandr.korolev@intel.com>
Date: Thu, 27 Jan 2022 12:41:45 +0300
Subject: [PATCH] [VPU] Fix vpu_scale tests (#9693)

Fix memory leak in VpuScaleTest
---
 .../options/vpu_scales_option.cpp             |  8 ++-
 .../passes_tests/vpu_scale_tests.cpp          | 54 ++++++++++---------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/plugins/intel_vpu/common/src/configuration/options/vpu_scales_option.cpp b/src/plugins/intel_vpu/common/src/configuration/options/vpu_scales_option.cpp
index a2f957dd96b..d3e85d88408 100644
--- a/src/plugins/intel_vpu/common/src/configuration/options/vpu_scales_option.cpp
+++ b/src/plugins/intel_vpu/common/src/configuration/options/vpu_scales_option.cpp
@@ -64,8 +64,12 @@ VPUScalesOption::value_type VPUScalesOption::parse(const std::string& value) {
     for (const auto& vpuScale : parsedStrings) {
         const auto delimeterPos = vpuScale.find(':');
         VPU_THROW_UNLESS(delimeterPos != std::string::npos, "Unable to parse string \"{}\"", vpuScale);
-        vpuScaleMap.insert({std::string(vpuScale.substr(0, delimeterPos)),
-                            std::stof(vpuScale.substr(delimeterPos + 1))});
+        try {
+            vpuScaleMap.insert({std::string(vpuScale.substr(0, delimeterPos)),
+                                std::stof(vpuScale.substr(delimeterPos + 1))});
+        } catch (...) {
+            VPU_THROW_EXCEPTION << "Cannot convert string to float. Wrong input";
+        }
     }
 
     #endif
diff --git a/src/tests/unit/vpu/middleend_tests/passes_tests/vpu_scale_tests.cpp b/src/tests/unit/vpu/middleend_tests/passes_tests/vpu_scale_tests.cpp
index 5013add3528..8a12371cde2 100644
--- a/src/tests/unit/vpu/middleend_tests/passes_tests/vpu_scale_tests.cpp
+++ b/src/tests/unit/vpu/middleend_tests/passes_tests/vpu_scale_tests.cpp
@@ -2,12 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "graph_transformer_tests.hpp"
-#include <vpu/stages/mx_stage.hpp>
 #include <vpu/middleend/hw/utility.hpp>
-#include "ngraph_functions/subgraph_builders.hpp"
-#include "vpu/private_plugin_config.hpp"
+#include <vpu/stages/mx_stage.hpp>
+
 #include "common_test_utils/common_utils.hpp"
+#include "graph_transformer_tests.hpp"
+#include "ngraph_functions/subgraph_builders.hpp"
+#include "vpu/configuration/options/vpu_scales_option.hpp"
+#include "vpu/private_plugin_config.hpp"
 
 #if defined(__GNUC__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 9) && !defined(__clang__) && !defined(IE_GCC_4_8)
 #define IE_GCC_4_8
@@ -16,9 +18,7 @@
 using namespace vpu;
 IE_SUPPRESS_DEPRECATED_START
 namespace LayerTestsDefinitions {
-typedef std::tuple<
-    std::string
-> VpuScaleParams;
+typedef std::tuple<std::string> VpuScaleParams;
 
 class VpuScaleTest : public testing::WithParamInterface<VpuScaleParams>,
                      public GraphTransformerTest {
@@ -27,12 +27,9 @@ protected:
     void Compile() {
         m_pipeline.run(m_testModel);
     }
-
-protected:
-    std::string configValue = {};
     Model m_testModel;
 
-private:
+
     void InitModel() {
         int kernelx = 16;
         int kernely = 1;
@@ -118,20 +115,21 @@ private:
 };
 
 void VpuScaleTest::SetUp() {
+}
+
+TEST_F(VpuScaleTest, IsScaleWorkCorrectly) {
+#ifdef IE_GCC_4_8
+    GTEST_SKIP();
+#endif
+    std::string configValue = "conv1:0.2; conv2:1.4";
+
     ASSERT_NO_FATAL_FAILURE(GraphTransformerTest::SetUp());
     config.set(InferenceEngine::MYRIAD_SCALES_PATTERN, configValue);
     ASSERT_NO_FATAL_FAILURE(InitCompileEnv());
     ASSERT_NO_FATAL_FAILURE(InitPipeline());
     ASSERT_NO_FATAL_FAILURE(InitModel());
-}
-
-TEST_F(VpuScaleTest, IsScaleWorkCorrectly) {
-    #ifdef IE_GCC_4_8
-        GTEST_SKIP();
-    #endif
-    configValue = "conv1:0.2; conv2:1.4";
-    SetUp();
     ASSERT_NO_THROW(Compile());
+
     for (const auto& stage : m_testModel->getStages()) {
         auto scale = stage->attrs().getOrDefault<float>("scaleFactor");
         if (stage->name() == "conv1") {
@@ -145,12 +143,18 @@ TEST_F(VpuScaleTest, IsScaleWorkCorrectly) {
 }
 
 TEST_F(VpuScaleTest, IsRegexInScaleWorksCorrectly) {
-    #ifdef IE_GCC_4_8
-        GTEST_SKIP();
-    #endif
-    configValue = "conv1:0.2";
-    SetUp();
+#ifdef IE_GCC_4_8
+    GTEST_SKIP();
+#endif
+    std::string configValue = "conv1:0.2";
+    ASSERT_NO_FATAL_FAILURE(GraphTransformerTest::SetUp());
+    config.set(InferenceEngine::MYRIAD_SCALES_PATTERN, configValue);
+
+    ASSERT_NO_FATAL_FAILURE(InitCompileEnv());
+    ASSERT_NO_FATAL_FAILURE(InitPipeline());
+    ASSERT_NO_FATAL_FAILURE(InitModel());
     ASSERT_NO_THROW(Compile());
+
     for (const auto& stage : m_testModel->getStages()) {
         auto scale = stage->attrs().getOrDefault<float>("scaleFactor");
         if (stage->name() == "conv1") {
@@ -159,4 +163,4 @@ TEST_F(VpuScaleTest, IsRegexInScaleWorksCorrectly) {
         }
     }
 }
-} // namespace LayerTestsDefinitions
+}  // namespace LayerTestsDefinitions