Added nGraph as a public dependency (#6071)

* Added nGraph as a public dependency

* Fixed Windows warning

* Fixed CMake

* Fixed constant op

* Fixed typo

* Fixed comments

* Revert ngraph libraries

* Fixed build

* Fixed IE::ngraph

* Fixed git merge
This commit is contained in:
Ilya Churaev
2021-08-02 18:48:16 +03:00
committed by GitHub
parent eabec388e2
commit e89ffa7718
30 changed files with 32 additions and 49 deletions

View File

@@ -20,12 +20,7 @@
#include "ie_common.h"
#include "ie_data.h"
#include "ie_extension.h"
namespace ngraph {
class Function;
} // namespace ngraph
#include <ngraph/function.hpp>
namespace InferenceEngine {

View File

@@ -14,6 +14,7 @@
#include <string>
#include <vector>
#include <ngraph/opsets/opset.hpp>
#include "ie_iextension.h"
#include "details/ie_so_pointer.hpp"

View File

@@ -18,11 +18,7 @@
#include "ie_data.h"
#include "ie_input_info.hpp"
namespace ngraph {
class Function;
} // namespace ngraph
#include <ngraph/function.hpp>
namespace InferenceEngine {

View File

@@ -19,6 +19,7 @@
#include "ie_layouts.h"
#include "ie_blob.h"
#include "ie_version.hpp"
#include <ngraph/opsets/opset.hpp>
/**
* @def INFERENCE_EXTENSION_API(TYPE)
@@ -30,13 +31,6 @@
#define INFERENCE_EXTENSION_API(TYPE) INFERENCE_ENGINE_API(TYPE)
#endif
namespace ngraph {
class OpSet;
class Node;
} // namespace ngraph
namespace InferenceEngine {
/**

View File

@@ -21,12 +21,6 @@
#include "ie_blob.h"
namespace ngraph {
class Variant;
} // namespace ngraph
namespace InferenceEngine {
/**

View File

@@ -109,7 +109,7 @@ public:
return std::make_shared<CustomReluOp>(new_args.at(0));
}
bool visit_attributes(ngraph::AttributeVisitor& visitor) override {
bool visit_attributes(ngraph::AttributeVisitor&) override {
return true;
}
};

View File

@@ -162,7 +162,8 @@ if (TBBBIND_2_4_FOUND)
endif()
target_link_libraries(${TARGET_NAME} PRIVATE pugixml::static openvino::itt ${CMAKE_DL_LIBS} Threads::Threads
ngraph ngraph::frontend_manager::static inference_engine_transformations)
ngraph::frontend_manager::static inference_engine_transformations
PUBLIC ngraph)
target_include_directories(${TARGET_NAME} INTERFACE
$<BUILD_INTERFACE:${PUBLIC_HEADERS_DIR}>
@@ -216,7 +217,7 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s
# Export for build tree
export(TARGETS ${TARGET_NAME} NAMESPACE IE::
export(TARGETS ngraph ${TARGET_NAME} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/InferenceEngineTargets.cmake")
# Export for developer package

View File

@@ -23,7 +23,7 @@ public:
std::shared_ptr<ngraph::Node> clone_with_new_inputs(const ngraph::OutputVector& new_args) const override {
return std::make_shared<FakeAbs>(new_args.at(0));
}
bool visit_attributes(ngraph::AttributeVisitor& visitor) override {
bool visit_attributes(ngraph::AttributeVisitor&) override {
return true;
}
};

View File

@@ -89,7 +89,7 @@ public:
std::shared_ptr<ngraph::Node> clone_with_new_inputs(const ngraph::OutputVector& new_args) const override {
return std::make_shared<CustomAbs>(new_args.at(0));
}
bool visit_attributes(ngraph::AttributeVisitor& visitor) override {
bool visit_attributes(ngraph::AttributeVisitor&) override {
return true;
}
};