IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve review commets

Browse Source
This commit is contained in:
Ivan Tikhonov 2021-12-15 22:41:28 +03:00
parent d77ec1a7e9
commit 0ea63552a1
31 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings/python/src/pyopenvino/frontend/extensions.cpp
View File

@ -7,10 +7,10 @@
#include <pybind11/stl.h>
#include <pybind11/stl_bind.h>
#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"

6
src/common/offline_transformations/CMakeLists.txt
View File

@ -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

2
src/common/offline_transformations/include/json_extension/json_config_extension.hpp → src/common/offline_transformations/include/extension/json_config.hpp
View File

@ -8,7 +8,7 @@
#include <iostream>
#include <type_traits>
#include "common/extensions/decoder_transformation_extension.hpp"
#include "common/extension/decoder_transformation.hpp"
#include "common/frontend_defs.hpp"
namespace ov {

11
src/common/offline_transformations/include/json_extension/json_transformation_extension.hpp → src/common/offline_transformations/include/extension/json_transformation.hpp
View File

@ -8,9 +8,8 @@
#include <iostream>
#include <type_traits>
#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<ov::Model>& function,
const std::string& replacement_descriptions) const = 0;

6
src/common/offline_transformations/src/json_extension/json_config_extension.cpp → src/common/offline_transformations/src/json_extension/json_config.cpp
View File

@ -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 {

2
src/core/tests/frontend/decoder_transformation_extension.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include <common/extensions/decoder_transformation_extension.hpp>
#include <common/extension/decoder_transformation.hpp>
#include <openvino/pass/manager.hpp>
#include "gtest/gtest.h"

2
src/core/tests/frontend/onnx/json_config_extension.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "json_config_extension.hpp"
#include "json_config.hpp"
#include "onnx_utils.hpp"

2
src/core/tests/frontend/paddlepaddle/json_config_extension.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "json_config_extension.hpp"
#include "json_config.hpp"
#include "paddle_utils.hpp"

2
src/core/tests/frontend/shared/CMakeLists.txt
View File

@ -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

2
src/core/tests/frontend/shared/include/json_config_extension.hpp → src/core/tests/frontend/shared/include/json_config.hpp
View File

@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include <json_extension/json_config_extension.hpp>
#include <extension/json_config.hpp>
#include <manager.hpp>
class JsonConfigExtensionWrapper : public ov::frontend::JsonConfigExtension {

6
src/core/tests/frontend/shared/src/json_config_extension.cpp → src/core/tests/frontend/shared/src/json_config.cpp
View File

@ -2,10 +2,10 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "json_config_extension.hpp"
#include "json_config.hpp"
#include <json_extension/json_config_extension.hpp>
#include <json_extension/json_transformation_extension.hpp>
#include <extension/json_config.hpp>
#include <extension/json_transformation.hpp>
#include <nlohmann/json-schema.hpp>
#include <ostream>
#include <util/graph_comparator.hpp>

2
src/core/tests/frontend/shared/src/telemetry.cpp
View File

@ -4,7 +4,7 @@
#include "telemetry.hpp"
#include <common/extensions/telemetry_extension.hpp>
#include <common/extension/telemetry.hpp>
#include "utils.hpp"

8
src/core/tests/frontend/shared/test_builtin_extensions_1/CMakeLists.txt
View File

@ -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()

2
src/core/tests/frontend/shared/test_builtin_extensions_1/test_extension.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include <json_extension/json_transformation_extension.hpp>
#include <extension/json_transformation.hpp>
#include <nlohmann/json.hpp>
class TestExtension1 : public ov::frontend::JsonTransformationExtension {

8
src/core/tests/frontend/shared/test_builtin_extensions_2/CMakeLists.txt
View File

@ -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()

2
src/core/tests/frontend/shared/test_builtin_extensions_2/test_extensions.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include <json_extension/json_transformation_extension.hpp>
#include <extension/json_transformation.hpp>
#include <nlohmann/json.hpp>
class TestExtension1 : public ov::frontend::JsonTransformationExtension {

2
src/core/tests/frontend/tensorflow/json_config_extension.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "json_config_extension.hpp"
#include "json_config.hpp"
#include "tf_utils.hpp"

0
src/frontends/common/include/common/extensions/decoder_transformation_extension.hpp → src/frontends/common/include/common/extension/decoder_transformation.hpp
View File

0
src/frontends/common/include/common/extensions/telemetry_extension.hpp → src/frontends/common/include/common/extension/telemetry.hpp
View File

2
src/frontends/common/src/extensions/decoder_transformation_extension.cpp → src/frontends/common/src/extension/decoder_transformation.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "common/extensions/decoder_transformation_extension.hpp"
#include "common/extension/decoder_transformation.hpp"
#include <utility>

2
src/frontends/common/src/extensions/telemetry_extension.cpp → src/frontends/common/src/extension/telemetry.cpp
View File

@ -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;

2
src/frontends/ir/include/ir_frontend/frontend.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include "common/extensions/telemetry_extension.hpp"
#include "common/extension/telemetry.hpp"
#include "common/frontend.hpp"
#include "utility.hpp"

4
src/frontends/onnx/frontend/include/onnx_frontend/frontend.hpp
View File

@ -4,8 +4,8 @@
#pragma once
#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>
#ifdef OPENVINO_STATIC_LIBRARY

2
src/frontends/onnx/frontend/src/core/graph.hpp
View File

@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "common/extensions/telemetry_extension.hpp"
#include "common/extension/telemetry.hpp"
#include "core/graph_cache.hpp"
#include "core/model.hpp"
#include "ngraph/function.hpp"

2
src/frontends/onnx/frontend/src/editor.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include <common/extensions/telemetry_extension.hpp>
#include <common/extension/telemetry.hpp>
#include <istream>
#include <map>
#include <memory>

2
src/frontends/onnx/frontend/src/frontend.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include <common/extensions/telemetry_extension.hpp>
#include <common/extension/telemetry.hpp>
#include <common/frontend_exceptions.hpp>
#include <fstream>
#include <input_model.hpp>

2
src/frontends/onnx/frontend/src/utils/onnx_internal.hpp
View File

@ -7,7 +7,7 @@
#include <memory>
#include <string>
#include "common/extensions/telemetry_extension.hpp"
#include "common/extension/telemetry.hpp"
#include "ngraph/function.hpp"
namespace ONNX_NAMESPACE {

4
src/frontends/paddlepaddle/include/paddlepaddle_frontend/frontend.hpp
View File

@ -4,8 +4,8 @@
#pragma once
#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 <manager.hpp>
#include "exceptions.hpp"

2
src/frontends/paddlepaddle/include/paddlepaddle_frontend/model.hpp
View File

@ -4,7 +4,7 @@
#pragma once
#include <common/extensions/telemetry_extension.hpp>
#include <common/extension/telemetry.hpp>
#include <manager.hpp>
#include "paddlepaddle_frontend/utility.hpp"

4
src/frontends/tensorflow/include/tensorflow_frontend/frontend.hpp
View File

@ -7,8 +7,8 @@
#include <functional>
#include <map>
#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"

2
src/frontends/tensorflow/src/model.hpp
View File

@ -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"