[IE Myriad] Added MockICore to fix graph transformer tests

openvinotoolkit · Jul 21, 2020 · c829505 · c829505
1 parent 2c60d23
commit c829505
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 11 deletions.
diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/empty.cpp b/inference-engine/tests/ie_test_utils/unit_test_utils/empty.cpp
@@ -26,6 +26,7 @@
 #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp"
 #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp"
 #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_imemory_state_internal.hpp"
+#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp"
 
 #include "unit_test_utils/mocks/shape_infer/mock_input_controller.hpp"
 #include "unit_test_utils/mocks/shape_infer/mock_ishape_infer_impl.hpp"

diff --git a/...-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp b/...-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp
@@ -0,0 +1,29 @@
+// Copyright (C) 2018-2020 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <gmock/gmock.h>
+#include "ie_icore.hpp"
+
+class MockICore : public InferenceEngine::ICore {
+public:
+    MOCK_QUALIFIED_METHOD0(GetTaskExecutor, const, std::shared_ptr<InferenceEngine::ITaskExecutor>());
+
+    MOCK_QUALIFIED_METHOD2(ReadNetwork, const, InferenceEngine::CNNNetwork(const std::string&, const InferenceEngine::Blob::CPtr&));
+    MOCK_QUALIFIED_METHOD2(ReadNetwork, const, InferenceEngine::CNNNetwork(const std::string&, const std::string&));
+
+    MOCK_METHOD3(LoadNetwork, InferenceEngine::ExecutableNetwork(
+        const InferenceEngine::CNNNetwork&, const std::string&, const std::map<std::string, std::string>&));
+
+    MOCK_METHOD3(ImportNetwork, InferenceEngine::ExecutableNetwork(
+        std::istream&, const std::string&, const std::map<std::string, std::string>&));
+
+    MOCK_QUALIFIED_METHOD3(QueryNetwork, const, InferenceEngine::QueryNetworkResult(
+        const InferenceEngine::ICNNNetwork&, const std::string&, const std::map<std::string, std::string>&));
+
+    MOCK_QUALIFIED_METHOD2(GetMetric, const, InferenceEngine::Parameter(const std::string&, const std::string&));
+
+    ~MockICore() = default;
+};
diff --git a/inference-engine/tests/unit/vpu/base/graph_transformer_tests.cpp b/inference-engine/tests/unit/vpu/base/graph_transformer_tests.cpp
@@ -262,7 +262,7 @@ void GraphTransformerTest::SetUp() {
             consoleOutput());
 
     stageBuilder = std::make_shared<StageBuilder>();
-    frontEnd = std::make_shared<FrontEnd>(stageBuilder);
+    frontEnd = std::make_shared<FrontEnd>(stageBuilder, &_mockCore);
     backEnd = std::make_shared<BackEnd>();
     passManager = std::make_shared<PassManager>(stageBuilder, backEnd);
 }

diff --git a/inference-engine/tests/unit/vpu/base/graph_transformer_tests.hpp b/inference-engine/tests/unit/vpu/base/graph_transformer_tests.hpp
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <list>
+
+#include <gtest/gtest.h>
+
 #include <vpu/compile_env.hpp>
 #include <vpu/model/stage.hpp>
 #include <vpu/model/model.hpp>
@@ -12,9 +16,7 @@
 #include <vpu/backend/backend.hpp>
 #include <vpu/utils/ie_helpers.hpp>
 
