Merge pull request #8 from nosovmik/mnosov/fixbuild3

Fix build for unit tests
nosovmik · Apr 6, 2021 · cf0dad2 · cf0dad2
2 parents 87e3994 + d450b4d
commit cf0dad2
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 1 deletion.
diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
@@ -18,6 +18,7 @@ addIeTargetTest(
         LINK_LIBRARIES
             unitTestUtils
             inference_engine_lp_transformations
+            frontend_manager
             ${OpenCV_LIBRARIES}
         ADD_CPPLINT
         DEPENDENCIES

diff --git a/inference-engine/tests_deprecated/unit/CMakeLists.txt b/inference-engine/tests_deprecated/unit/CMakeLists.txt
@@ -139,6 +139,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE
     inference_engine_transformations
     inference_engine_lp_transformations
     inference_engine_snippets
+    frontend_manager
     )
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
@@ -26,6 +26,10 @@ set(NGRAPH_INCLUDE_PATH
     ${CMAKE_CURRENT_SOURCE_DIR}/core/include
 )
 
+set(FRONTEND_INCLUDE_PATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/frontend/generic/include
+)
+
 if (APPLE)
     # Enable MACOS_RPATH by default.
     cmake_policy(SET CMP0042 NEW)

diff --git a/ngraph/frontend/generic/include/frontend_manager/frontend_manager.hpp b/ngraph/frontend/generic/include/frontend_manager/frontend_manager.hpp
@@ -77,6 +77,8 @@ class NGRAPH_API Place
 
     typedef std::shared_ptr<Place> Ptr;
 
+    virtual ~Place() = default;
+
     /// \brief All associated names (synonyms) that identify this place in the graph in a framework specific way
     /// \return A vector of strings each representing a name that identifies this place in the graph.
     ///         Can be empty if there are no names associated with this place or name cannot be attached.
@@ -158,6 +160,7 @@ class NGRAPH_API InputModel
 
     typedef std::shared_ptr<InputModel> Ptr;
 
+    virtual ~InputModel() = default;
 
     /////  Searching for places  /////
 
@@ -270,6 +273,7 @@ class NGRAPH_API FrontEnd
 {
 public:
     typedef std::shared_ptr<FrontEnd> Ptr;
+    virtual ~FrontEnd() = default;
 
     virtual InputModel::Ptr loadFromFile (const std::string& path) const;
     virtual InputModel::Ptr loadFromFiles (const std::vector<std::string>& paths) const;

diff --git a/ngraph/frontend/generic/src/frontend_manager.cpp b/ngraph/frontend/generic/src/frontend_manager.cpp
@@ -490,6 +490,12 @@ namespace ngraph
         {
             return m_impl->availableFrontEnds();
         }
+
+        void FrontEndManager::registerFrontEnd(const std::string& name, FrontEndFactory creator)
+        {
+            m_impl->registerFrontEnd(name, creator);
+        }
+
     } // namespace frontend
 
 } // namespace ngraph
diff --git a/ngraph/test/CMakeLists.txt b/ngraph/test/CMakeLists.txt
@@ -47,6 +47,7 @@ set(SRC
     eval.cpp
     file_util.cpp
     float16.cpp
+    frontend/frontend_manager.cpp
     graph_rewrite.cpp
     includes.cpp
     input_output_assign.cpp
@@ -443,6 +444,7 @@ add_executable(unit-test ${SRC})
 
 target_include_directories(unit-test PRIVATE ".")
 target_include_directories(unit-test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime)
+target_include_directories(unit-test PRIVATE ${FRONTEND_INCLUDE_PATH})
 
 add_definitions("-DCURDIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"")
 add_definitions("-DJSON_INCLUDES=\"${JSON_INCLUDE_DIR}\"")
@@ -492,7 +494,7 @@ if (MSVC)
     target_compile_options(unit-test PRIVATE "/bigobj")
 endif()
 
-target_link_libraries(unit-test PRIVATE ie_backend)
+target_link_libraries(unit-test PRIVATE ie_backend frontend_manager)
 
 if (NGRAPH_ONNX_IMPORT_ENABLE)
     target_link_libraries(unit-test PRIVATE onnx_importer onnx_editor)

diff --git a/ngraph/test/frontend/frontend_manager.cpp b/ngraph/test/frontend/frontend_manager.cpp
@@ -0,0 +1,31 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include <memory>
+#include <frontend_manager/frontend_manager.hpp>
+
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+
+using namespace ngraph;
+using namespace ngraph::frontend;
+
+class FrontEndMock: public FrontEnd {
+public:
+    FrontEndMock() = default;
+    ~FrontEndMock() = default;
+
+    MOCK_CONST_METHOD1(loadFromFile, InputModel::Ptr(const std::string&));
+    MOCK_CONST_METHOD1(convert, std::shared_ptr<ngraph::Function>(InputModel::Ptr model));
+};
+
+TEST(FrontEndManagerTest, testAvailableFrontEnds)
+{
+    FrontEndManager fem;
+    ASSERT_NO_THROW(fem.registerFrontEnd("mock", [](FrontEndCapabilities fec) {
+        return std::make_shared<FrontEndMock>();
+    }));
+    auto frontends = fem.availableFrontEnds();
+    ASSERT_NE(std::find(frontends.begin(), frontends.end(), "mock"), frontends.end());
+}