From 4eea535e78aa88d8c9d864ef51d4a7629dce8b7d Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 23 Dec 2021 11:37:06 +0300 Subject: [PATCH] Includes in frontends (#9378) * Used full paths in public includes * Fixed install of ONNX include --- cmake/developer_package/frontends/frontends.cmake | 4 ++-- src/frontends/common/include/openvino/frontend/exception.hpp | 2 +- src/frontends/common/include/openvino/frontend/frontend.hpp | 4 ++-- .../common/include/openvino/frontend/input_model.hpp | 4 ++-- src/frontends/common/include/openvino/frontend/place.hpp | 2 +- tools/pot/.gitignore | 3 +++ 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake index e585b29d044..34b3963b088 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake @@ -226,8 +226,8 @@ macro(ov_add_frontend) if(OV_FRONTEND_LINKABLE_FRONTEND) # install -dev part - install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/ - DESTINATION ${FRONTEND_INSTALL_INCLUDE} + install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/openvino + DESTINATION ${FRONTEND_INSTALL_INCLUDE}/ COMPONENT core_dev FILES_MATCHING PATTERN "*.hpp") diff --git a/src/frontends/common/include/openvino/frontend/exception.hpp b/src/frontends/common/include/openvino/frontend/exception.hpp index 71d14238d81..1887e750d5f 100644 --- a/src/frontends/common/include/openvino/frontend/exception.hpp +++ b/src/frontends/common/include/openvino/frontend/exception.hpp @@ -8,7 +8,7 @@ #include #include "openvino/core/except.hpp" -#include "visibility.hpp" +#include "openvino/frontend/visibility.hpp" namespace ov { namespace frontend { diff --git a/src/frontends/common/include/openvino/frontend/frontend.hpp b/src/frontends/common/include/openvino/frontend/frontend.hpp index 15793500fc0..4005f711ca8 100644 --- a/src/frontends/common/include/openvino/frontend/frontend.hpp +++ b/src/frontends/common/include/openvino/frontend/frontend.hpp @@ -8,12 +8,12 @@ #include #include -#include "input_model.hpp" #include "openvino/core/any.hpp" #include "openvino/core/extension.hpp" #include "openvino/core/model.hpp" #include "openvino/core/op_extension.hpp" -#include "visibility.hpp" +#include "openvino/frontend/input_model.hpp" +#include "openvino/frontend/visibility.hpp" namespace ov { namespace frontend { diff --git a/src/frontends/common/include/openvino/frontend/input_model.hpp b/src/frontends/common/include/openvino/frontend/input_model.hpp index ae104d30ea5..b81d5cfa32f 100644 --- a/src/frontends/common/include/openvino/frontend/input_model.hpp +++ b/src/frontends/common/include/openvino/frontend/input_model.hpp @@ -10,8 +10,8 @@ #include "openvino/core/partial_shape.hpp" #include "openvino/core/type/element_type.hpp" -#include "place.hpp" -#include "visibility.hpp" +#include "openvino/frontend/place.hpp" +#include "openvino/frontend/visibility.hpp" namespace ov { namespace frontend { diff --git a/src/frontends/common/include/openvino/frontend/place.hpp b/src/frontends/common/include/openvino/frontend/place.hpp index 8b9eb039b23..8cf8a28a6aa 100644 --- a/src/frontends/common/include/openvino/frontend/place.hpp +++ b/src/frontends/common/include/openvino/frontend/place.hpp @@ -8,7 +8,7 @@ #include #include -#include "visibility.hpp" +#include "openvino/frontend/visibility.hpp" namespace ov { namespace frontend { diff --git a/tools/pot/.gitignore b/tools/pot/.gitignore index 9997a045fe4..624ac2933bd 100644 --- a/tools/pot/.gitignore +++ b/tools/pot/.gitignore @@ -105,3 +105,6 @@ ENV/ # snapshots *.tar + +# version file +version.txt