-#include <gtest/gtest.h>
-
-#include <list>
+#include <unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp>
 
 namespace vpu {
 
@@ -144,6 +146,7 @@ class GraphTransformerTest : public ::testing::Test {
     TestModel CreateTestModel();
 
 private:
+    MockICore  _mockCore;
     Logger::Ptr _log;
     std::list<ModelPtr> _models;
 };

diff --git a/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt b/inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt
@@ -43,6 +43,7 @@ addIeTarget(
         IESharedTests
         vpu_graph_transformer
         vpu_custom_kernels
+        unitTestUtils
     DEFINES
         INSTANTIATE_TESTS=1
     EXPORT_DEPENDENCIES
@@ -52,8 +53,10 @@ addIeTarget(
 target_include_directories(VPUCommonTests INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/vpu_base
     ${CMAKE_CURRENT_SOURCE_DIR}/common/regression/helpers
-    $<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>
-    )
+    $<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>)
+
+target_include_directories(VPUCommonTests SYSTEM PUBLIC
+        $<TARGET_PROPERTY:unitTestUtils,INTERFACE_INCLUDE_DIRECTORIES>)
 
 ie_developer_export_targets(vpu_custom_kernels)
 addIeTargetTest(

diff --git a/inference-engine/tests_deprecated/functional/vpu/common/blob_reader_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/common/blob_reader_tests.cpp
@@ -17,6 +17,8 @@
 #include <ngraph/op/util/attr_types.hpp>
 #include <ngraph_functions/subgraph_builders.hpp>
 
+#include <unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp>
+
 using namespace ::testing;
 using namespace vpu;
 using namespace InferenceEngine;
@@ -50,11 +52,12 @@ class VPUBlobReaderHeaderTests: public TestsCommon, public testing::WithParamInt
 
         CompilationConfig compileConfig;
         auto log = std::make_shared<Logger>("GraphCompiler", LogLevel::None, consoleOutput());
-        _compiledGraph = compileNetwork(_network, Platform::MYRIAD_X, compileConfig, log);
+        _compiledGraph = compileNetwork(_network, Platform::MYRIAD_X, compileConfig, log, &_mockCore);
     }
 
     CNNNetwork _network;
     CompiledGraph::Ptr _compiledGraph;
+    MockICore _mockCore;
 };
 
 TEST_P(VPUBlobReaderHeaderTests, canReadCorrectMagicNumber) {

diff --git a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.cpp
@@ -19,7 +19,7 @@ void graphTransformerFunctionalTests::SetUp() {
     vpuLayersTests::SetUp();
 
     _stageBuilder = std::make_shared<StageBuilder>();
-    _frontEnd = std::make_shared<FrontEnd>(_stageBuilder);
+    _frontEnd = std::make_shared<FrontEnd>(_stageBuilder, &_mockCore);
     _backEnd = std::make_shared<BackEnd>();
     _passManager = std::make_shared<PassManager>(_stageBuilder, _backEnd);
     _platform = CheckMyriadX() ? Platform::MYRIAD_X : Platform::MYRIAD_2;

diff --git a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/gt_functional_tests.hpp
@@ -9,6 +9,8 @@
 #include <vpu/middleend/pass_manager.hpp>
 #include <vpu/frontend/frontend.hpp>
 
+#include <unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp>
+
 class graphTransformerFunctionalTests : public vpuLayersTests {
 protected:
     void SetUp() override;
@@ -29,6 +31,7 @@ class graphTransformerFunctionalTests : public vpuLayersTests {
    vpu::CompilationConfig _compilationConfig;
    vpu::StageBuilder::Ptr _stageBuilder;
    vpu::Data              _dataIntermediate;
+   MockICore              _mockCore;
 
 private:
    vpu::Platform                      _platform = vpu::Platform::MYRIAD_X;

diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
@@ -37,11 +37,11 @@ endfunction()
 
 add_helpers(${TARGET_NAME})
 
-target_link_libraries(${TARGET_NAME} PUBLIC commonTestUtils)
+target_link_libraries(${TARGET_NAME} PRIVATE commonTestUtils)
 
 add_helpers(${TARGET_NAME}_s USE_STATIC_IE)
 
-target_link_libraries(${TARGET_NAME}_s PUBLIC commonTestUtils_s)
+target_link_libraries(${TARGET_NAME}_s PRIVATE commonTestUtils_s)
 
 if (ENABLE_DATA)
     add_dependencies(${TARGET_NAME} data)

diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/graph_transformer_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/graph_transformer_tests.cpp
@@ -167,7 +167,7 @@ void GraphTransformerTest::SetUp() {
         consoleOutput());
 
     stageBuilder = std::make_shared<StageBuilder>();
-    frontEnd = std::make_shared<FrontEnd>(stageBuilder);
+    frontEnd = std::make_shared<FrontEnd>(stageBuilder, &_mockCore);
     backEnd = std::make_shared<BackEnd>();
     passManager = std::make_shared<PassManager>(stageBuilder, backEnd);
 }

diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/graph_transformer_tests.hpp b/inference-engine/tests_deprecated/unit/engines/vpu/graph_transformer_tests.hpp
@@ -17,6 +17,8 @@
 #include <vpu/middleend/pass_manager.hpp>
 #include <vpu/backend/backend.hpp>
 
+#include <unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp>
+
 namespace vpu {
 
 template <class Cont, class Cond>
@@ -196,6 +198,7 @@ class GraphTransformerTest : public TestsCommon {
     TestModel CreateTestModel(const DataDesc& dataDesc);
 
 private:
+    MockICore  _mockCore;
     Logger::Ptr _log;
     std::list<ModelPtr> _models;
 };