From e2e2785131dc005cee6ccd94a8aac416d66d27a3 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 10 Aug 2020 18:33:25 +0300 Subject: [PATCH] Moved legacy API to legacy/ subfolder for include (#1677) --- .../src/openvino/inference_engine/ie_api_impl.cpp | 4 ++-- .../src/openvino/inference_engine/ie_api_impl.hpp | 2 +- .../openvino/inference_engine/ie_api_impl_defs.pxd | 2 +- inference-engine/src/cldnn_engine/cldnn_engine.cpp | 8 ++++---- .../src/cldnn_engine/cldnn_executable_network.cpp | 6 +++--- inference-engine/src/cldnn_engine/cldnn_graph.cpp | 6 +++--- .../src/cldnn_engine/cldnn_program.cpp | 6 +++--- inference-engine/src/cldnn_engine/cldnn_program.h | 2 +- .../src/gna_plugin/backend/dnn_components.cpp | 2 +- .../src/gna_plugin/frontend/layer_quantizer.hpp | 2 +- .../src/gna_plugin/frontend/model_quantizer.hpp | 4 ++-- .../src/gna_plugin/frontend/scale_factor_calc.hpp | 2 +- .../src/gna_plugin/gna_graph_compiler.cpp | 2 +- .../src/gna_plugin/gna_graph_tools.hpp | 2 +- inference-engine/src/gna_plugin/gna_plugin.cpp | 6 +++--- .../src/gna_plugin/gna_plugin_internal.hpp | 2 +- .../src/gna_plugin/layers/gna_layer_type.cpp | 2 +- .../src/gna_plugin/memory/gna_memory_state.cpp | 2 +- .../src/gna_plugin/optimizer/gna_pass_manager.cpp | 10 ++++----- .../src/hetero_plugin/hetero_ade_util.cpp | 4 ++-- .../src/hetero_plugin/hetero_ade_util.hpp | 2 +- .../hetero_plugin/hetero_executable_network.cpp | 2 +- .../hetero_plugin/hetero_executable_network.hpp | 2 +- .../src/hetero_plugin/hetero_graph_splitter.hpp | 2 +- .../src/hetero_plugin/hetero_infer_request.cpp | 2 +- .../src/hetero_plugin/hetero_plugin.hpp | 2 +- .../src/inference_engine/CMakeLists.txt | 1 + .../inference_engine/cnn_network_ngraph_impl.cpp | 7 ++----- .../inference_engine/cnn_network_ngraph_impl.hpp | 10 +++++---- .../src/inference_engine/generic_ie.cpp | 2 +- inference-engine/src/inference_engine/ie_data.cpp | 2 +- .../src/inference_engine/network_serializer.cpp | 2 +- .../threading/ie_cpu_streams_executor.cpp | 2 +- .../include/{ => legacy}/cnn_network_impl.hpp | 9 ++++---- .../convert_function_to_cnn_network.hpp | 5 +++-- .../details/ie_cnn_network_iterator.hpp | 6 +++--- .../{ => legacy}/details/ie_cnn_network_tools.h | 3 ++- .../include/{ => legacy}/graph_tools.hpp | 5 +++-- .../include/{ => legacy}/graph_transformer.h | 2 +- .../{ => legacy}/ie_ishape_infer_extension.hpp | 0 .../legacy_api/include/{ => legacy}/ie_layers.h | 2 +- .../include/{ => legacy}/ie_layers_internal.hpp | 4 ++-- .../include/{ => legacy}/ie_layers_property.hpp | 0 .../include/{ => legacy}/ie_ngraph_utils.hpp | 0 .../include/{ => legacy}/ie_util_internal.hpp | 9 ++++---- .../include/{ => legacy}/layer_transform.hpp | 2 +- .../src/legacy_api/include/{ => legacy}/net_pass.h | 2 +- .../shape_infer/built-in/ie_built_in_holder.hpp | 6 +++--- .../src/legacy_api/src/cnn_network_impl.cpp | 19 ++++++++--------- .../src/convert_function_to_cnn_network.cpp | 6 ++---- .../src/legacy_api/src/graph_tools.cpp | 5 ++--- .../src/legacy_api/src/graph_transformer.cpp | 12 +++++------ .../legacy_api/src/ie_cnn_layer_builder_ngraph.cpp | 24 +++++++++++----------- .../legacy_api/src/ie_cnn_layer_builder_ngraph.h | 15 +++++++------- .../src/legacy_api/src/ie_layer_validators.cpp | 10 ++++----- .../src/legacy_api/src/ie_layer_validators.hpp | 2 +- inference-engine/src/legacy_api/src/ie_layers.cpp | 2 +- .../src/legacy_api/src/ie_layers_internal.cpp | 8 +++----- .../src/legacy_api/src/ie_util_internal.cpp | 14 ++++++------- .../src/legacy_api/src/layer_transform.cpp | 2 +- inference-engine/src/legacy_api/src/net_pass.cpp | 10 ++++----- .../src/legacy_api/src/network_serializer_v7.cpp | 3 +-- .../src/legacy_api/src/network_serializer_v7.hpp | 2 +- .../shape_infer/built-in/ie_argmax_shape_infer.hpp | 2 +- .../shape_infer/built-in/ie_built_in_holder.cpp | 3 +-- .../src/shape_infer/built-in/ie_built_in_impl.hpp | 2 +- .../built-in/ie_detection_output_shape_infer.hpp | 2 +- .../built-in/ie_flatten_shape_infer.hpp | 2 +- .../shape_infer/built-in/ie_interp_shape_infer.hpp | 2 +- .../built-in/ie_permute_shape_infer.hpp | 2 +- .../built-in/ie_priorbox_clustered_shape_infer.hpp | 2 +- .../built-in/ie_priorbox_shape_infer.hpp | 2 +- .../built-in/ie_psroi_pooling_shape_infer.hpp | 2 +- .../built-in/ie_region_yolo_shape_infer.hpp | 2 +- .../built-in/ie_reorg_yolo_shape_infer.hpp | 2 +- .../built-in/ie_resample_shape_infer.hpp | 2 +- .../built-in/ie_reshape_shape_infer.hpp | 2 +- .../built-in/ie_roi_pooling_shape_infer.hpp | 2 +- .../built-in/ie_simpler_nms_shape_infer.hpp | 2 +- .../built-in/ie_tensor_iterator_shape_infer.hpp | 2 +- .../built-in/ie_upsampling_shape_infer.hpp | 2 +- .../src/shape_infer/built-in/impl_register.hpp | 2 +- .../shape_infer/const_infer/broadcast_offset.hpp | 2 +- .../shape_infer/const_infer/ie_add_const_infer.hpp | 2 +- .../const_infer/ie_broadcast_const_infer.hpp | 2 +- .../const_infer/ie_concat_const_infer.hpp | 2 +- .../const_infer/ie_const_const_infer.hpp | 2 +- .../const_infer/ie_convert_const_infer.hpp | 2 +- .../shape_infer/const_infer/ie_div_const_infer.hpp | 2 +- .../const_infer/ie_eltw_const_infer.hpp | 2 +- .../const_infer/ie_fill_const_infer.hpp | 2 +- .../const_infer/ie_gather_const_infer.hpp | 2 +- .../const_infer/ie_in_place_const_infer.hpp | 2 +- .../shape_infer/const_infer/ie_mul_const_infer.hpp | 2 +- .../const_infer/ie_onehot_const_infer.hpp | 2 +- .../const_infer/ie_permute_const_infer.hpp | 2 +- .../shape_infer/const_infer/ie_pow_const_infer.hpp | 2 +- .../const_infer/ie_power_const_infer.hpp | 2 +- .../const_infer/ie_range_const_infer.hpp | 2 +- .../const_infer/ie_reduce_const_infer.hpp | 2 +- .../const_infer/ie_reshape_const_infer.hpp | 2 +- .../const_infer/ie_shape_const_infer.hpp | 2 +- .../const_infer/ie_split_const_infer.hpp | 2 +- .../const_infer/ie_strided_slice_const_infer.hpp | 2 +- .../shape_infer/const_infer/ie_sub_const_infer.hpp | 2 +- .../const_infer/ie_tile_const_infer.hpp | 2 +- .../src/shape_infer/ie_reshape_io_controllers.cpp | 12 +++++------ .../src/shape_infer/ie_reshape_io_controllers.hpp | 8 ++++---- .../src/shape_infer/ie_reshape_launcher.cpp | 19 ++++++++--------- .../src/shape_infer/ie_reshape_launcher.hpp | 5 ++--- .../src/legacy_api/src/shape_infer/ie_reshaper.cpp | 18 ++++++++-------- .../src/legacy_api/src/shape_infer/ie_reshaper.hpp | 6 +++--- .../common/ie_lpt_exception.hpp | 2 +- .../depth_to_space.hpp | 2 +- .../ilayer_transformations_manager.hpp | 2 +- .../network_helper.hpp | 4 ++-- .../low_precision_transformations/normalize.hpp | 2 +- .../low_precision_transformations/permute.hpp | 2 +- .../low_precision_transformations/pooling.hpp | 2 +- .../low_precision_transformations/power.hpp | 2 +- .../quantization_details.hpp | 2 +- .../low_precision_transformations/reshape.hpp | 2 +- .../low_precision_transformations/squeeze.hpp | 2 +- .../src/blob_transformation.cpp | 2 +- .../low_precision_transformations/src/concat.cpp | 4 ++-- .../src/concat_multi_channels.cpp | 4 ++-- .../low_precision_transformations/src/const.cpp | 4 ++-- .../src/dequantization_info.cpp | 4 ++-- .../low_precision_transformations/src/eltwise.cpp | 2 +- .../src/fake_quantize.cpp | 4 ++-- .../src/fully_connected.cpp | 4 ++-- .../src/low_precision_transformations/src/gemm.cpp | 4 ++-- .../src/layer_transformation.cpp | 4 ++-- .../src/network_helper.cpp | 6 +++--- .../src/quantization_details.cpp | 4 ++-- .../src/transformation_context.cpp | 4 ++-- .../src/transformer.cpp | 4 ++-- .../src/mkldnn_plugin/bf16transformer.cpp | 4 ++-- .../src/mkldnn_plugin/mkldnn_exec_network.cpp | 6 +++--- .../src/mkldnn_plugin/mkldnn_exec_network.h | 2 +- .../src/mkldnn_plugin/mkldnn_extension_mngr.h | 4 ++-- .../src/mkldnn_plugin/mkldnn_graph.cpp | 6 +++--- .../src/mkldnn_plugin/mkldnn_graph_dumper.cpp | 6 +++--- .../src/mkldnn_plugin/mkldnn_graph_optimizer.cpp | 2 +- inference-engine/src/mkldnn_plugin/mkldnn_node.h | 1 - .../src/mkldnn_plugin/mkldnn_plugin.cpp | 10 ++++----- inference-engine/src/mkldnn_plugin/nodes/base.hpp | 2 +- inference-engine/src/mkldnn_plugin/nodes/list.hpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_activation_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp | 4 ++-- .../src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp | 4 ++-- .../src/mkldnn_plugin/nodes/mkldnn_crop_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp | 4 ++-- .../mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp | 4 ++-- .../mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp | 2 +- .../nodes/mkldnn_fullyconnected_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_gemm_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_generic_node.h | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp | 4 ++-- .../mkldnn_plugin/nodes/mkldnn_normalize_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_permute_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_pooling_node.cpp | 4 ++-- .../src/mkldnn_plugin/nodes/mkldnn_power_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_quantize_node.cpp | 2 +- .../mkldnn_plugin/nodes/mkldnn_resample_node.cpp | 4 ++-- .../mkldnn_plugin/nodes/mkldnn_reshape_node.cpp | 2 +- .../nodes/mkldnn_roi_pooling_node.cpp | 2 +- .../nodes/mkldnn_scatter_update_node.cpp | 4 ++-- .../mkldnn_plugin/nodes/mkldnn_softmax_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/mkldnn_split_node.cpp | 2 +- .../nodes/mkldnn_tensoriterator_node.cpp | 6 +++--- .../src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp | 2 +- .../src/mkldnn_plugin/nodes/reduce.cpp | 2 +- inference-engine/src/multi_device/multi_device.cpp | 2 +- inference-engine/src/plugin_api/generic_ie.hpp | 2 +- .../src/readers/ir_reader/ie_ir_parser.cpp | 2 +- .../src/readers/ir_reader/ie_ir_parser.hpp | 2 +- .../readers/ir_reader_v7/ie_cnn_net_reader_impl.h | 4 ++-- .../src/readers/ir_reader_v7/ie_format_parser.h | 4 ++-- .../readers/ir_reader_v7/ie_layer_validators.cpp | 2 +- .../readers/ir_reader_v7/ie_layer_validators.hpp | 2 +- .../src/readers/ir_reader_v7/parsers.h | 2 +- .../vpu/common/include/vpu/utils/ie_helpers.hpp | 2 +- .../include/vpu/backend/backend.hpp | 2 +- .../include/vpu/frontend/ie_parsed_network.hpp | 2 +- .../vpu/model/data_contents/priorbox_contents.hpp | 2 +- .../graph_transformer/include/vpu/model/stage.hpp | 2 +- .../include/vpu/stage_builder.hpp | 2 +- .../graph_transformer/src/backend/dump_to_dot.cpp | 2 +- .../src/backend/get_meta_data.cpp | 2 +- .../graph_transformer/src/backend/serialize.cpp | 2 +- .../src/frontend/detect_network_batch.cpp | 4 ++-- .../graph_transformer/src/frontend/frontend.cpp | 4 ++-- .../src/frontend/ie_parsed_network.cpp | 2 +- .../src/frontend/remove_const_layers.cpp | 4 ++-- .../src/frontend/unroll_loops.cpp | 4 ++-- .../graph_transformer/src/graph_transformer.cpp | 4 ++-- .../src/model/data_contents/priorbox_contents.cpp | 2 +- .../graph_transformer/src/stages/convolution.cpp | 2 +- .../graph_transformer/src/stages/deconvolution.cpp | 2 +- .../vpu/graph_transformer/src/stages/pooling.cpp | 2 +- .../src/stages/tensor_iterator.cpp | 6 +++--- .../graph_transformer/src/utils/runtime_graph.cpp | 2 +- .../myriad_plugin/myriad_executable_network.cpp | 4 ++-- .../src/vpu/myriad_plugin/myriad_plugin.cpp | 2 +- .../cnn_network/cnn_ngraph_impl_tests.cpp | 8 ++++---- .../convert_ngraph_to_cnn_network_tests.cpp | 2 +- .../keep_constant_inputs_tests.cpp | 4 ++-- .../functional/inference_engine/local_test.cpp | 2 +- .../inference_engine/net_reader_test.cpp | 2 +- .../ngraph_reader/ngraph_reader_tests.hpp | 2 +- .../inference_engine/ngraph_reshape_tests.cpp | 2 +- .../transformations/primitives_priority_test.cpp | 4 ++-- .../layer_transformation.cpp | 8 ++++---- .../layer_transformation.cpp | 8 ++++---- .../ngraph/conversions/dynamic_shape_resolver.cpp | 4 ++-- .../shared/include/behavior/core_integration.hpp | 2 +- .../shared/include/behavior/exec_graph_info.hpp | 2 +- .../plugin/shared/include/behavior/test_plugin.hpp | 2 +- .../execution_graph_tests/network_serializer.cpp | 2 +- .../common_test_utils/common_layers_params.hpp | 2 +- .../common_test_utils/common_utils.hpp | 2 +- .../layer_transformation.cpp | 4 ++-- .../layer_transformation.hpp | 2 +- .../functional_test_utils/network_utils.cpp | 2 +- .../functional_test_utils/network_utils.hpp | 4 ++-- .../test_model/test_model.hpp | 2 +- .../unit_test_utils/mocks/mock_icnn_network.hpp | 2 +- .../mocks/mock_not_empty_icnn_network.hpp | 2 +- .../ie_tests/src/classification_matcher.cpp | 2 +- .../ie_tests/src/object_detection_matcher.cpp | 2 +- .../functional/ie_tests/src/raw_matcher.cpp | 2 +- .../graph_tools/graph_tools_functional_tests.cpp | 2 +- .../network_tests/network_test.cpp | 2 +- .../common_single_layer_tests/conv_ref.cpp | 2 +- .../common_single_layer_tests/conv_ref.hpp | 6 +++--- .../common_single_layer_tests/deconv_ref.cpp | 2 +- .../common_single_layer_tests/deconv_ref.hpp | 6 +++--- .../common_single_layer_tests/def_conv_ref.cpp | 2 +- .../common_single_layer_tests/def_conv_ref.hpp | 6 +++--- .../common_single_layer_tests/pool_ref.cpp | 2 +- .../common_single_layer_tests/pool_ref.hpp | 2 +- .../single_layer_tests.hpp | 4 ++-- .../graph_tools/graph_tools_functional_tests.hpp | 2 +- .../shared_tests/network_tests/network_i8.hpp | 2 +- .../shared_tests/single_layer_tests/conv_tests.hpp | 2 +- .../common/low_precision_tests_utils.cpp | 2 +- .../common/low_precision_tests_utils.hpp | 2 +- .../transformations/common/validation.hpp | 2 +- ...ow_precision_transformer_single_layer_tests.hpp | 2 +- .../helpers/single_layer_common.cpp | 2 +- .../helpers/single_layer_common.hpp | 4 ++-- .../tests_deprecated/helpers/tests_common.hpp | 2 +- .../tests_deprecated/helpers/tests_common_func.hpp | 2 +- .../unit/cnn_network/cnn_network_impl_test.cpp | 2 +- .../unit/engines/gna/I8_quantisation_test.cpp | 2 +- .../unit/engines/gna/fp32_non_quantized_tests.cpp | 2 +- .../unit/engines/gna/gna_graph_aot_test.cpp | 2 +- .../unit/engines/gna/gna_matcher.cpp | 6 +++--- .../unit/engines/gna/gna_matcher.hpp | 2 +- .../unit/engines/gna/i16_quantisation_test.cpp | 2 +- .../engines/mkldnn/constant_propagation_test.cpp | 2 +- .../unit/engines/mkldnn/dumper_test.cpp | 2 +- .../graph/layers/internal/graph_concat_test.cpp | 2 +- .../graph/layers/internal/graph_conv_test.cpp | 2 +- .../graph/layers/internal/graph_eltwise_test.cpp | 2 +- .../graph/layers/internal/graph_pooling_test.cpp | 2 +- .../graph/structure/graph_conv_concat_tests.cpp | 2 +- .../graph/structure/graph_structure_test.cpp | 2 +- .../unit/engines/mkldnn/graph/test_graph.hpp | 2 +- .../unit/graph_tools/graph_copy_tests.cpp | 2 +- .../unit/graph_tools/graph_test_base.hpp | 4 ++-- .../unit/graph_tools/graph_tools_test.cpp | 4 ++-- .../get_num_iterations_test.cpp | 4 ++-- .../layer_transform_test.cpp | 2 +- .../unit/inference_engine_tests/layers_test.cpp | 4 ++-- .../util_const_infer_test.cpp | 6 +++--- .../util_const_infer_test.hpp | 4 ++-- .../unit/inference_engine_tests/util_test.cpp | 6 +++--- .../unit/inference_engine_tests/util_test.hpp | 2 +- 283 files changed, 472 insertions(+), 485 deletions(-) rename inference-engine/src/legacy_api/include/{ => legacy}/cnn_network_impl.hpp (98%) rename inference-engine/src/legacy_api/include/{ => legacy}/convert_function_to_cnn_network.hpp (91%) rename inference-engine/src/legacy_api/include/{ => legacy}/details/ie_cnn_network_iterator.hpp (98%) rename inference-engine/src/legacy_api/include/{ => legacy}/details/ie_cnn_network_tools.h (94%) rename inference-engine/src/legacy_api/include/{ => legacy}/graph_tools.hpp (99%) rename inference-engine/src/legacy_api/include/{ => legacy}/graph_transformer.h (98%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_ishape_infer_extension.hpp (100%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_layers.h (99%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_layers_internal.hpp (96%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_layers_property.hpp (100%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_ngraph_utils.hpp (100%) rename inference-engine/src/legacy_api/include/{ => legacy}/ie_util_internal.hpp (96%) rename inference-engine/src/legacy_api/include/{ => legacy}/layer_transform.hpp (99%) rename inference-engine/src/legacy_api/include/{ => legacy}/net_pass.h (98%) rename inference-engine/src/legacy_api/include/{ => legacy}/shape_infer/built-in/ie_built_in_holder.hpp (96%) diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp index 9e3c37b..f6f0860 100644 --- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp +++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp @@ -5,8 +5,8 @@ #include "ie_api_impl.hpp" #include "hetero/hetero_plugin_config.hpp" #include "ie_iinfer_request.hpp" -#include "details/ie_cnn_network_tools.h" -#include "cnn_network_impl.hpp" +#include +#include const std::string EXPORTED_NETWORK_NAME = "undefined"; std::map precision_map = {{"FP32", InferenceEngine::Precision::FP32}, diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp index e9820fb..3e6a863 100644 --- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp +++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include typedef std::chrono::high_resolution_clock Time; diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl_defs.pxd b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl_defs.pxd index 43adb69..37c52a3 100644 --- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl_defs.pxd +++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl_defs.pxd @@ -141,7 +141,7 @@ cdef extern from "" namespace "InferenceEngine": BLOCKED -cdef extern from "" namespace "InferenceEngine": +cdef extern from "" namespace "InferenceEngine": cdef weak_ptr[CNNLayer] getCreatorLayer(const shared_ptr[Data] & data) map[string, shared_ptr[CNNLayer]] & getInputTo(const shared_ptr[Data] & data) diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp index ea21b51..786a487 100644 --- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp @@ -21,7 +21,7 @@ #include #include "ie_plugin_config.hpp" #include "caseless.hpp" -#include
+#include #include #include #include @@ -33,9 +33,9 @@ #include #include #include -#include "convert_function_to_cnn_network.hpp" -#include -#include +#include +#include +#include #include "cldnn_engine.h" #include "cldnn_executable_network.h" diff --git a/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp b/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp index 744b5a3..b3f245b 100644 --- a/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp @@ -16,9 +16,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "cldnn_infer_request.h" #include #include "cldnn_async_infer_request.h" diff --git a/inference-engine/src/cldnn_engine/cldnn_graph.cpp b/inference-engine/src/cldnn_engine/cldnn_graph.cpp index 92ff42b..4c38dab 100644 --- a/inference-engine/src/cldnn_engine/cldnn_graph.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_graph.cpp @@ -17,9 +17,9 @@ #include "simple_math.h" #include #include -#include -#include -#include +#include +#include +#include #include "cldnn_infer_request.h" #include #include diff --git a/inference-engine/src/cldnn_engine/cldnn_program.cpp b/inference-engine/src/cldnn_engine/cldnn_program.cpp index d29e71e..fd9d801 100644 --- a/inference-engine/src/cldnn_engine/cldnn_program.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_program.cpp @@ -75,9 +75,9 @@ #include "simple_math.h" #include #include -#include -#include -#include +#include +#include +#include #include "cldnn_infer_request.h" #include #include "caseless.hpp" diff --git a/inference-engine/src/cldnn_engine/cldnn_program.h b/inference-engine/src/cldnn_engine/cldnn_program.h index d736b35..989a3c6 100644 --- a/inference-engine/src/cldnn_engine/cldnn_program.h +++ b/inference-engine/src/cldnn_engine/cldnn_program.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/gna_plugin/backend/dnn_components.cpp b/inference-engine/src/gna_plugin/backend/dnn_components.cpp index 18b0315..fd590a3 100644 --- a/inference-engine/src/gna_plugin/backend/dnn_components.cpp +++ b/inference-engine/src/gna_plugin/backend/dnn_components.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include "backend/dnn_types.h" diff --git a/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp b/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp index 2e761f4..7b488a1 100644 --- a/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp +++ b/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp @@ -17,7 +17,7 @@ #include "precision_ex.hpp" #include "layers/gna_layer_info.hpp" #include "weights_converter.hpp" -#include "layer_transform.hpp" +#include namespace GNAPluginNS { namespace frontend { diff --git a/inference-engine/src/gna_plugin/frontend/model_quantizer.hpp b/inference-engine/src/gna_plugin/frontend/model_quantizer.hpp index 17b74ae..4a0f250 100644 --- a/inference-engine/src/gna_plugin/frontend/model_quantizer.hpp +++ b/inference-engine/src/gna_plugin/frontend/model_quantizer.hpp @@ -8,9 +8,9 @@ #include #include -#include "layer_transform.hpp" +#include #include "gna_graph_tools.hpp" -#include "details/ie_cnn_network_tools.h" +#include #include "layer_quantizer.hpp" #include "scale_factor_calc.hpp" #include "weights_converter.hpp" diff --git a/inference-engine/src/gna_plugin/frontend/scale_factor_calc.hpp b/inference-engine/src/gna_plugin/frontend/scale_factor_calc.hpp index a5c65c8..5da54c8 100644 --- a/inference-engine/src/gna_plugin/frontend/scale_factor_calc.hpp +++ b/inference-engine/src/gna_plugin/frontend/scale_factor_calc.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "gna_upstream_iterator.hpp" #include "layers/gna_layer_info.hpp" #include "gna_plugin_log.hpp" diff --git a/inference-engine/src/gna_plugin/gna_graph_compiler.cpp b/inference-engine/src/gna_plugin/gna_graph_compiler.cpp index 066cc6f..d0d8d7f 100644 --- a/inference-engine/src/gna_plugin/gna_graph_compiler.cpp +++ b/inference-engine/src/gna_plugin/gna_graph_compiler.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/gna_plugin/gna_graph_tools.hpp b/inference-engine/src/gna_plugin/gna_graph_tools.hpp index cbbca82..d5f730a 100644 --- a/inference-engine/src/gna_plugin/gna_graph_tools.hpp +++ b/inference-engine/src/gna_plugin/gna_graph_tools.hpp @@ -4,7 +4,7 @@ #pragma once -#include "graph_tools.hpp" +#include #include "gna_plugin_log.hpp" #include diff --git a/inference-engine/src/gna_plugin/gna_plugin.cpp b/inference-engine/src/gna_plugin/gna_plugin.cpp index 9e1d10a..b77bfe7 100644 --- a/inference-engine/src/gna_plugin/gna_plugin.cpp +++ b/inference-engine/src/gna_plugin/gna_plugin.cpp @@ -19,12 +19,12 @@ #include #include -#include -#include +#include +#include #include #include #include "gna_plugin_config.hpp" -#include +#include #include "gna_plugin.hpp" #include "optimizer/gna_pass_manager.hpp" #include "layers/gna_layer_type.hpp" diff --git a/inference-engine/src/gna_plugin/gna_plugin_internal.hpp b/inference-engine/src/gna_plugin/gna_plugin_internal.hpp index 97c4470..fca2494 100644 --- a/inference-engine/src/gna_plugin/gna_plugin_internal.hpp +++ b/inference-engine/src/gna_plugin/gna_plugin_internal.hpp @@ -11,7 +11,7 @@ #include #include "gna_executable_network.hpp" #include "gna_plugin_config.hpp" -#include +#include namespace GNAPluginNS { diff --git a/inference-engine/src/gna_plugin/layers/gna_layer_type.cpp b/inference-engine/src/gna_plugin/layers/gna_layer_type.cpp index f689d18..6309680 100644 --- a/inference-engine/src/gna_plugin/layers/gna_layer_type.cpp +++ b/inference-engine/src/gna_plugin/layers/gna_layer_type.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "gna_layer_type.hpp" #include "gna_layer_info.hpp" diff --git a/inference-engine/src/gna_plugin/memory/gna_memory_state.cpp b/inference-engine/src/gna_plugin/memory/gna_memory_state.cpp index e3d0803..bb25cd9 100644 --- a/inference-engine/src/gna_plugin/memory/gna_memory_state.cpp +++ b/inference-engine/src/gna_plugin/memory/gna_memory_state.cpp @@ -4,7 +4,7 @@ #include "gna_memory_state.hpp" #include "frontend/quantized_layer_params.hpp" -#include "layer_transform.hpp" +#include #include "preprocessing.hpp" #include "ie_layouts.h" diff --git a/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp b/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp index cc0d857..ef9160b 100644 --- a/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp +++ b/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp @@ -15,15 +15,15 @@ #include #include -#include +#include #include #include #include #include -#include
-#include -#include -#include +#include +#include +#include +#include #include "gna_plugin_log.hpp" #include "frontend/quantized_layer_params.hpp" diff --git a/inference-engine/src/hetero_plugin/hetero_ade_util.cpp b/inference-engine/src/hetero_plugin/hetero_ade_util.cpp index 0546192..75fbccb 100644 --- a/inference-engine/src/hetero_plugin/hetero_ade_util.cpp +++ b/inference-engine/src/hetero_plugin/hetero_ade_util.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/src/hetero_plugin/hetero_ade_util.hpp b/inference-engine/src/hetero_plugin/hetero_ade_util.hpp index f365fcc..7d10bc1 100644 --- a/inference-engine/src/hetero_plugin/hetero_ade_util.hpp +++ b/inference-engine/src/hetero_plugin/hetero_ade_util.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include namespace ade { class Graph; diff --git a/inference-engine/src/hetero_plugin/hetero_executable_network.cpp b/inference-engine/src/hetero_plugin/hetero_executable_network.cpp index c0bfc5f..813db34 100644 --- a/inference-engine/src/hetero_plugin/hetero_executable_network.cpp +++ b/inference-engine/src/hetero_plugin/hetero_executable_network.cpp @@ -5,7 +5,7 @@ #include "ie_metric_helpers.hpp" #include "hetero_executable_network.hpp" #include "hetero_async_infer_request.hpp" -#include "ie_util_internal.hpp" +#include #include "hetero_graph_splitter.hpp" #include "hetero_itt.hpp" #include "xml_parse_utils.h" diff --git a/inference-engine/src/hetero_plugin/hetero_executable_network.hpp b/inference-engine/src/hetero_plugin/hetero_executable_network.hpp index ae7b5b0..f8aa8c6 100644 --- a/inference-engine/src/hetero_plugin/hetero_executable_network.hpp +++ b/inference-engine/src/hetero_plugin/hetero_executable_network.hpp @@ -20,7 +20,7 @@ #include "hetero_infer_request.hpp" #include "ie_icore.hpp" -#include "cnn_network_impl.hpp" +#include #include "hetero_async_infer_request.hpp" namespace HeteroPlugin { diff --git a/inference-engine/src/hetero_plugin/hetero_graph_splitter.hpp b/inference-engine/src/hetero_plugin/hetero_graph_splitter.hpp index 2494125..fc4d2bc 100644 --- a/inference-engine/src/hetero_plugin/hetero_graph_splitter.hpp +++ b/inference-engine/src/hetero_plugin/hetero_graph_splitter.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/hetero_plugin/hetero_infer_request.cpp b/inference-engine/src/hetero_plugin/hetero_infer_request.cpp index 25ca67d..6690815 100644 --- a/inference-engine/src/hetero_plugin/hetero_infer_request.cpp +++ b/inference-engine/src/hetero_plugin/hetero_infer_request.cpp @@ -5,7 +5,7 @@ #include "hetero_infer_request.hpp" #include "hetero_itt.hpp" #include -#include +#include #include #include #include diff --git a/inference-engine/src/hetero_plugin/hetero_plugin.hpp b/inference-engine/src/hetero_plugin/hetero_plugin.hpp index 7300206..bdd8903 100644 --- a/inference-engine/src/hetero_plugin/hetero_plugin.hpp +++ b/inference-engine/src/hetero_plugin/hetero_plugin.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace HeteroPlugin { diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index b556580..1791f2d 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -98,6 +98,7 @@ add_library(${TARGET_NAME}_plugin_api INTERFACE) target_include_directories(${TARGET_NAME}_plugin_api INTERFACE "${IE_MAIN_SOURCE_DIR}/src/plugin_api" "${IE_MAIN_SOURCE_DIR}/src/legacy_api/include" + "${IE_MAIN_SOURCE_DIR}/src/legacy_api/include/legacy" # for compatibility $ ${PUBLIC_HEADERS_DIR}) diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp index 3a53941..965486a 100644 --- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp +++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp @@ -24,15 +24,12 @@ #include #include "ngraph_ops/eltwise.hpp" -#include "graph_tools.hpp" #include "exec_graph_info.hpp" -#include "graph_transformer.h" -#include "ie_util_internal.hpp" -#include "ie_ngraph_utils.hpp" +#include #include "ie_itt.hpp" #include "network_serializer.hpp" #include "generic_ie.hpp" -#include +#include using namespace std; using namespace InferenceEngine; diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp index f7dc778..56386a7 100644 --- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp +++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp @@ -11,16 +11,16 @@ #include #include -#include #include #include +#include +#include + #include #include #include -#include -#include -#include "cnn_network_impl.hpp" +#include #include "description_buffer.hpp" #include "ie_api.h" #include "ie_blob.h" @@ -28,6 +28,8 @@ #include "ie_data.h" #include "ie_input_info.hpp" +#include + namespace InferenceEngine { namespace ShapeInfer { class Reshaper; diff --git a/inference-engine/src/inference_engine/generic_ie.cpp b/inference-engine/src/inference_engine/generic_ie.cpp index b26a619..8240230 100644 --- a/inference-engine/src/inference_engine/generic_ie.cpp +++ b/inference-engine/src/inference_engine/generic_ie.cpp @@ -14,7 +14,7 @@ #include #include "blob_factory.hpp" -#include "ie_ngraph_utils.hpp" +#include #include "ngraph/util.hpp" #include "ngraph/graph_util.hpp" #include "ngraph/validation_util.hpp" diff --git a/inference-engine/src/inference_engine/ie_data.cpp b/inference-engine/src/inference_engine/ie_data.cpp index 2410984..6854340 100644 --- a/inference-engine/src/inference_engine/ie_data.cpp +++ b/inference-engine/src/inference_engine/ie_data.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_layers.h" +#include #include #include diff --git a/inference-engine/src/inference_engine/network_serializer.cpp b/inference-engine/src/inference_engine/network_serializer.cpp index f9caf80..7b94579 100644 --- a/inference-engine/src/inference_engine/network_serializer.cpp +++ b/inference-engine/src/inference_engine/network_serializer.cpp @@ -11,7 +11,7 @@ #include "exec_graph_info.hpp" #include "xml_parse_utils.h" -#include "ie_ngraph_utils.hpp" +#include #include #include diff --git a/inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp b/inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp index 622ca30..79debd1 100644 --- a/inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp +++ b/inference-engine/src/inference_engine/threading/ie_cpu_streams_executor.cpp @@ -13,12 +13,12 @@ #include #include #include + #include "threading/ie_thread_local.hpp" #include "ie_parallel.hpp" #include "ie_system_conf.h" #include "threading/ie_thread_affinity.hpp" #include "details/ie_exception.hpp" -#include "ie_util_internal.hpp" #include "threading/ie_cpu_streams_executor.hpp" #include diff --git a/inference-engine/src/legacy_api/include/cnn_network_impl.hpp b/inference-engine/src/legacy_api/include/legacy/cnn_network_impl.hpp similarity index 98% rename from inference-engine/src/legacy_api/include/cnn_network_impl.hpp rename to inference-engine/src/legacy_api/include/legacy/cnn_network_impl.hpp index 8aeaaa3..c7bb65f 100644 --- a/inference-engine/src/legacy_api/include/cnn_network_impl.hpp +++ b/inference-engine/src/legacy_api/include/legacy/cnn_network_impl.hpp @@ -4,20 +4,21 @@ #pragma once -#include #include #include #include #include -#include "ie_layers.h" -#include "ie_ishape_infer_extension.hpp" -#include "description_buffer.hpp" #include "ie_api.h" #include "ie_blob.h" #include "ie_common.h" #include "ie_data.h" #include "ie_input_info.hpp" +#include +#include "description_buffer.hpp" + +#include +#include namespace InferenceEngine { namespace ShapeInfer { diff --git a/inference-engine/src/legacy_api/include/convert_function_to_cnn_network.hpp b/inference-engine/src/legacy_api/include/legacy/convert_function_to_cnn_network.hpp similarity index 91% rename from inference-engine/src/legacy_api/include/convert_function_to_cnn_network.hpp rename to inference-engine/src/legacy_api/include/legacy/convert_function_to_cnn_network.hpp index e31af13..8f75de6 100644 --- a/inference-engine/src/legacy_api/include/convert_function_to_cnn_network.hpp +++ b/inference-engine/src/legacy_api/include/legacy/convert_function_to_cnn_network.hpp @@ -4,13 +4,14 @@ #pragma once -#include "cnn_network_impl.hpp" -#include +#include #include #include #include +#include + namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/legacy_api/include/details/ie_cnn_network_iterator.hpp b/inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_iterator.hpp similarity index 98% rename from inference-engine/src/legacy_api/include/details/ie_cnn_network_iterator.hpp rename to inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_iterator.hpp index 6e7d1d1..fcc57fc 100644 --- a/inference-engine/src/legacy_api/include/details/ie_cnn_network_iterator.hpp +++ b/inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_iterator.hpp @@ -14,12 +14,12 @@ #include #include "ie_api.h" -#include "ie_layers.h" -#include "ie_icnn_network.hpp" -#include "cnn_network_impl.hpp" #include "cpp/ie_cnn_network.h" #include "ie_locked_memory.hpp" +#include +#include + namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h b/inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_tools.h similarity index 94% rename from inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h rename to inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_tools.h index d043f00..61d60fa 100644 --- a/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h +++ b/inference-engine/src/legacy_api/include/legacy/details/ie_cnn_network_tools.h @@ -10,9 +10,10 @@ #pragma once #include -#include "ie_layers.h" #include "ie_icnn_network.hpp" +#include + namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/legacy_api/include/graph_tools.hpp b/inference-engine/src/legacy_api/include/legacy/graph_tools.hpp similarity index 99% rename from inference-engine/src/legacy_api/include/graph_tools.hpp rename to inference-engine/src/legacy_api/include/legacy/graph_tools.hpp index 15415d3..b364e0d 100644 --- a/inference-engine/src/legacy_api/include/graph_tools.hpp +++ b/inference-engine/src/legacy_api/include/legacy/graph_tools.hpp @@ -17,10 +17,11 @@ #include #include -#include "cnn_network_impl.hpp" #include "ie_algorithm.hpp" #include "ie_icnn_network.hpp" -#include "layer_transform.hpp" + +#include +#include IE_SUPPRESS_DEPRECATED_START diff --git a/inference-engine/src/legacy_api/include/graph_transformer.h b/inference-engine/src/legacy_api/include/legacy/graph_transformer.h similarity index 98% rename from inference-engine/src/legacy_api/include/graph_transformer.h rename to inference-engine/src/legacy_api/include/legacy/graph_transformer.h index 36c678e..6dbf077 100644 --- a/inference-engine/src/legacy_api/include/graph_transformer.h +++ b/inference-engine/src/legacy_api/include/legacy/graph_transformer.h @@ -15,7 +15,7 @@ #include #include -#include "cnn_network_impl.hpp" +#include namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/include/ie_ishape_infer_extension.hpp b/inference-engine/src/legacy_api/include/legacy/ie_ishape_infer_extension.hpp similarity index 100% rename from inference-engine/src/legacy_api/include/ie_ishape_infer_extension.hpp rename to inference-engine/src/legacy_api/include/legacy/ie_ishape_infer_extension.hpp diff --git a/inference-engine/src/legacy_api/include/ie_layers.h b/inference-engine/src/legacy_api/include/legacy/ie_layers.h similarity index 99% rename from inference-engine/src/legacy_api/include/ie_layers.h rename to inference-engine/src/legacy_api/include/legacy/ie_layers.h index 79ec1e3..d02532d 100644 --- a/inference-engine/src/legacy_api/include/ie_layers.h +++ b/inference-engine/src/legacy_api/include/legacy/ie_layers.h @@ -21,7 +21,7 @@ #include "ie_blob.h" #include "ie_common.h" #include "ie_data.h" -#include "ie_layers_property.hpp" +#include #if defined IMPLEMENT_INFERENCE_ENGINE_API || defined IMPLEMENT_INFERENCE_ENGINE_PLUGIN # define INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(...) INFERENCE_ENGINE_API_CLASS(__VA_ARGS__) diff --git a/inference-engine/src/legacy_api/include/ie_layers_internal.hpp b/inference-engine/src/legacy_api/include/legacy/ie_layers_internal.hpp similarity index 96% rename from inference-engine/src/legacy_api/include/ie_layers_internal.hpp rename to inference-engine/src/legacy_api/include/legacy/ie_layers_internal.hpp index ecbafe3..32fdf9f 100644 --- a/inference-engine/src/legacy_api/include/ie_layers_internal.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ie_layers_internal.hpp @@ -6,8 +6,8 @@ #include #include "ie_api.h" -#include "ie_layers.h" -#include "ie_util_internal.hpp" +#include +#include "legacy/ie_util_internal.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/include/ie_layers_property.hpp b/inference-engine/src/legacy_api/include/legacy/ie_layers_property.hpp similarity index 100% rename from inference-engine/src/legacy_api/include/ie_layers_property.hpp rename to inference-engine/src/legacy_api/include/legacy/ie_layers_property.hpp diff --git a/inference-engine/src/legacy_api/include/ie_ngraph_utils.hpp b/inference-engine/src/legacy_api/include/legacy/ie_ngraph_utils.hpp similarity index 100% rename from inference-engine/src/legacy_api/include/ie_ngraph_utils.hpp rename to inference-engine/src/legacy_api/include/legacy/ie_ngraph_utils.hpp diff --git a/inference-engine/src/legacy_api/include/ie_util_internal.hpp b/inference-engine/src/legacy_api/include/legacy/ie_util_internal.hpp similarity index 96% rename from inference-engine/src/legacy_api/include/ie_util_internal.hpp rename to inference-engine/src/legacy_api/include/legacy/ie_util_internal.hpp index 88f46da..2db9f4c 100644 --- a/inference-engine/src/legacy_api/include/ie_util_internal.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ie_util_internal.hpp @@ -4,11 +4,6 @@ #pragma once -#include -#include "details/ie_cnn_network_iterator.hpp" - -#include -#include #include #include #include @@ -18,6 +13,10 @@ #include #include +#include +#include +#include + namespace InferenceEngine { /** diff --git a/inference-engine/src/legacy_api/include/layer_transform.hpp b/inference-engine/src/legacy_api/include/legacy/layer_transform.hpp similarity index 99% rename from inference-engine/src/legacy_api/include/layer_transform.hpp rename to inference-engine/src/legacy_api/include/legacy/layer_transform.hpp index 0771ab5..c35fe71 100644 --- a/inference-engine/src/legacy_api/include/layer_transform.hpp +++ b/inference-engine/src/legacy_api/include/legacy/layer_transform.hpp @@ -8,7 +8,7 @@ #include #include -#include "ie_layers.h" +#include namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/include/net_pass.h b/inference-engine/src/legacy_api/include/legacy/net_pass.h similarity index 98% rename from inference-engine/src/legacy_api/include/net_pass.h rename to inference-engine/src/legacy_api/include/legacy/net_pass.h index d96e595..1c619d3 100644 --- a/inference-engine/src/legacy_api/include/net_pass.h +++ b/inference-engine/src/legacy_api/include/legacy/net_pass.h @@ -9,7 +9,7 @@ #include #include "ie_icnn_network.hpp" -#include "graph_tools.hpp" +#include "legacy/graph_tools.hpp" namespace InferenceEngine { namespace NetPass { diff --git a/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp b/inference-engine/src/legacy_api/include/legacy/shape_infer/built-in/ie_built_in_holder.hpp similarity index 96% rename from inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp rename to inference-engine/src/legacy_api/include/legacy/shape_infer/built-in/ie_built_in_holder.hpp index 55d7565..617939b 100644 --- a/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp +++ b/inference-engine/src/legacy_api/include/legacy/shape_infer/built-in/ie_built_in_holder.hpp @@ -4,17 +4,17 @@ #pragma once -#include - -#include #include #include #include #include #include +#include #include "caseless.hpp" +#include + namespace InferenceEngine { namespace ShapeInfer { diff --git a/inference-engine/src/legacy_api/src/cnn_network_impl.cpp b/inference-engine/src/legacy_api/src/cnn_network_impl.cpp index e70e9d4..708917a 100644 --- a/inference-engine/src/legacy_api/src/cnn_network_impl.cpp +++ b/inference-engine/src/legacy_api/src/cnn_network_impl.cpp @@ -2,26 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "cnn_network_impl.hpp" - -#include -#include - +#include #include #include #include #include -#include #include #include #include #include "debug.h" -#include "graph_tools.hpp" -#include "network_serializer_v7.hpp" #include "exec_graph_info.hpp" -#include "details/ie_cnn_network_tools.h" #include +#include #include "generic_ie.hpp" #include "cnn_network_ngraph_impl.hpp" @@ -30,7 +23,13 @@ #include #include #include -#include "convert_function_to_cnn_network.hpp" + +#include "legacy/convert_function_to_cnn_network.hpp" +#include "legacy/graph_tools.hpp" +#include "legacy/details/ie_cnn_network_tools.h" +#include +#include "network_serializer_v7.hpp" +#include using namespace std; using namespace InferenceEngine; diff --git a/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp b/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp index 7c80fef..44f74cd 100644 --- a/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp +++ b/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "convert_function_to_cnn_network.hpp" - #include #include #include @@ -37,16 +35,16 @@ #include "generic_ie.hpp" #include "exec_graph_info.hpp" -#include "ie_cnn_layer_builder_ngraph.h" #include "caseless.hpp" - #include #include #include "transformations/utils/utils.hpp" #include "transformations/rt_info/fused_names_attribute.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" +#include "legacy/convert_function_to_cnn_network.hpp" #include "ie_legacy_itt.hpp" +#include "ie_cnn_layer_builder_ngraph.h" namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/legacy_api/src/graph_tools.cpp b/inference-engine/src/legacy_api/src/graph_tools.cpp index 81918d6..589a458 100644 --- a/inference-engine/src/legacy_api/src/graph_tools.cpp +++ b/inference-engine/src/legacy_api/src/graph_tools.cpp @@ -2,13 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "graph_tools.hpp" - #include #include #include -#include "details/ie_cnn_network_tools.h" +#include "legacy/graph_tools.hpp" +#include "legacy/details/ie_cnn_network_tools.h" using namespace std; diff --git a/inference-engine/src/legacy_api/src/graph_transformer.cpp b/inference-engine/src/legacy_api/src/graph_transformer.cpp index 8088b8d..0a252e4 100644 --- a/inference-engine/src/legacy_api/src/graph_transformer.cpp +++ b/inference-engine/src/legacy_api/src/graph_transformer.cpp @@ -2,9 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "graph_transformer.h" - -#include #include #include @@ -15,10 +12,13 @@ #include #include +#include #include "blob_factory.hpp" -#include "cnn_network_impl.hpp" -#include "graph_tools.hpp" -#include "net_pass.h" + +#include +#include "legacy/graph_tools.hpp" +#include "legacy/net_pass.h" +#include "legacy/graph_transformer.h" using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp index e81e166..b2cd51d 100644 --- a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp +++ b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp @@ -2,22 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include - #include #include -#include -#include #include #include #include -#include "graph_tools.hpp" -#include "net_pass.h" #include "ngraph_ops/crop_ie.hpp" #include "ngraph_ops/convolution_ie.hpp" #include "ngraph_ops/deconvolution_ie.hpp" @@ -30,7 +20,6 @@ #include "ngraph_ops/lrn_ie.hpp" #include #include -#include #include "ngraph_ops/normalize_ie.hpp" #include "ngraph_ops/nms_ie.hpp" #include "ngraph_ops/onehot_ie.hpp" @@ -47,7 +36,18 @@ #include "generic_ie.hpp" #include "exec_graph_info.hpp" -#include "graph_transformer.h" +#include +#include +#include +#include +#include + +#include +#include "legacy/graph_transformer.h" +#include "legacy/graph_tools.hpp" +#include "legacy/net_pass.h" +#include +#include namespace InferenceEngine { namespace Builder { diff --git a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h index d0aaf3c..0f6b9fe 100644 --- a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h +++ b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h @@ -4,20 +4,21 @@ #pragma once -#include -#include -#include - #include #include -#include -#include #include #include #include +#include +#include + +#include +#include #include "blob_factory.hpp" -#include "ie_ngraph_utils.hpp" + +#include +#include namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/ie_layer_validators.cpp b/inference-engine/src/legacy_api/src/ie_layer_validators.cpp index 56a3c01..11e9633 100644 --- a/inference-engine/src/legacy_api/src/ie_layer_validators.cpp +++ b/inference-engine/src/legacy_api/src/ie_layer_validators.cpp @@ -2,12 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_layer_validators.hpp" - -#include - #include -#include
#include #include #include @@ -15,10 +10,13 @@ #include #include +#include #include "debug.h" -#include "ie_layers.h" #include "xml_parse_utils.h" +#include +#include "ie_layer_validators.hpp" + #ifdef __clang__ #pragma clang diagnostic ignored "-Wunused-variable" #endif diff --git a/inference-engine/src/legacy_api/src/ie_layer_validators.hpp b/inference-engine/src/legacy_api/src/ie_layer_validators.hpp index a7ab5b6..4b28e58 100644 --- a/inference-engine/src/legacy_api/src/ie_layer_validators.hpp +++ b/inference-engine/src/legacy_api/src/ie_layer_validators.hpp @@ -10,7 +10,7 @@ #include #include "caseless.hpp" -#include "ie_layers.h" +#include namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/legacy_api/src/ie_layers.cpp b/inference-engine/src/legacy_api/src/ie_layers.cpp index f0c6fee..55d0c88 100644 --- a/inference-engine/src/legacy_api/src/ie_layers.cpp +++ b/inference-engine/src/legacy_api/src/ie_layers.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include using namespace InferenceEngine; diff --git a/inference-engine/src/legacy_api/src/ie_layers_internal.cpp b/inference-engine/src/legacy_api/src/ie_layers_internal.cpp index a88d944..1a5ceaa 100644 --- a/inference-engine/src/legacy_api/src/ie_layers_internal.cpp +++ b/inference-engine/src/legacy_api/src/ie_layers_internal.cpp @@ -2,10 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_layers_internal.hpp" - -#include - +#include #include #include #include @@ -14,7 +11,8 @@ #include #include -#include "layer_transform.hpp" +#include +#include "legacy/ie_layers_internal.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/ie_util_internal.cpp b/inference-engine/src/legacy_api/src/ie_util_internal.cpp index 846efef..d9c8367 100644 --- a/inference-engine/src/legacy_api/src/ie_util_internal.cpp +++ b/inference-engine/src/legacy_api/src/ie_util_internal.cpp @@ -2,11 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ie_util_internal.hpp" -#include "details/ie_cnn_network_iterator.hpp" - -#include - #include #include #include @@ -18,12 +13,15 @@ #include #include "caseless.hpp" -#include "details/ie_cnn_network_tools.h" -#include "graph_tools.hpp" -#include "net_pass.h" #include "precision_utils.h" #include "cnn_network_ngraph_impl.hpp" +#include "legacy/ie_util_internal.hpp" +#include "legacy/details/ie_cnn_network_tools.h" +#include "legacy/graph_tools.hpp" +#include "legacy/net_pass.h" +#include +#include #include "ie_legacy_itt.hpp" using std::string; diff --git a/inference-engine/src/legacy_api/src/layer_transform.cpp b/inference-engine/src/legacy_api/src/layer_transform.cpp index 294d574..5775125 100644 --- a/inference-engine/src/legacy_api/src/layer_transform.cpp +++ b/inference-engine/src/legacy_api/src/layer_transform.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/net_pass.cpp b/inference-engine/src/legacy_api/src/net_pass.cpp index 90ee5a7..9791218 100644 --- a/inference-engine/src/legacy_api/src/net_pass.cpp +++ b/inference-engine/src/legacy_api/src/net_pass.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "net_pass.h" +#include "legacy/net_pass.h" #include #include @@ -16,11 +16,11 @@ #include #include "blob_factory.hpp" -#include "details/ie_cnn_network_tools.h" -#include "cnn_network_impl.hpp" +#include "legacy/details/ie_cnn_network_tools.h" +#include #include "cnn_network_ngraph_impl.hpp" -#include "graph_tools.hpp" -#include "ie_layers_internal.hpp" +#include "legacy/graph_tools.hpp" +#include "legacy/ie_layers_internal.hpp" #include "ie_memcpy.h" #include "precision_utils.h" diff --git a/inference-engine/src/legacy_api/src/network_serializer_v7.cpp b/inference-engine/src/legacy_api/src/network_serializer_v7.cpp index a2c90e6..4673a87 100644 --- a/inference-engine/src/legacy_api/src/network_serializer_v7.cpp +++ b/inference-engine/src/legacy_api/src/network_serializer_v7.cpp @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "network_serializer_v7.hpp" - #include #include #include @@ -14,6 +12,7 @@ #include #include "xml_parse_utils.h" +#include "network_serializer_v7.hpp" namespace InferenceEngine { namespace Serialization { diff --git a/inference-engine/src/legacy_api/src/network_serializer_v7.hpp b/inference-engine/src/legacy_api/src/network_serializer_v7.hpp index 5dc0885..2dea9af 100644 --- a/inference-engine/src/legacy_api/src/network_serializer_v7.hpp +++ b/inference-engine/src/legacy_api/src/network_serializer_v7.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_argmax_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_argmax_shape_infer.hpp index 9884bac..606a50d 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_argmax_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_argmax_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_holder.cpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_holder.cpp index 1380a35..f2119b6 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_holder.cpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_holder.cpp @@ -2,12 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shape_infer/built-in/ie_built_in_holder.hpp" - #include #include #include +#include "legacy/shape_infer/built-in/ie_built_in_holder.hpp" #include "ie_argmax_shape_infer.hpp" #include "ie_bin_conv_shape_infer.hpp" #include "ie_broadcast_shape_infer.hpp" diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp index 80e0dd9..695bfe8 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detection_output_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detection_output_shape_infer.hpp index 019deff..5bb0d0b 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detection_output_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detection_output_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_flatten_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_flatten_shape_infer.hpp index 9d88c54..44cc2f2 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_flatten_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_flatten_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_interp_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_interp_shape_infer.hpp index f7ffa36..21498d5 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_interp_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_interp_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_permute_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_permute_shape_infer.hpp index 9a8a1bf..7d3737c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_permute_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_permute_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_clustered_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_clustered_shape_infer.hpp index bbcd676..5348f8b 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_clustered_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_clustered_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_shape_infer.hpp index ff49b76..027d9bc 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_psroi_pooling_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_psroi_pooling_shape_infer.hpp index 8010a49..5813e69 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_psroi_pooling_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_psroi_pooling_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_region_yolo_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_region_yolo_shape_infer.hpp index 381f04a..6613721 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_region_yolo_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_region_yolo_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reorg_yolo_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reorg_yolo_shape_infer.hpp index 7113e6f..bc1a50c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reorg_yolo_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reorg_yolo_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_resample_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_resample_shape_infer.hpp index d3ddf0b..964701c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_resample_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_resample_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reshape_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reshape_shape_infer.hpp index b0ba411..f09b308 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reshape_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reshape_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp index 402741d..6a648a4 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_simpler_nms_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_simpler_nms_shape_infer.hpp index d8f3116..2c74198 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_simpler_nms_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_simpler_nms_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp index 169296a..e858221 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_upsampling_shape_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_upsampling_shape_infer.hpp index 3ecbff3..17c9d43 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_upsampling_shape_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_upsampling_shape_infer.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/impl_register.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/impl_register.hpp index a1ae217..a8cd489 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/built-in/impl_register.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/impl_register.hpp @@ -7,7 +7,7 @@ #include #include -#include "shape_infer/built-in/ie_built_in_holder.hpp" +#include "legacy/shape_infer/built-in/ie_built_in_holder.hpp" namespace InferenceEngine { namespace ShapeInfer { diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/broadcast_offset.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/broadcast_offset.hpp index 955437a..336af17 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/broadcast_offset.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/broadcast_offset.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_add_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_add_const_infer.hpp index 8b71d05..6e08ff4 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_add_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_add_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_broadcast_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_broadcast_const_infer.hpp index 7d59603..f24e9fd 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_broadcast_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_broadcast_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_concat_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_concat_const_infer.hpp index 819276d..1ac37d3 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_concat_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_concat_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_const_infer.hpp index f8abe32..7301576 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_convert_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_convert_const_infer.hpp index 76cda03..e0eb229 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_convert_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_convert_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_div_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_div_const_infer.hpp index 7f86d0d..0796486 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_div_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_div_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_eltw_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_eltw_const_infer.hpp index 74a272b..a067719 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_eltw_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_eltw_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_fill_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_fill_const_infer.hpp index 276985a..0c95c7e 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_fill_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_fill_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_gather_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_gather_const_infer.hpp index 2c024c0..7767bbb 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_gather_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_gather_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_in_place_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_in_place_const_infer.hpp index aa11c19..51067a6 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_in_place_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_in_place_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_mul_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_mul_const_infer.hpp index ff20cbb..7664a98 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_mul_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_mul_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_onehot_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_onehot_const_infer.hpp index d76c40c..16f7421 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_onehot_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_onehot_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_permute_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_permute_const_infer.hpp index 9a91955..5304358 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_permute_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_permute_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_pow_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_pow_const_infer.hpp index 04432b5..97f74ae 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_pow_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_pow_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_power_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_power_const_infer.hpp index a200c58..7a8a0d2 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_power_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_power_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_range_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_range_const_infer.hpp index b68ca8b..447205a 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_range_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_range_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reduce_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reduce_const_infer.hpp index f3f4dc2..5a2795b 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reduce_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reduce_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reshape_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reshape_const_infer.hpp index 560c582..b9f4703 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reshape_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reshape_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_shape_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_shape_const_infer.hpp index 64fb9f0..d8025d7 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_shape_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_shape_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_split_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_split_const_infer.hpp index 1b93afb..402ec46 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_split_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_split_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_strided_slice_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_strided_slice_const_infer.hpp index 3bab18f..f2f855c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_strided_slice_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_strided_slice_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_sub_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_sub_const_infer.hpp index e230e7c..5a7b046 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_sub_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_sub_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_tile_const_infer.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_tile_const_infer.hpp index a9f2a4a..a3296ca 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_tile_const_infer.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_tile_const_infer.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.cpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.cpp index d615549..41ea15c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.cpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shape_infer/ie_reshape_io_controllers.hpp" - -#include - -#include -#include #include #include #include +#include + +#include +#include +#include "shape_infer/ie_reshape_io_controllers.hpp" + using namespace InferenceEngine; using namespace ShapeInfer; diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.hpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.hpp index 9db0c59..138501d 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include #include #include @@ -13,8 +11,10 @@ #include #include -#include "ie_reshape_launcher.hpp" -#include "shape_infer/built-in/ie_built_in_holder.hpp" +#include "shape_infer/ie_reshape_launcher.hpp" + +#include "legacy/shape_infer/built-in/ie_built_in_holder.hpp" +#include namespace InferenceEngine { namespace ShapeInfer { diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.cpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.cpp index a4ab183..5823988 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.cpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.cpp @@ -2,23 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shape_infer/ie_reshape_launcher.hpp" - -#include -#include - -#include
-#include #include #include #include -#include #include #include -#include "built-in/ie_tensor_iterator_shape_infer.hpp" -#include "ie_reshape_launcher.hpp" +#include +#include
+ +#include #include "shape_infer/ie_reshape_io_controllers.hpp" +#include +#include "shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp" +#include "ie_layer_validators.hpp" +#include "shape_infer/ie_reshape_launcher.hpp" +#include "ie_reshape_launcher.hpp" using namespace InferenceEngine; using namespace ShapeInfer; diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.hpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.hpp index c109568..681435c 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include #include #include @@ -13,7 +11,8 @@ #include #include -#include "shape_infer/built-in/ie_built_in_holder.hpp" +#include +#include "legacy/shape_infer/built-in/ie_built_in_holder.hpp" #include "shape_infer/const_infer/ie_const_infer_impl.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp index d9cf515..96d6e92 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp @@ -2,14 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shape_infer/ie_reshaper.hpp" - -#include -#include - -#include #include -#include #include #include #include @@ -17,9 +10,14 @@ #include #include -#include "details/ie_cnn_network_tools.h" -#include "ie_reshaper.hpp" -#include "shape_infer/built-in/ie_built_in_holder.hpp" +#include +#include + +#include +#include +#include "legacy/details/ie_cnn_network_tools.h" +#include "legacy/shape_infer/built-in/ie_built_in_holder.hpp" +#include "shape_infer/ie_reshaper.hpp" using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp index f7b4fb5..32787ef 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include #include #include @@ -13,9 +11,11 @@ #include #include -#include "ie_ishape_infer_extension.hpp" #include "caseless.hpp" #include "ie_icnn_network.hpp" + +#include +#include #include "ie_reshape_launcher.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/common/ie_lpt_exception.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/common/ie_lpt_exception.hpp index 8ff2f8e..92a294b 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/common/ie_lpt_exception.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/common/ie_lpt_exception.hpp @@ -6,7 +6,7 @@ #include "details/ie_exception.hpp" #include -#include "ie_layers.h" +#include /** * @def THROW_IE_EXCEPTION_LPT diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/depth_to_space.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/depth_to_space.hpp index d3cbd4c..2fa7f2a 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/depth_to_space.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/depth_to_space.hpp @@ -6,7 +6,7 @@ #include -#include "ie_layers.h" +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/transparent_base_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/ilayer_transformations_manager.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/ilayer_transformations_manager.hpp index a699b55..b45db9d 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/ilayer_transformations_manager.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/ilayer_transformations_manager.hpp @@ -10,7 +10,7 @@ #include #include -#include "ie_layers.h" +#include namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/network_helper.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/network_helper.hpp index b1c8485..732e2a4 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/network_helper.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/network_helper.hpp @@ -10,8 +10,8 @@ #include #include -#include "ie_layers.h" -#include "cnn_network_impl.hpp" +#include +#include #include "low_precision_transformations/common/dequantization_details.hpp" #include "low_precision_transformations/transformation_context.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/normalize.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/normalize.hpp index e68b019..b6cab3b 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/normalize.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/normalize.hpp @@ -4,7 +4,7 @@ #pragma once -#include "ie_layers.h" +#include #include "low_precision_transformations/layer_transformation.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/permute.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/permute.hpp index 77828b7..5f16e83 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/permute.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/permute.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/layer_transformation.hpp" #include "low_precision_transformations/transparent_base_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/pooling.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/pooling.hpp index 1277186..59f4879 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/pooling.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/pooling.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "ie_layers.h" +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/layer_transformation.hpp" #include "low_precision_transformations/transparent_base_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/power.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/power.hpp index b7edd02..8489c20 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/power.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/power.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "ie_layers.h" +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/layer_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp index 30c4976..cb84c51 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace InferenceEngine { diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/reshape.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/reshape.hpp index 5412a4e..e959ff2 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/reshape.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/reshape.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "ie_layers.h" +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/layer_transformation.hpp" #include "low_precision_transformations/transparent_base_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/squeeze.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/squeeze.hpp index ed07036..53c3aca 100644 --- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/squeeze.hpp +++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/squeeze.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "ie_layers.h" +#include #include "low_precision_transformations/transformation_context.hpp" #include "low_precision_transformations/layer_transformation.hpp" #include "low_precision_transformations/transparent_base_transformation.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp b/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp index 7ceefb6..81c9ec2 100644 --- a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp +++ b/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp @@ -4,7 +4,7 @@ #include "low_precision_transformations/blob_transformation.hpp" #include "low_precision_transformations/network_helper.hpp" -#include "details/ie_cnn_network_tools.h" +#include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/concat.cpp b/inference-engine/src/low_precision_transformations/src/concat.cpp index d00372f..b883af8 100644 --- a/inference-engine/src/low_precision_transformations/src/concat.cpp +++ b/inference-engine/src/low_precision_transformations/src/concat.cpp @@ -16,8 +16,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/quantization_details.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp b/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp index bd088cc..582c864 100644 --- a/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp +++ b/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp @@ -15,8 +15,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/const.cpp b/inference-engine/src/low_precision_transformations/src/const.cpp index 234a6d4..3c83f47 100644 --- a/inference-engine/src/low_precision_transformations/src/const.cpp +++ b/inference-engine/src/low_precision_transformations/src/const.cpp @@ -18,8 +18,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp index a4431f0..434d0aa 100644 --- a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp +++ b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp @@ -15,8 +15,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/low_precision_transformations/src/eltwise.cpp b/inference-engine/src/low_precision_transformations/src/eltwise.cpp index c1a5f9d..68e8079 100644 --- a/inference-engine/src/low_precision_transformations/src/eltwise.cpp +++ b/inference-engine/src/low_precision_transformations/src/eltwise.cpp @@ -14,7 +14,7 @@ #include #include -#include "ie_util_internal.hpp" +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp b/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp index 8be26b3..6113f3b 100644 --- a/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp +++ b/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp @@ -17,8 +17,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/fully_connected.cpp b/inference-engine/src/low_precision_transformations/src/fully_connected.cpp index 4eb4b43..dcaa789 100644 --- a/inference-engine/src/low_precision_transformations/src/fully_connected.cpp +++ b/inference-engine/src/low_precision_transformations/src/fully_connected.cpp @@ -16,8 +16,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/gemm.cpp b/inference-engine/src/low_precision_transformations/src/gemm.cpp index 199610a..a7a1803 100644 --- a/inference-engine/src/low_precision_transformations/src/gemm.cpp +++ b/inference-engine/src/low_precision_transformations/src/gemm.cpp @@ -16,8 +16,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp index a19469c..34178eb 100644 --- a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp +++ b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp @@ -18,8 +18,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/low_precision_transformations/src/network_helper.cpp b/inference-engine/src/low_precision_transformations/src/network_helper.cpp index a2348b8..328ba16 100644 --- a/inference-engine/src/low_precision_transformations/src/network_helper.cpp +++ b/inference-engine/src/low_precision_transformations/src/network_helper.cpp @@ -16,11 +16,11 @@ #include #include -#include
+#include #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "ie_parallel.hpp" #include "low_precision_transformations/common/ie_lpt_exception.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp index c8d40f2..7822ffb 100644 --- a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp +++ b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp @@ -17,8 +17,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/transformation_context.cpp b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp index 2c29faa..c1e02ae 100644 --- a/inference-engine/src/low_precision_transformations/src/transformation_context.cpp +++ b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp @@ -3,8 +3,8 @@ // #include "low_precision_transformations/transformation_context.hpp" -#include "details/ie_cnn_network_iterator.hpp" -#include "details/ie_cnn_network_tools.h" +#include +#include using namespace InferenceEngine; using namespace InferenceEngine::details; diff --git a/inference-engine/src/low_precision_transformations/src/transformer.cpp b/inference-engine/src/low_precision_transformations/src/transformer.cpp index 1be1a97..48e3f8f 100644 --- a/inference-engine/src/low_precision_transformations/src/transformer.cpp +++ b/inference-engine/src/low_precision_transformations/src/transformer.cpp @@ -20,8 +20,8 @@ #include #include -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" +#include +#include #include "low_precision_transformations/activation.hpp" #include "low_precision_transformations/concat_multi_channels.hpp" diff --git a/inference-engine/src/mkldnn_plugin/bf16transformer.cpp b/inference-engine/src/mkldnn_plugin/bf16transformer.cpp index 8ae6991..c9784c1 100644 --- a/inference-engine/src/mkldnn_plugin/bf16transformer.cpp +++ b/inference-engine/src/mkldnn_plugin/bf16transformer.cpp @@ -9,8 +9,8 @@ #include #include #include -#include "details/ie_cnn_network_tools.h" -#include "ie_util_internal.hpp" +#include +#include #include "ngraph/type/bfloat16.hpp" using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp index 6143e8d..1766ff5 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "mkldnn_exec_network.h" #include "mkldnn_async_infer_request.h" @@ -12,8 +12,8 @@ #include "mkldnn_memory_state.h" #include "mkldnn_itt.h" #include "bf16transformer.h" -#include -#include +#include +#include #include #include "low_precision_transformations/convolution.hpp" #include "low_precision_transformations/eltwise.hpp" diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h b/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h index dba0eeb..1a0ddfd 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h +++ b/inference-engine/src/mkldnn_plugin/mkldnn_exec_network.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include namespace MKLDNNPlugin { diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h b/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h index fdc34bc..46d236c 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h +++ b/inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h @@ -8,8 +8,8 @@ #include #include #include -#include -#include "ie_ishape_infer_extension.hpp" +#include +#include #include "nodes/list.hpp" namespace MKLDNNPlugin { diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp index 0ddc25b..478a773 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp @@ -23,11 +23,11 @@ #include #include -#include +#include #include #include -#include -#include
+#include +#include #include #include "precision_utils.h" diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp index 2794c9a..936a963 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_graph_dumper.cpp @@ -3,9 +3,9 @@ // #include "mkldnn_graph_dumper.h" -#include "cnn_network_impl.hpp" -#include "ie_util_internal.hpp" -#include "ie_ngraph_utils.hpp" +#include +#include +#include #include "exec_graph_info.hpp" #include "mkldnn_debug.h" #include "generic_ie.hpp" diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp index e2d1029..d768902 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_graph_optimizer.cpp @@ -19,7 +19,7 @@ #include "nodes/mkldnn_resample_node.h" #include -#include +#include // WA for xbyak.h #ifdef _WIN32 diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.h b/inference-engine/src/mkldnn_plugin/mkldnn_node.h index 9f16a3b..ce2a8f9 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_node.h +++ b/inference-engine/src/mkldnn_plugin/mkldnn_node.h @@ -12,7 +12,6 @@ #include #include #include -#include #include "mkldnn_dims.h" #include "mkldnn_memory.h" #include "mkldnn_edge.h" diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp index dbfb3b3..ba0b006 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp @@ -8,7 +8,7 @@ #include "mkldnn_weights_cache.hpp" #include "mkldnn_itt.h" -#include +#include #include #include #include @@ -18,11 +18,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include -#include "convert_function_to_cnn_network.hpp" +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/base.hpp b/inference-engine/src/mkldnn_plugin/nodes/base.hpp index 3f17db3..6c7732b 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/base.hpp +++ b/inference-engine/src/mkldnn_plugin/nodes/base.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "ie_util_internal.hpp" +#include #include "nodes/list.hpp" #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/list.hpp b/inference-engine/src/mkldnn_plugin/nodes/list.hpp index a58ca3e..c6ba1d1 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/list.hpp +++ b/inference-engine/src/mkldnn_plugin/nodes/list.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp index 9b214d0..be4d81a 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_activation_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp index 71938d0..e92a898 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_bin_conv_node.cpp @@ -11,12 +11,12 @@ #include "mkldnn_depthwise_node.h" #include "mkldnn_quantize_node.h" #include "mkldnn_conv_node.h" -#include +#include #include #include #include #include -#include +#include // WA for xbyak.h #ifdef _WIN32 diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp index 56f43ab..6c4ea1f 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_concat_node.cpp @@ -10,7 +10,7 @@ #include #include "details/ie_exception.hpp" -#include "ie_layers.h" +#include #include "mkldnn.hpp" #include "mkldnn/iml_type_mapper.h" #include "mkldnn_dims.h" diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp index 4435e00..83d4862 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp @@ -12,12 +12,12 @@ #include "mkldnn_quantize_node.h" #include "mkldnn_pooling_node.h" #include "mkldnn_concat_node.h" -#include +#include #include #include #include #include -#include +#include using namespace mkldnn; using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_crop_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_crop_node.cpp index 6146918..393d609 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_crop_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_crop_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_crop_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp index c89435c..c9083b2 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp @@ -4,13 +4,13 @@ #include "mkldnn_deconv_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include #include #include -#include +#include #include "ie_parallel.hpp" using namespace mkldnn; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp index 419bde3..936df9a 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_def_conv_node.cpp @@ -9,12 +9,12 @@ #include "desc_iterator.hpp" #include "mkldnn_eltwise_node.h" #include "mkldnn_depthwise_node.h" -#include +#include #include #include #include #include -#include +#include using namespace mkldnn; using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp index 124f14b..5442f03 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_depthwise_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp index 50ec7d6..7f36301 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_eltwise_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp index 49484eb..8d0b13d 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_fullyconnected_node.cpp @@ -7,7 +7,7 @@ #include "mkldnn_depthwise_node.h" #include "mkldnn_quantize_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gemm_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gemm_node.cpp index 8080fe2..2ee3523 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gemm_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_gemm_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_gemm_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h index 67559d6..2ed9432 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h @@ -11,7 +11,7 @@ #include #include #include -#include "ie_ishape_infer_extension.hpp" +#include namespace MKLDNNPlugin { diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp index 9d12f7a..73d5060 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_lrn_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_lrn_node.h" #include "desc_iterator.hpp" -#include +#include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp index 0566c23..99e89c0 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_mvn_node.cpp @@ -7,13 +7,13 @@ #include "mkldnn_quantize_node.h" #include "mkldnn_depthwise_node.h" #include "mkldnn_activation_node.h" -#include +#include #include #include #include #include #include -#include +#include #include "ie_parallel.hpp" #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp index 4c6f3c0..16aca33 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_normalize_node.cpp @@ -6,7 +6,7 @@ #include "mkldnn_depthwise_node.h" #include "mkldnn_activation_node.h" #include -#include +#include #include "ie_parallel.hpp" #include "jit_uni_eltwise.hpp" #include "jit_uni_depthwise.hpp" diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_permute_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_permute_node.cpp index 74ada08..82d1514 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_permute_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_permute_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_permute_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp index 33f292c..6c597e3 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_pooling_node.cpp @@ -7,13 +7,13 @@ #include "mkldnn_quantize_node.h" #include "mkldnn_conv_node.h" #include "mkldnn_concat_node.h" -#include +#include #include #include #include #include #include -#include +#include using namespace mkldnn; using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_power_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_power_node.cpp index d9bf6b7..c2885b6 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_power_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_power_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_power_node.h" -#include "ie_layers.h" +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp index 73a58fd..96606c7 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_quantize_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_resample_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_resample_node.cpp index 9e0492d..ebe496d 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_resample_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_resample_node.cpp @@ -7,13 +7,13 @@ #include "mkldnn_quantize_node.h" #include "mkldnn_depthwise_node.h" #include "mkldnn_activation_node.h" -#include +#include #include #include #include #include #include -#include +#include #include "ie_parallel.hpp" #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp index 03815d5..535044e 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_reshape_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_reshape_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp index 039cf4a..fafb5c8 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_roi_pooling_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_roi_pooling_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp index 5892b68..0000e1b 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_scatter_update_node.cpp @@ -7,13 +7,13 @@ #include "mkldnn_quantize_node.h" #include "mkldnn_depthwise_node.h" #include "mkldnn_activation_node.h" -#include +#include #include #include #include #include #include -#include +#include #include "ie_parallel.hpp" #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp index 7934624..fa93bb5 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_softmax_node.cpp @@ -4,7 +4,7 @@ #include "mkldnn_softmax_node.h" #include "desc_iterator.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp index 6311841..c5b8831 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_split_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_split_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp index 9a8fce6..95bbd38 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp @@ -4,15 +4,15 @@ #include "mkldnn_tensoriterator_node.h" #include "desc_iterator.hpp" -#include -#include +#include +#include #include #include #include #include #include #include -#include "graph_transformer.h" +#include using namespace mkldnn; using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp index 9d4dee2..23de597 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tile_node.cpp @@ -3,7 +3,7 @@ // #include "mkldnn_tile_node.h" -#include +#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/reduce.cpp b/inference-engine/src/mkldnn_plugin/nodes/reduce.cpp index 951719f..869732d 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/reduce.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/reduce.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "ie_parallel.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/multi_device/multi_device.cpp b/inference-engine/src/multi_device/multi_device.cpp index 242e1ee..fbbc29e 100644 --- a/inference-engine/src/multi_device/multi_device.cpp +++ b/inference-engine/src/multi_device/multi_device.cpp @@ -13,7 +13,7 @@ #include #include "ie_metric_helpers.hpp" -#include +#include #include #include #include diff --git a/inference-engine/src/plugin_api/generic_ie.hpp b/inference-engine/src/plugin_api/generic_ie.hpp index 0bb1928..f74725a 100644 --- a/inference-engine/src/plugin_api/generic_ie.hpp +++ b/inference-engine/src/plugin_api/generic_ie.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp b/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp index ebc4890..0f21d2f 100644 --- a/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp +++ b/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp @@ -28,7 +28,7 @@ #include #include "ie_blob_stream.hpp" #include "caseless.hpp" -#include "ie_ngraph_utils.hpp" +#include #include "generic_ie.hpp" #include "precision_utils.h" #include "blob_factory.hpp" diff --git a/inference-engine/src/readers/ir_reader/ie_ir_parser.hpp b/inference-engine/src/readers/ir_reader/ie_ir_parser.hpp index ebbfefe..9517150 100644 --- a/inference-engine/src/readers/ir_reader/ie_ir_parser.hpp +++ b/inference-engine/src/readers/ir_reader/ie_ir_parser.hpp @@ -6,7 +6,7 @@ #ifdef IR_READER_V10 # include -# include +# include #endif // IR_READER_V10 #include diff --git a/inference-engine/src/readers/ir_reader_v7/ie_cnn_net_reader_impl.h b/inference-engine/src/readers/ir_reader_v7/ie_cnn_net_reader_impl.h index d57c384..7bcf4f0 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_cnn_net_reader_impl.h +++ b/inference-engine/src/readers/ir_reader_v7/ie_cnn_net_reader_impl.h @@ -10,10 +10,10 @@ #include #include -#include "cnn_network_impl.hpp" +#include #include "ie_memcpy.h" #include "parsers.h" -#include "ie_util_internal.hpp" +#include namespace pugi { class xml_node; diff --git a/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h b/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h index 5d30481..11a905f 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h +++ b/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h @@ -9,9 +9,9 @@ #include #include -#include "cnn_network_impl.hpp" +#include #include "caseless.hpp" -#include "ie_layers.h" +#include #include "parsers.h" namespace InferenceEngine { diff --git a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.cpp b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.cpp index b202058..cae6bd1 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.cpp +++ b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.cpp @@ -16,7 +16,7 @@ #include #include "debug.h" -#include "ie_layers.h" +#include #include "xml_parse_utils.h" #ifdef __clang__ diff --git a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp index 3111425..2c16e02 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp +++ b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp @@ -10,7 +10,7 @@ #include #include "caseless.hpp" -#include "ie_layers.h" +#include namespace InferenceEngine { namespace details { diff --git a/inference-engine/src/readers/ir_reader_v7/parsers.h b/inference-engine/src/readers/ir_reader_v7/parsers.h index 8836f65..ce6bc3a 100644 --- a/inference-engine/src/readers/ir_reader_v7/parsers.h +++ b/inference-engine/src/readers/ir_reader_v7/parsers.h @@ -6,7 +6,7 @@ #include -#include "cnn_network_impl.hpp" +#include namespace pugi { class xml_node; diff --git a/inference-engine/src/vpu/common/include/vpu/utils/ie_helpers.hpp b/inference-engine/src/vpu/common/include/vpu/utils/ie_helpers.hpp index 1564bab..48f658e 100644 --- a/inference-engine/src/vpu/common/include/vpu/utils/ie_helpers.hpp +++ b/inference-engine/src/vpu/common/include/vpu/utils/ie_helpers.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/backend/backend.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/backend/backend.hpp index 371504a..df0d086 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/backend/backend.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/backend/backend.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp index 748eac1..3f215f2 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp index aec7fcf..f28179a 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/model/stage.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/model/stage.hpp index 33ce129..0595524 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/model/stage.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/model/stage.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/stage_builder.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/stage_builder.hpp index 29fb772..abd68f0 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/stage_builder.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/stage_builder.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp index 78b957a..5821085 100644 --- a/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp index 9ef285a..e4ddadf 100644 --- a/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp index 6361638..fc83a4e 100644 --- a/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp index c201cd6..46fb2c8 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp @@ -10,9 +10,9 @@ #include #include -#include
+#include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp index 55db1ff..a64da5e 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp @@ -7,7 +7,7 @@ #include "vpu/compile_env.hpp" #include "vpu/model/data_contents/ie_blob_content.hpp" -#include "net_pass.h" +#include #include #include @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp index 34a502a..9e6c004 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp @@ -6,7 +6,7 @@ #include -#include
+#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/remove_const_layers.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/remove_const_layers.cpp index 99a14a1..5b95a97 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/remove_const_layers.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/remove_const_layers.cpp @@ -4,9 +4,9 @@ #include "vpu/frontend/frontend.hpp" #include "vpu/compile_env.hpp" -#include "graph_transformer.h" +#include -#include "cnn_network_impl.hpp" +#include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp index 32fbc84..e84a265 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp @@ -6,8 +6,8 @@ #include -#include -#include
+#include +#include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp b/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp index e70cf17..8bb8647 100644 --- a/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp @@ -27,10 +27,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/model/data_contents/priorbox_contents.cpp b/inference-engine/src/vpu/graph_transformer/src/model/data_contents/priorbox_contents.cpp index 94f8162..d2dadac 100644 --- a/inference-engine/src/vpu/graph_transformer/src/model/data_contents/priorbox_contents.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/model/data_contents/priorbox_contents.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/convolution.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/convolution.cpp index 1f8878e..da37a56 100644 --- a/inference-engine/src/vpu/graph_transformer/src/stages/convolution.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/stages/convolution.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/deconvolution.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/deconvolution.cpp index fb91b5f..160a0fc 100644 --- a/inference-engine/src/vpu/graph_transformer/src/stages/deconvolution.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/stages/deconvolution.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/pooling.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/pooling.cpp index 11b3673..5090530 100644 --- a/inference-engine/src/vpu/graph_transformer/src/stages/pooling.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/stages/pooling.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/tensor_iterator.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/tensor_iterator.cpp index 042dcab..c242620 100644 --- a/inference-engine/src/vpu/graph_transformer/src/stages/tensor_iterator.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/stages/tensor_iterator.cpp @@ -6,11 +6,11 @@ #include "vpu/stages/iteration_rule.hpp" #include "vpu/utils/auto_scope.hpp" #include "vpu/compile_env.hpp" -#include "graph_transformer.h" +#include #include "vpu/model/data_contents/ie_blob_content.hpp" -#include "ie_layers_internal.hpp" -#include "net_pass.h" +#include +#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/utils/runtime_graph.cpp b/inference-engine/src/vpu/graph_transformer/src/utils/runtime_graph.cpp index 8cab360..48f2eea 100644 --- a/inference-engine/src/vpu/graph_transformer/src/utils/runtime_graph.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/utils/runtime_graph.cpp @@ -4,7 +4,7 @@ #include "vpu/utils/runtime_graph.hpp" -#include +#include #include #include diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp index 3652e26..8e23ed4 100644 --- a/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp +++ b/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp @@ -6,13 +6,13 @@ #include #include -#include "cnn_network_impl.hpp" +#include #include "exec_graph_info.hpp" #include #include #include #include -#include +#include #include using namespace InferenceEngine; diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp index 5153212..eaf9e5c 100644 --- a/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp +++ b/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp b/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp index 1b5675b..777e2c9 100644 --- a/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp @@ -4,8 +4,8 @@ #include -#include -#include
+#include +#include #include #include #include @@ -13,10 +13,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/cnn_network/convert_ngraph_to_cnn_network_tests.cpp b/inference-engine/tests/functional/inference_engine/cnn_network/convert_ngraph_to_cnn_network_tests.cpp index c5bf817..9b49106 100644 --- a/inference-engine/tests/functional/inference_engine/cnn_network/convert_ngraph_to_cnn_network_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/cnn_network/convert_ngraph_to_cnn_network_tests.cpp @@ -5,7 +5,7 @@ #include #include -#include // deprecated API +#include // deprecated API #include #include diff --git a/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp b/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp index 70bf576..8a53c62 100644 --- a/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/keep_constant_inputs_tests.cpp @@ -4,7 +4,7 @@ #include #include -#include // deprecated API +#include // deprecated API #include #include @@ -14,7 +14,7 @@ #include #include #include "ngraph_functions/subgraph_builders.hpp" -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/local_test.cpp b/inference-engine/tests/functional/inference_engine/local_test.cpp index da9419b..26bf785 100644 --- a/inference-engine/tests/functional/inference_engine/local_test.cpp +++ b/inference-engine/tests/functional/inference_engine/local_test.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "common_test_utils/common_utils.hpp" using namespace ::testing; diff --git a/inference-engine/tests/functional/inference_engine/net_reader_test.cpp b/inference-engine/tests/functional/inference_engine/net_reader_test.cpp index e9392ae..f9c4c0e 100644 --- a/inference-engine/tests/functional/inference_engine/net_reader_test.cpp +++ b/inference-engine/tests/functional/inference_engine/net_reader_test.cpp @@ -8,7 +8,7 @@ #include #include -#include "details/ie_cnn_network_tools.h" +#include #include "common_test_utils/test_common.hpp" #include "common_test_utils/unicode_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp index a81d0c1..f99591f 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp @@ -9,7 +9,7 @@ #include #include -#include
+#include #include "common_test_utils/test_common.hpp" #include "common_test_utils/file_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp index f02993e..8600e16 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include "common_test_utils/test_common.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/primitives_priority_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/primitives_priority_test.cpp index e1b4e56..9ae1bec 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/primitives_priority_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/primitives_priority_test.cpp @@ -17,8 +17,8 @@ #include #include #include -#include // deprecated API -#include // deprecated API +#include // deprecated API +#include // deprecated API #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp index 26ca459..99128d4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp @@ -12,9 +12,9 @@ #include #include "generic_ie.hpp" -#include -#include "graph_transformer.h" -#include "convert_function_to_cnn_network.hpp" +#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ #include "ngraph_functions/pass/convert_prc.hpp" #include "common_test_utils/common_utils.hpp" -#include "ie_util_internal.hpp" +#include #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/layer_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp index 2a105b4..d6e5668 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/layer_transformation.cpp @@ -12,9 +12,9 @@ #include #include "generic_ie.hpp" -#include -#include "graph_transformer.h" -#include "convert_function_to_cnn_network.hpp" +#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ #include "ngraph_functions/pass/convert_prc.hpp" #include "common_test_utils/common_utils.hpp" -#include "ie_util_internal.hpp" +#include #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/layer_test_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp index 9b137dd..b2e209e 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp @@ -8,12 +8,12 @@ #include "ngraph/function.hpp" #include "cpp/ie_cnn_network.h" -#include "cnn_network_impl.hpp" +#include #include "ie_common.h" #include "common_test_utils/test_common.hpp" #include "common_test_utils/common_utils.hpp" -#include "details/ie_cnn_network_iterator.hpp" +#include #include diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp index cd4a5dc..a34101e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp index c0d73e0..da19127 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp @@ -13,7 +13,7 @@ #include #include #include -#include
+#include #include #include #include "common_test_utils/common_utils.hpp" diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp index 949c924..9e299ee 100644 --- a/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/behavior/test_plugin.hpp @@ -10,7 +10,7 @@ #include #include "ie_extension.h" #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/network_serializer.cpp b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/network_serializer.cpp index 69798fc..bad6038 100644 --- a/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/network_serializer.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/execution_graph_tests/network_serializer.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include using namespace InferenceEngine; diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/common_layers_params.hpp b/inference-engine/tests/ie_test_utils/common_test_utils/common_layers_params.hpp index 91386a6..1b01062 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/common_layers_params.hpp +++ b/inference-engine/tests/ie_test_utils/common_test_utils/common_layers_params.hpp @@ -8,7 +8,7 @@ #include #include "details/ie_exception.hpp" -#include "ie_layers_property.hpp" +#include #include "ie_blob.h" namespace CommonTestUtils { diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp index 38b6218..b6c4c09 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp +++ b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp @@ -11,7 +11,7 @@ #include #include -#include
+#include namespace CommonTestUtils { template diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp index e44a6a7..6bd9995 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" @@ -20,7 +20,7 @@ #include "ngraph_functions/pass/convert_prc.hpp" -#include "ie_util_internal.hpp" +#include #include "low_precision_transformations/convolution.hpp" #include "low_precision_transformations/scaleshift_to_convolution.hpp" diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp index 1e921e1..e542ce6 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/low_precision_transformations/layer_transformation.hpp @@ -7,7 +7,7 @@ #include #include -#include "ie_util_internal.hpp" +#include #include "low_precision_transformations/network_helper.hpp" #include "low_precision_transformations/convolution.hpp" #include "low_precision_transformations/scaleshift_to_convolution.hpp" diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp index 37b65ea..8f4a507 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp @@ -12,7 +12,7 @@ #include "network_utils.hpp" #include "cpp/ie_cnn_network.h" #include "blob_utils.hpp" -#include "net_pass.h" +#include namespace FuncTestUtils { diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp index 7a556b4..76b2e28 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp @@ -5,8 +5,8 @@ #pragma once #include "cpp/ie_cnn_network.h" -#include "cnn_network_impl.hpp" -#include "details/ie_cnn_network_iterator.hpp" +#include +#include namespace FuncTestUtils { diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp index bb8da0c..9cd9b68 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/test_model/test_model.hpp @@ -7,7 +7,7 @@ #include #include -#include "ie_layers.h" +#include #include "inference_engine.hpp" namespace FuncTestUtils { diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp index 174ad03..10ac43b 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp @@ -14,7 +14,7 @@ #include #include "ie_icnn_network.hpp" -#include "cnn_network_impl.hpp" +#include IE_SUPPRESS_DEPRECATED_START diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp index 2ebcec4..27ab4ac 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp @@ -10,7 +10,7 @@ #include #include -#include "ie_layers.h" +#include #include "ie_icnn_network.hpp" namespace InferenceEngine { diff --git a/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp b/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp index 2e9d1a1..b152066 100644 --- a/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp +++ b/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp @@ -5,7 +5,7 @@ #include "classification_matcher.hpp" #include #include -#include "details/ie_cnn_network_iterator.hpp" +#include using namespace Regression ; using namespace Regression :: Matchers ; diff --git a/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp b/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp index b039a1f..3c5dc92 100644 --- a/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp +++ b/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp @@ -3,7 +3,7 @@ // #include "object_detection_matcher.hpp" -#include "details/ie_cnn_network_iterator.hpp" +#include #include diff --git a/inference-engine/tests_deprecated/functional/ie_tests/src/raw_matcher.cpp b/inference-engine/tests_deprecated/functional/ie_tests/src/raw_matcher.cpp index 275e6f5..69c8df4 100644 --- a/inference-engine/tests_deprecated/functional/ie_tests/src/raw_matcher.cpp +++ b/inference-engine/tests_deprecated/functional/ie_tests/src/raw_matcher.cpp @@ -4,7 +4,7 @@ #include #include -#include "graph_tools.hpp" +#include #include "raw_matcher.hpp" #include diff --git a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp index 27ccd8e..121098f 100644 --- a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp +++ b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp @@ -5,7 +5,7 @@ #include #include #include "graph_tools_functional_tests.hpp" -#include "details/ie_cnn_network_tools.h" +#include using namespace testing; using namespace InferenceEngine::details; diff --git a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/network_tests/network_test.cpp b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/network_tests/network_test.cpp index 288e178..b0d3e49 100644 --- a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/network_tests/network_test.cpp +++ b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/network_tests/network_test.cpp @@ -11,7 +11,7 @@ #include #include "low_precision_transformations/transformer.hpp" #include "common/validation.hpp" -#include "ie_util_internal.hpp" +#include #include "network_i8.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp index 94ec6ba..ceb8e62 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include "conv_ref.hpp" #include "common_test_utils/common_layers_params.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp index 6e40bda..6101200 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/conv_ref.hpp @@ -4,11 +4,11 @@ #pragma once -#include -#include +#include +#include #include #include -#include +#include #include "common_test_utils/common_layers_params.hpp" template diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp index 9517121..6ec5634 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include #include "deconv_ref.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp index 5209fe8..b3a23bb 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/deconv_ref.hpp @@ -4,11 +4,11 @@ #pragma once -#include -#include +#include +#include #include #include -#include +#include #include "common_test_utils/common_layers_params.hpp" template diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp index d86fabc..f62efeb 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp index d8ffa29..cb53ad9 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/def_conv_ref.hpp @@ -4,11 +4,11 @@ #pragma once -#include -#include +#include +#include #include #include -#include +#include #include "common_test_utils/common_layers_params.hpp" template diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp index 6df22c5..909abe0 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include "common_test_utils/common_layers_params.hpp" #include "pool_ref.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp index e263777..0772c36 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/pool_ref.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "common_test_utils/common_layers_params.hpp" template diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp index ea96f4c..e32a3ba 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp @@ -7,8 +7,8 @@ #include #include -#include -#include
+#include +#include #include #include "conv_ref.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp index 5270981..66975dc 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp @@ -3,7 +3,7 @@ // #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/functional/shared_tests/network_tests/network_i8.hpp b/inference-engine/tests_deprecated/functional/shared_tests/network_tests/network_i8.hpp index 6d158fe..6784cd3 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/network_tests/network_i8.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/network_tests/network_i8.hpp @@ -20,7 +20,7 @@ #include "low_precision_transformations/fully_connected.hpp" #include "low_precision_transformations/eltwise.hpp" #include "low_precision_transformations/scaleshift_to_convolution.hpp" -#include "ie_util_internal.hpp" +#include #include "cnn_network_ngraph_impl.hpp" #include diff --git a/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp index fca233d..e88bdfc 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp @@ -4,7 +4,7 @@ #include #include -#include
+#include #include "tests_common.hpp" #include "single_layer_common.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp index 282b621..20f1864 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp @@ -4,7 +4,7 @@ #include "low_precision_tests_utils.hpp" -#include
+#include #include #include diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.hpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.hpp index 51f95ba..d291daf 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include void fillDataWithInitValue(InferenceEngine::Blob::Ptr& blob, float initValue); diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp index 017b98f..6a821de 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp @@ -10,7 +10,7 @@ #include #include -#include "details/ie_cnn_network_tools.h" +#include #include #include "low_precision_transformations/network_helper.hpp" #include "low_precision_transformations/layer_transformation.hpp" diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp index 986c403..6306d38 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp @@ -9,7 +9,7 @@ #include #include -#include "details/ie_cnn_network_tools.h" +#include #include "cpp_interfaces/impl/ie_plugin_internal.hpp" #include "common/low_precision_tests_utils.hpp" diff --git a/inference-engine/tests_deprecated/helpers/single_layer_common.cpp b/inference-engine/tests_deprecated/helpers/single_layer_common.cpp index d87ff9f..a34e0cc 100644 --- a/inference-engine/tests_deprecated/helpers/single_layer_common.cpp +++ b/inference-engine/tests_deprecated/helpers/single_layer_common.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/helpers/single_layer_common.hpp b/inference-engine/tests_deprecated/helpers/single_layer_common.hpp index c07ff06..8508280 100644 --- a/inference-engine/tests_deprecated/helpers/single_layer_common.hpp +++ b/inference-engine/tests_deprecated/helpers/single_layer_common.hpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/helpers/tests_common.hpp b/inference-engine/tests_deprecated/helpers/tests_common.hpp index 687788c..7dcb53c 100644 --- a/inference-engine/tests_deprecated/helpers/tests_common.hpp +++ b/inference-engine/tests_deprecated/helpers/tests_common.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/helpers/tests_common_func.hpp b/inference-engine/tests_deprecated/helpers/tests_common_func.hpp index d6edceb..eeee91d 100644 --- a/inference-engine/tests_deprecated/helpers/tests_common_func.hpp +++ b/inference-engine/tests_deprecated/helpers/tests_common_func.hpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include "low_precision_transformations/network_helper.hpp" // use to display additional test info: diff --git a/inference-engine/tests_deprecated/unit/cnn_network/cnn_network_impl_test.cpp b/inference-engine/tests_deprecated/unit/cnn_network/cnn_network_impl_test.cpp index 53f29fe..287288c 100644 --- a/inference-engine/tests_deprecated/unit/cnn_network/cnn_network_impl_test.cpp +++ b/inference-engine/tests_deprecated/unit/cnn_network/cnn_network_impl_test.cpp @@ -3,7 +3,7 @@ // #include -#include "cnn_network_impl.hpp" +#include #include using namespace testing; diff --git a/inference-engine/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp index 08ce160..15d7860 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/I8_quantisation_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "frontend/layer_quantizer.hpp" #include "gna_matcher.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp b/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp index d4bdd14..0adda12 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "gna_matcher.hpp" using namespace InferenceEngine; diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_graph_aot_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_graph_aot_test.cpp index cbe99ca..f64dd6d 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_graph_aot_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_graph_aot_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "gna_matcher.hpp" using namespace InferenceEngine; diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp index 2e2f639..2ca9076 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp @@ -21,14 +21,14 @@ #include #include "gmock/gmock.h" -#include "net_pass.h" +#include #include "matchers/input_data_matcher.hpp" #include #include -#include
+#include #include "unit_test_utils/mocks/mock_icnn_network.hpp" -#include "details/ie_cnn_network_iterator.hpp" +#include using namespace std; using namespace InferenceEngine; diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.hpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.hpp index a96224e..190f331 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.hpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp index e7f579d..2734796 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "frontend/model_quantizer.hpp" #include "frontend/layer_quantizer.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/constant_propagation_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/constant_propagation_test.cpp index acd26a9..a3586d7 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/constant_propagation_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/constant_propagation_test.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "graph/test_graph.hpp" #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/dumper_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/dumper_test.cpp index 19f5d4d..036db22 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/dumper_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/dumper_test.cpp @@ -7,7 +7,7 @@ #include "mkldnn_graph.h" #include "mkldnn_graph_dumper.h" #include "ie_blob.h" -#include "details/ie_cnn_network_tools.h" +#include #include "common_test_utils/xml_net_builder/xml_net_builder.hpp" #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_concat_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_concat_test.cpp index 01f80ba..663cfc4 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_concat_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_concat_test.cpp @@ -6,7 +6,7 @@ #include "single_layer_common.hpp" #include -#include +#include #include #include #include "tests_common.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_conv_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_conv_test.cpp index 92f8bfb..7c8b600 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_conv_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_conv_test.cpp @@ -5,7 +5,7 @@ #include "test_graph.hpp" #include "single_layer_common.hpp" -#include +#include #include "tests_common.hpp" #include #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_eltwise_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_eltwise_test.cpp index 1c311cb..a176c74 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_eltwise_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_eltwise_test.cpp @@ -12,7 +12,7 @@ #include "common_test_utils/data_utils.hpp" #include "single_layer_common.hpp" #include -#include +#include #include "tests_common.hpp" #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_pooling_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_pooling_test.cpp index 062fc1d..33648a9 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_pooling_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_pooling_test.cpp @@ -10,7 +10,7 @@ #include #include "single_layer_common.hpp" -#include +#include #include "tests_common.hpp" #include "ir_gen_helper.hpp" #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp index 153411a..e475069 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp @@ -8,7 +8,7 @@ #include "tests_common.hpp" #include "ir_gen_helper.hpp" #include -#include "details/ie_cnn_network_iterator.hpp" +#include using namespace ::testing; using namespace std; diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp index 7ac445a..14971d2 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp @@ -7,7 +7,7 @@ #include "tests_common.hpp" #include -#include "details/ie_cnn_network_iterator.hpp" +#include #include diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/test_graph.hpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/test_graph.hpp index 2b1664f..27ed5b3 100644 --- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/test_graph.hpp +++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/test_graph.hpp @@ -18,7 +18,7 @@ #endif #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp index c4bd362..d3dba4a 100644 --- a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp +++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp @@ -3,7 +3,7 @@ // #include -#include +#include #include #include #include diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_test_base.hpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_test_base.hpp index cb50b1c..0a912c0 100644 --- a/inference-engine/tests_deprecated/unit/graph_tools/graph_test_base.hpp +++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_test_base.hpp @@ -3,12 +3,12 @@ // #include -#include +#include #include #include #include #include "cpp/ie_cnn_network.h" -#include "details/ie_cnn_network_tools.h" +#include #include "unit_test_utils/mocks/mock_icnn_network.hpp" #include "common_test_utils/common_utils.hpp" diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp index 37b52c9..5df5685 100644 --- a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp +++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp @@ -3,7 +3,7 @@ // #include -#include +#include #include #include "graph_test_base.hpp" #include @@ -12,7 +12,7 @@ #include #include "ie_common.h" #include -#include "details/ie_cnn_network_iterator.hpp" +#include #include using namespace testing; diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp index aa9be2e..05799b0 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp @@ -4,8 +4,8 @@ #include -#include "ie_layers.h" -#include "ie_layers_internal.hpp" +#include +#include #include "single_layer_common.hpp" namespace { diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp index 599caf0..d172c9d 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/layer_transform_test.cpp @@ -5,7 +5,7 @@ #include #include -#include "layer_transform.hpp" +#include #include "unit_test_utils/mocks/mock_icnn_network.hpp" diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/layers_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/layers_test.cpp index bc288cc..6d9aba2 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/layers_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/layers_test.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include #include #include "ie_precision.hpp" -#include +#include using namespace std; using InferenceEngine::X_AXIS; diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp index 1bee229..12a8eff 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp @@ -10,14 +10,14 @@ #include #include -#include +#include #include -#include +#include #include "blob_factory.hpp" #include "debug.h" #include "util_test.hpp" #include "util_const_infer_test.hpp" -#include
+#include #include #include "common_test_utils/common_utils.hpp" diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp index 7ec5645..f6d779f 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp @@ -12,9 +12,9 @@ #include #include -#include +#include #include -#include +#include #include "blob_factory.hpp" #include "debug.h" #include "util_test.hpp" diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.cpp index 343f16f..0c00307 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.cpp @@ -9,10 +9,10 @@ #include #include -#include -#include +#include +#include #include "util_test.hpp" -#include "graph_tools.hpp" +#include namespace { bool checkLayers(const std::vector& layers, std::initializer_list layersToCheck) { diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.hpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.hpp index 866828b..257b662 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.hpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_test.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include -- 2.7.4