diff --git a/src/bindings/python/src/pyopenvino/frontend/extensions.cpp b/src/bindings/python/src/pyopenvino/frontend/extensions.cpp index 65bc5416226..5ce49b3e6c6 100644 --- a/src/bindings/python/src/pyopenvino/frontend/extensions.cpp +++ b/src/bindings/python/src/pyopenvino/frontend/extensions.cpp @@ -7,10 +7,10 @@ #include #include -#include "common/extensions/decoder_transformation_extension.hpp" -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/decoder_transformation.hpp" +#include "common/extension/telemetry.hpp" #include "common/frontend_exceptions.hpp" -#include "json_extension/json_config_extension.hpp" +#include "extension/json_config.hpp" #include "manager.hpp" #include "pyopenvino/graph/function.hpp" diff --git a/src/common/offline_transformations/CMakeLists.txt b/src/common/offline_transformations/CMakeLists.txt index c9b0e31b207..359cda2fa77 100644 --- a/src/common/offline_transformations/CMakeLists.txt +++ b/src/common/offline_transformations/CMakeLists.txt @@ -20,8 +20,8 @@ source_group("include" FILES ${PUBLIC_HEADERS}) add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS}) target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations ngraph::reference - nlohmann_json_schema_validator nlohmann_json - PRIVATE openvino::itt pugixml::static openvino::frontend::common) + PRIVATE openvino::itt pugixml::static openvino::frontend::common + nlohmann_json_schema_validator nlohmann_json) target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src") @@ -29,7 +29,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) # Add include path to so_extension.hpp -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/json_extension/json_config_extension.cpp +set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/json_extension/json_config.cpp PROPERTIES INCLUDE_DIRECTORIES "${OpenVINO_SOURCE_DIR}/src/core/src/") # developer package diff --git a/src/common/offline_transformations/include/json_extension/json_config_extension.hpp b/src/common/offline_transformations/include/extension/json_config.hpp similarity index 91% rename from src/common/offline_transformations/include/json_extension/json_config_extension.hpp rename to src/common/offline_transformations/include/extension/json_config.hpp index 47a6a76b2e3..840e020f9db 100644 --- a/src/common/offline_transformations/include/json_extension/json_config_extension.hpp +++ b/src/common/offline_transformations/include/extension/json_config.hpp @@ -8,7 +8,7 @@ #include #include -#include "common/extensions/decoder_transformation_extension.hpp" +#include "common/extension/decoder_transformation.hpp" #include "common/frontend_defs.hpp" namespace ov { diff --git a/src/common/offline_transformations/include/json_extension/json_transformation_extension.hpp b/src/common/offline_transformations/include/extension/json_transformation.hpp similarity index 83% rename from src/common/offline_transformations/include/json_extension/json_transformation_extension.hpp rename to src/common/offline_transformations/include/extension/json_transformation.hpp index 25362f56eea..04b3dc2cb4e 100644 --- a/src/common/offline_transformations/include/json_extension/json_transformation_extension.hpp +++ b/src/common/offline_transformations/include/extension/json_transformation.hpp @@ -8,9 +8,8 @@ #include #include -#include "common/extensions/decoder_transformation_extension.hpp" +#include "common/extension/decoder_transformation.hpp" #include "common/frontend_defs.hpp" -#include "nlohmann/json.hpp" #include "openvino/core/extension.hpp" #include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/manager.hpp" @@ -19,8 +18,8 @@ namespace ov { namespace frontend { -/// \brief Describes transformation that JsonConfigExtension can use as a target transformation spedified by ID. -/// JsonTransformationExtension passes JSON parsed object and mathed points in the graph to JsonTransformationExtension +/// \brief Describes transformation that JsonConfigExtension can use as a target transformation specified by ID. +/// JsonTransformationExtension passes JSON parsed object and matched points in the graph to JsonTransformationExtension /// instance, which is derived from DecoderTransformationExtension. DecoderTransformationExtension itself cannot be /// used for this purpose because we need to pass those additional objects which are the result of JSON parsing and /// graph matching that JsonTransformationExtension performs. @@ -42,6 +41,10 @@ public: return m_id; } + /// \brief Modifies OV Model according to the provided rules. + /// + /// \param[in] function The OV Model object. + /// \param[in] replacement_descriptions The rules to modify the model in .json format. virtual bool transform(const std::shared_ptr& function, const std::string& replacement_descriptions) const = 0; diff --git a/src/common/offline_transformations/src/json_extension/json_config_extension.cpp b/src/common/offline_transformations/src/json_extension/json_config.cpp similarity index 97% rename from src/common/offline_transformations/src/json_extension/json_config_extension.cpp rename to src/common/offline_transformations/src/json_extension/json_config.cpp index 450bdd3e6f6..a0cb118478f 100644 --- a/src/common/offline_transformations/src/json_extension/json_config_extension.cpp +++ b/src/common/offline_transformations/src/json_extension/json_config.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "json_extension/json_config_extension.hpp" +#include "extension/json_config.hpp" #include "nlohmann/json-schema.hpp" -#include "common/extensions/decoder_transformation_extension.hpp" -#include "json_extension/json_transformation_extension.hpp" +#include "common/extension/decoder_transformation.hpp" +#include "extension/json_transformation.hpp" #include "so_extension.hpp" namespace { diff --git a/src/core/tests/frontend/decoder_transformation_extension.cpp b/src/core/tests/frontend/decoder_transformation_extension.cpp index b1a18177387..1f4f7f28ced 100644 --- a/src/core/tests/frontend/decoder_transformation_extension.cpp +++ b/src/core/tests/frontend/decoder_transformation_extension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include "gtest/gtest.h" diff --git a/src/core/tests/frontend/onnx/json_config_extension.cpp b/src/core/tests/frontend/onnx/json_config_extension.cpp index 4becbe935c7..68d240a21b7 100644 --- a/src/core/tests/frontend/onnx/json_config_extension.cpp +++ b/src/core/tests/frontend/onnx/json_config_extension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "json_config_extension.hpp" +#include "json_config.hpp" #include "onnx_utils.hpp" diff --git a/src/core/tests/frontend/paddlepaddle/json_config_extension.cpp b/src/core/tests/frontend/paddlepaddle/json_config_extension.cpp index dffba1ea798..a552c1361d9 100644 --- a/src/core/tests/frontend/paddlepaddle/json_config_extension.cpp +++ b/src/core/tests/frontend/paddlepaddle/json_config_extension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "json_config_extension.hpp" +#include "json_config.hpp" #include "paddle_utils.hpp" diff --git a/src/core/tests/frontend/shared/CMakeLists.txt b/src/core/tests/frontend/shared/CMakeLists.txt index 07d77c8104d..71cf6f5c92a 100644 --- a/src/core/tests/frontend/shared/CMakeLists.txt +++ b/src/core/tests/frontend/shared/CMakeLists.txt @@ -16,7 +16,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../..) target_link_libraries(${TARGET_NAME} PUBLIC frontend_common engines_test_util offline_transformations ngraph cnpy commonTestUtils ngraph_test_util openvino::util - test_builtin_extensions_1 test_builtin_extensions_2) + nlohmann_json_schema_validator test_builtin_extensions_1 test_builtin_extensions_2) target_compile_definitions(${TARGET_NAME} PRIVATE diff --git a/src/core/tests/frontend/shared/include/json_config_extension.hpp b/src/core/tests/frontend/shared/include/json_config.hpp similarity index 96% rename from src/core/tests/frontend/shared/include/json_config_extension.hpp rename to src/core/tests/frontend/shared/include/json_config.hpp index c364fc1bbf1..99bc6eb3264 100644 --- a/src/core/tests/frontend/shared/include/json_config_extension.hpp +++ b/src/core/tests/frontend/shared/include/json_config.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include class JsonConfigExtensionWrapper : public ov::frontend::JsonConfigExtension { diff --git a/src/core/tests/frontend/shared/src/json_config_extension.cpp b/src/core/tests/frontend/shared/src/json_config.cpp similarity index 97% rename from src/core/tests/frontend/shared/src/json_config_extension.cpp rename to src/core/tests/frontend/shared/src/json_config.cpp index 5fdda3d9343..a12dab60425 100644 --- a/src/core/tests/frontend/shared/src/json_config_extension.cpp +++ b/src/core/tests/frontend/shared/src/json_config.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "json_config_extension.hpp" +#include "json_config.hpp" -#include -#include +#include +#include #include #include #include diff --git a/src/core/tests/frontend/shared/src/telemetry.cpp b/src/core/tests/frontend/shared/src/telemetry.cpp index 9e5b7a93b1a..96cb21e28bf 100644 --- a/src/core/tests/frontend/shared/src/telemetry.cpp +++ b/src/core/tests/frontend/shared/src/telemetry.cpp @@ -4,7 +4,7 @@ #include "telemetry.hpp" -#include +#include #include "utils.hpp" diff --git a/src/core/tests/frontend/shared/test_builtin_extensions_1/CMakeLists.txt b/src/core/tests/frontend/shared/test_builtin_extensions_1/CMakeLists.txt index 165ad7658f8..cd843295ae2 100644 --- a/src/core/tests/frontend/shared/test_builtin_extensions_1/CMakeLists.txt +++ b/src/core/tests/frontend/shared/test_builtin_extensions_1/CMakeLists.txt @@ -17,10 +17,10 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) if(WIN32) install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION tests COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL - LIBRARY DESTINATION tests COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL) + RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL + LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) else() install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION tests/lib COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL - LIBRARY DESTINATION tests/lib COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL) + RUNTIME DESTINATION tests/lib COMPONENT tests EXCLUDE_FROM_ALL + LIBRARY DESTINATION tests/lib COMPONENT tests EXCLUDE_FROM_ALL) endif() diff --git a/src/core/tests/frontend/shared/test_builtin_extensions_1/test_extension.hpp b/src/core/tests/frontend/shared/test_builtin_extensions_1/test_extension.hpp index 277437740a5..83b69a55be3 100644 --- a/src/core/tests/frontend/shared/test_builtin_extensions_1/test_extension.hpp +++ b/src/core/tests/frontend/shared/test_builtin_extensions_1/test_extension.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include class TestExtension1 : public ov::frontend::JsonTransformationExtension { diff --git a/src/core/tests/frontend/shared/test_builtin_extensions_2/CMakeLists.txt b/src/core/tests/frontend/shared/test_builtin_extensions_2/CMakeLists.txt index db50e39f6f8..e773d4fd02b 100644 --- a/src/core/tests/frontend/shared/test_builtin_extensions_2/CMakeLists.txt +++ b/src/core/tests/frontend/shared/test_builtin_extensions_2/CMakeLists.txt @@ -17,10 +17,10 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) if(WIN32) install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION tests COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL - LIBRARY DESTINATION tests COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL) + RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL + LIBRARY DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) else() install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION tests/lib COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL - LIBRARY DESTINATION tests/lib COMPONENT tests OPTIONAL EXCLUDE_FROM_ALL) + RUNTIME DESTINATION tests/lib COMPONENT tests EXCLUDE_FROM_ALL + LIBRARY DESTINATION tests/lib COMPONENT tests EXCLUDE_FROM_ALL) endif() diff --git a/src/core/tests/frontend/shared/test_builtin_extensions_2/test_extensions.hpp b/src/core/tests/frontend/shared/test_builtin_extensions_2/test_extensions.hpp index 0534ba710b3..337f1f2e9b2 100644 --- a/src/core/tests/frontend/shared/test_builtin_extensions_2/test_extensions.hpp +++ b/src/core/tests/frontend/shared/test_builtin_extensions_2/test_extensions.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include class TestExtension1 : public ov::frontend::JsonTransformationExtension { diff --git a/src/core/tests/frontend/tensorflow/json_config_extension.cpp b/src/core/tests/frontend/tensorflow/json_config_extension.cpp index fc60bd5c16d..74556ba338a 100644 --- a/src/core/tests/frontend/tensorflow/json_config_extension.cpp +++ b/src/core/tests/frontend/tensorflow/json_config_extension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "json_config_extension.hpp" +#include "json_config.hpp" #include "tf_utils.hpp" diff --git a/src/frontends/common/include/common/extensions/decoder_transformation_extension.hpp b/src/frontends/common/include/common/extension/decoder_transformation.hpp similarity index 100% rename from src/frontends/common/include/common/extensions/decoder_transformation_extension.hpp rename to src/frontends/common/include/common/extension/decoder_transformation.hpp diff --git a/src/frontends/common/include/common/extensions/telemetry_extension.hpp b/src/frontends/common/include/common/extension/telemetry.hpp similarity index 100% rename from src/frontends/common/include/common/extensions/telemetry_extension.hpp rename to src/frontends/common/include/common/extension/telemetry.hpp diff --git a/src/frontends/common/src/extensions/decoder_transformation_extension.cpp b/src/frontends/common/src/extension/decoder_transformation.cpp similarity index 95% rename from src/frontends/common/src/extensions/decoder_transformation_extension.cpp rename to src/frontends/common/src/extension/decoder_transformation.cpp index 70f59babbd5..aafa48efd22 100644 --- a/src/frontends/common/src/extensions/decoder_transformation_extension.cpp +++ b/src/frontends/common/src/extension/decoder_transformation.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "common/extensions/decoder_transformation_extension.hpp" +#include "common/extension/decoder_transformation.hpp" #include diff --git a/src/frontends/common/src/extensions/telemetry_extension.cpp b/src/frontends/common/src/extension/telemetry.cpp similarity index 95% rename from src/frontends/common/src/extensions/telemetry_extension.cpp rename to src/frontends/common/src/extension/telemetry.cpp index ca7ff54b5b0..9bde10b8ad5 100644 --- a/src/frontends/common/src/extensions/telemetry_extension.cpp +++ b/src/frontends/common/src/extension/telemetry.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/telemetry.hpp" using namespace ov::frontend; diff --git a/src/frontends/ir/include/ir_frontend/frontend.hpp b/src/frontends/ir/include/ir_frontend/frontend.hpp index 8d25b40f579..14b4539f5b6 100644 --- a/src/frontends/ir/include/ir_frontend/frontend.hpp +++ b/src/frontends/ir/include/ir_frontend/frontend.hpp @@ -4,7 +4,7 @@ #pragma once -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/telemetry.hpp" #include "common/frontend.hpp" #include "utility.hpp" diff --git a/src/frontends/onnx/frontend/include/onnx_frontend/frontend.hpp b/src/frontends/onnx/frontend/include/onnx_frontend/frontend.hpp index 890f29f30db..fbe8c52a3c2 100644 --- a/src/frontends/onnx/frontend/include/onnx_frontend/frontend.hpp +++ b/src/frontends/onnx/frontend/include/onnx_frontend/frontend.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include +#include #include #ifdef OPENVINO_STATIC_LIBRARY diff --git a/src/frontends/onnx/frontend/src/core/graph.hpp b/src/frontends/onnx/frontend/src/core/graph.hpp index 807967d72ec..35c76e3dbc7 100644 --- a/src/frontends/onnx/frontend/src/core/graph.hpp +++ b/src/frontends/onnx/frontend/src/core/graph.hpp @@ -10,7 +10,7 @@ #include #include -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/telemetry.hpp" #include "core/graph_cache.hpp" #include "core/model.hpp" #include "ngraph/function.hpp" diff --git a/src/frontends/onnx/frontend/src/editor.hpp b/src/frontends/onnx/frontend/src/editor.hpp index b78c0ccf1ff..9122305f045 100644 --- a/src/frontends/onnx/frontend/src/editor.hpp +++ b/src/frontends/onnx/frontend/src/editor.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp index d4a616bff9c..c9e089ee8b4 100644 --- a/src/frontends/onnx/frontend/src/frontend.cpp +++ b/src/frontends/onnx/frontend/src/frontend.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include #include diff --git a/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp b/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp index 3b69054f4df..27a1a7a0991 100644 --- a/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp +++ b/src/frontends/onnx/frontend/src/utils/onnx_internal.hpp @@ -7,7 +7,7 @@ #include #include -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/telemetry.hpp" #include "ngraph/function.hpp" namespace ONNX_NAMESPACE { diff --git a/src/frontends/paddlepaddle/include/paddlepaddle_frontend/frontend.hpp b/src/frontends/paddlepaddle/include/paddlepaddle_frontend/frontend.hpp index 714f045cc8c..5d0d3df2ec9 100644 --- a/src/frontends/paddlepaddle/include/paddlepaddle_frontend/frontend.hpp +++ b/src/frontends/paddlepaddle/include/paddlepaddle_frontend/frontend.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include +#include #include #include "exceptions.hpp" diff --git a/src/frontends/paddlepaddle/include/paddlepaddle_frontend/model.hpp b/src/frontends/paddlepaddle/include/paddlepaddle_frontend/model.hpp index 6be52171c46..568108df79f 100644 --- a/src/frontends/paddlepaddle/include/paddlepaddle_frontend/model.hpp +++ b/src/frontends/paddlepaddle/include/paddlepaddle_frontend/model.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include "paddlepaddle_frontend/utility.hpp" diff --git a/src/frontends/tensorflow/include/tensorflow_frontend/frontend.hpp b/src/frontends/tensorflow/include/tensorflow_frontend/frontend.hpp index a98347f225f..76ebdf074d5 100644 --- a/src/frontends/tensorflow/include/tensorflow_frontend/frontend.hpp +++ b/src/frontends/tensorflow/include/tensorflow_frontend/frontend.hpp @@ -7,8 +7,8 @@ #include #include -#include "common/extensions/decoder_transformation_extension.hpp" -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/decoder_transformation.hpp" +#include "common/extension/telemetry.hpp" #include "common/frontend.hpp" #include "common/input_model.hpp" #include "openvino/core/any.hpp" diff --git a/src/frontends/tensorflow/src/model.hpp b/src/frontends/tensorflow/src/model.hpp index 17481886f1c..18cd417c789 100644 --- a/src/frontends/tensorflow/src/model.hpp +++ b/src/frontends/tensorflow/src/model.hpp @@ -4,7 +4,7 @@ #pragma once -#include "common/extensions/telemetry_extension.hpp" +#include "common/extension/telemetry.hpp" #include "common/input_model.hpp" #include "common/place.hpp" #include "tensorflow_frontend/graph_iterator.hpp"