From 94eacc65445bcb05f4f84ddcc73d2928232161b6 Mon Sep 17 00:00:00 2001 From: Gleb Kazantaev Date: Wed, 14 Oct 2020 10:58:01 +0300 Subject: [PATCH] Move legacy transformations and ops to legacy library (#2624) * Initial movement * Divided transformations to common and legacy * Changed ngraph visibility to ie_api.h * CommonTransformaitons to Internal * New trasnformations location structure * fixde typo; move convert_quantize_dequantize to common * Added control_flow folder --- inference-engine/src/cldnn_engine/cldnn_engine.cpp | 10 +-- .../inference_engine/cnn_network_ngraph_impl.cpp | 6 +- .../include/legacy}/ngraph_ops/crop_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/eltwise.hpp | 4 +- .../include/legacy}/ngraph_ops/fully_connected.hpp | 4 +- .../include/legacy}/ngraph_ops/gather_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/gather_tree_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/gru_cell_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/gru_sequence_ie.hpp | 6 +- .../include/legacy}/ngraph_ops/hard_sigmoid_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/interp.hpp | 6 +- .../include/legacy}/ngraph_ops/lrn_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/lstm_cell_ie.hpp | 4 +- .../legacy}/ngraph_ops/lstm_sequence_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/nms_ie.hpp | 6 +- .../include/legacy}/ngraph_ops/normalize_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/onehot_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/pad_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/power.hpp | 4 +- .../legacy}/ngraph_ops/prior_box_clustered_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/prior_box_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/proposal_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/relu_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/rnn_cell_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/rnn_sequence_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/scaleshift.hpp | 4 +- .../include/legacy}/ngraph_ops/selu_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/swish_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/tile_ie.hpp | 4 +- .../include/legacy}/ngraph_ops/topk_ie.hpp | 4 +- .../convert_cells_to_cells_ie.hpp | 8 +- .../convert_gather_to_gather_ie.hpp | 6 +- .../convert_gathertree_to_gathertree_ie.hpp | 6 +- .../convert_hard_sigmoid_to_hard_sigmoid_ie.hpp | 4 +- .../convert_interpolate_to_interp_or_resample.hpp | 4 +- .../convert_lrn_to_lrn_ie.hpp | 4 +- .../convert_matmul_to_fc_or_gemm.hpp | 8 +- .../convert_mul_add_to_scaleshift_or_power.hpp | 6 +- .../convert_mul_or_add_finally.hpp | 12 +-- .../convert_nms_4_to_legacy.hpp | 4 +- .../convert_nms_to_nms_ie.hpp | 4 +- .../convert_normalizel2_to_normalize_ie.hpp | 6 +- .../convert_one_hot_to_one_hot_ie.hpp | 4 +- .../convert_opset1_to_legacy.hpp | 4 +- .../convert_pad_to_pad_ie.hpp | 6 +- .../convert_power_to_power_ie.hpp | 4 +- .../convert_prelu_to_relu_ie.hpp | 4 +- .../convert_prior_to_ie_prior.hpp | 4 +- .../convert_proposal_to_proposal_ie.hpp | 6 +- .../convert_selu_to_selu_ie.hpp | 4 +- .../convert_sequences_to_sequences_ie.hpp | 8 +- .../convert_sqrt_to_power_ie.hpp | 4 +- .../convert_strided_slice_to_crop.hpp | 4 +- .../convert_swish_to_swish_ie.hpp | 4 +- .../convert_tile_to_ie_tile.hpp | 4 +- .../convert_topk_to_topk_ie.hpp | 4 +- .../convert_opset1_to_legacy/fc_bias_fusion.hpp | 6 +- .../convert_opset1_to_legacy/reshape_1d_ops.hpp | 10 +-- .../convert_opset1_to_legacy/reshape_fc_fusion.hpp | 2 +- .../reshape_fully_connected.hpp | 4 +- .../src/legacy_api/src/cnn_network_impl.cpp | 8 +- .../src/convert_function_to_cnn_network.cpp | 54 ++++++------- .../legacy_api/src/ie_cnn_layer_builder_ngraph.cpp | 48 +++++------ .../src/ngraph_ops/crop_ie.cpp | 2 +- .../src/ngraph_ops/eltwise.cpp | 2 +- .../src/ngraph_ops/fully_connected.cpp | 2 +- .../src/ngraph_ops/gather_ie.cpp | 2 +- .../src/ngraph_ops/gather_tree_ie.cpp | 2 +- .../src/ngraph_ops/gru_cell_ie.cpp | 2 +- .../src/ngraph_ops/gru_sequence_ie.cpp | 2 +- .../src/ngraph_ops/hard_sigmoid_ie.cpp | 2 +- .../src/ngraph_ops/interp.cpp | 2 +- .../src/ngraph_ops/lrn_ie.cpp | 2 +- .../src/ngraph_ops/lstm_cell_ie.cpp | 2 +- .../src/ngraph_ops/lstm_sequence_ie.cpp | 2 +- .../src/ngraph_ops/nms_ie.cpp | 2 +- .../src/ngraph_ops/normalize_ie.cpp | 2 +- .../src/ngraph_ops/onehot_ie.cpp | 2 +- .../src/ngraph_ops/pad_ie.cpp | 2 +- .../src/ngraph_ops/power.cpp | 2 +- .../src/ngraph_ops/prior_box_clustered_ie.cpp | 2 +- .../src/ngraph_ops/prior_box_ie.cpp | 2 +- .../src/ngraph_ops/proposal_ie.cpp | 2 +- .../src/ngraph_ops/relu_ie.cpp | 2 +- .../src/ngraph_ops/rnn_cell_ie.cpp | 2 +- .../src/ngraph_ops/rnn_sequence_ie.cpp | 2 +- .../src/ngraph_ops/scaleshift.cpp | 2 +- .../src/ngraph_ops/selu_ie.cpp | 2 +- .../src/ngraph_ops/swish_ie.cpp | 2 +- .../src/ngraph_ops/tile_ie.cpp | 2 +- .../src/ngraph_ops/topk_ie.cpp | 2 +- .../convert_cells_to_cells_ie.cpp | 8 +- .../convert_gather_to_gather_ie.cpp | 2 +- .../convert_gathertree_to_gathertree_ie.cpp | 2 +- .../convert_hard_sigmoid_to_hard_sigmoid_ie.cpp | 4 +- .../convert_interpolate_to_interp_or_resample.cpp | 4 +- .../convert_lrn_to_lrn_ie.cpp | 4 +- .../convert_matmul_to_fc_or_gemm.cpp | 4 +- .../convert_mul_add_to_scaleshift_or_power.cpp | 6 +- .../convert_nms_4_to_legacy.cpp | 4 +- .../convert_nms_to_nms_ie.cpp | 4 +- .../convert_normalizel2_to_normalize_ie.cpp | 4 +- .../convert_one_hot_to_one_hot_ie.cpp | 4 +- .../convert_opset1_to_legacy.cpp | 94 ++++++++++------------ .../convert_pad_to_pad_ie.cpp | 2 +- .../convert_power_to_power_ie.cpp | 4 +- .../convert_prelu_to_relu_ie.cpp | 4 +- .../convert_prior_to_ie_prior.cpp | 6 +- .../convert_proposal_to_proposal_ie.cpp | 4 +- .../convert_selu_to_selu_ie.cpp | 4 +- .../convert_sequences_to_sequences_ie.cpp | 8 +- .../convert_sqrt_to_power_ie.cpp | 4 +- .../convert_strided_slice_to_crop.cpp | 4 +- .../convert_swish_to_swish_ie.cpp | 4 +- .../convert_tile_to_ie_tile.cpp | 4 +- .../convert_topk_to_topk_ie.cpp | 4 +- .../convert_opset1_to_legacy/fc_bias_fusion.cpp | 2 +- .../convert_opset1_to_legacy/reshape_1d_ops.cpp | 2 +- .../reshape_fully_connected.cpp | 4 +- .../src/mkldnn_plugin/mkldnn_plugin.cpp | 41 +++++----- .../conv_bias_fusion.hpp | 0 .../convert_quantize_dequantize.hpp | 0 .../depth_to_space_fusion.hpp | 0 .../{ => common_optimizations}/hswish_fusion.hpp | 0 .../lin_op_sequence_fusion.hpp} | 0 .../{ => common_optimizations}/mish_fusion.hpp | 0 .../normalize_l2_fusion.hpp | 0 .../optimize_strided_slice.hpp | 0 .../pull_transpose_through_fq.hpp | 0 .../remove_filtering_boxes_by_size.hpp | 0 .../{ => common_optimizations}/softplus_fusion.hpp | 0 .../softplus_to_mish_fusion.hpp | 0 .../{ => common_optimizations}/swish_fusion.hpp | 0 .../unroll_tensor_iterator.hpp | 0 .../batch_norm_decomposition.hpp | 0 .../bidirectional_sequences_decomposition.hpp | 0 .../convert_batch_to_space.hpp | 0 .../convert_broadcast3.hpp | 0 .../convert_broadcast_to_tiles.hpp | 0 .../convert_convolutions.hpp | 0 .../convert_depth_to_space.hpp | 0 .../{ => op_conversions}/convert_divide.hpp | 0 ...convert_extract_image_patches_to_reorg_yolo.hpp | 0 .../{ => op_conversions}/convert_gelu.hpp | 0 .../convert_minimum_to_power_and_max.hpp | 0 .../{ => op_conversions}/convert_mod.hpp | 0 .../{ => op_conversions}/convert_negative.hpp | 0 .../convert_nms3.hpp | 0 .../convert_pad_to_group_conv.hpp | 0 .../convert_reduce_to_pooling.hpp | 0 .../convert_scatter_elements_to_scatter.hpp | 0 .../convert_shapeof3.hpp | 0 .../convert_shuffle_channels3.hpp | 0 .../convert_space_to_batch.hpp | 0 .../convert_space_to_depth.hpp | 0 .../{ => op_conversions}/convert_subtract.hpp | 0 .../convert_ti_to_sequences.hpp} | 0 .../convert_topk3.hpp | 0 .../gru_cell_decomposition.hpp | 0 .../{ => op_conversions}/hswish_decomposition.hpp | 0 .../lstm_cell_decomposition.hpp | 0 .../reduce_l1_decomposition.hpp | 0 .../reduce_l2_decomposition.hpp | 0 .../rnn_cell_decomposition.hpp | 0 .../softplus_decomposition.hpp | 0 .../convert_opset2_to_opset1.hpp | 0 .../convert_opset3_to_opset2.hpp | 0 .../common_optimizations/common_optimizations.cpp | 62 +++++++------- .../conv_bias_fusion.cpp | 2 +- .../convert_quantize_dequantize.cpp | 2 +- .../depth_to_space_fusion.cpp | 2 +- .../{ => common_optimizations}/hswish_fusion.cpp | 2 +- .../lin_op_sequence_fusion.cpp | 2 +- .../{ => common_optimizations}/mish_fusion.cpp | 2 +- .../normalize_l2_fusion.cpp | 2 +- .../optimize_strided_slice.cpp | 2 +- .../pull_transpose_through_fq.cpp | 2 +- .../remove_filtering_boxes_by_size.cpp | 2 +- .../{ => common_optimizations}/softplus_fusion.cpp | 2 +- .../softplus_to_mish_fusion.cpp | 2 +- .../{ => common_optimizations}/swish_fusion.cpp | 2 +- .../unroll_tensor_iterator.cpp | 2 +- .../batch_norm_decomposition.cpp | 2 +- .../bidirectional_sequences_decomposition.cpp | 2 +- .../convert_batch_to_space.cpp | 2 +- .../convert_broadcast3.cpp | 2 +- .../convert_broadcast_to_tiles.cpp | 2 +- .../convert_convolutions.cpp | 2 +- .../convert_depth_to_space.cpp | 2 +- .../{ => op_conversions}/convert_divide.cpp | 2 +- ...convert_extract_image_patches_to_reorg_yolo.cpp | 2 +- .../convert_gelu.cpp | 2 +- .../convert_minimum_to_power_and_max.cpp | 2 +- .../{ => op_conversions}/convert_mod.cpp | 2 +- .../{ => op_conversions}/convert_negative.cpp | 2 +- .../convert_nms3.cpp | 2 +- .../convert_pad_to_group_conv.cpp | 2 +- .../convert_scatter_elements_to_scatter.cpp | 2 +- .../convert_shapeof3.cpp | 2 +- .../convert_shuffle_channels3.cpp | 2 +- .../convert_space_to_batch.cpp | 2 +- .../convert_space_to_depth.cpp | 2 +- .../{ => op_conversions}/convert_subtract.cpp | 2 +- .../convert_ti_to_sequences.cpp | 2 +- .../convert_topk3.cpp | 2 +- .../gru_cell_decomposition.cpp | 2 +- .../{ => op_conversions}/hswish_decomposition.cpp | 2 +- .../lstm_cell_decomposition.cpp | 2 +- .../reduce_l1_decomposition.cpp | 2 +- .../reduce_l2_decomposition.cpp | 2 +- .../rnn_cell_decomposition.cpp | 2 +- .../softplus_decomposition.cpp | 2 +- .../convert_opset2_to_opset1.cpp | 7 +- .../convert_opset3_to_opset2.cpp | 18 ++--- .../graph_transformer/src/frontend/frontend.cpp | 8 +- .../cnn_network/cnn_ngraph_impl_tests.cpp | 2 +- .../convert_ngraph_to_cnn_network_tests.cpp | 8 +- .../keep_constant_inputs_tests.cpp | 8 +- .../batch_to_space_decomposition_test.cpp | 5 +- .../transformations/conv_fusion_test.cpp | 2 +- .../transformations/convert_broadcast3_test.cpp | 2 +- .../convert_cells_to_cells_ie_test.cpp | 8 +- .../transformations/convert_convolution_test.cpp | 2 +- .../transformations/convert_deconvolution_test.cpp | 2 +- .../transformations/convert_divide.cpp | 2 +- ...rt_extract_image_patches_to_reorg_yolo_test.cpp | 2 +- .../convert_gather_to_gather_ie.cpp | 4 +- .../transformations/convert_matmul_test.cpp | 6 +- .../transformations/convert_nms3_test.cpp | 2 +- .../transformations/convert_nms4_test.cpp | 4 +- .../transformations/convert_nms_to_nms_ie_test.cpp | 4 +- .../transformations/convert_pad_to_group_conv.cpp | 2 +- .../convert_quantize_dequantize.cpp | 2 +- .../convert_reduce_to_pooling_test.cpp | 2 +- .../convert_scatter_elements_to_scatter_test.cpp | 2 +- .../convert_sequences_to_sequences_ie_test.cpp | 8 +- .../transformations/convert_shapeof3.cpp | 2 +- .../convert_shuffle_channels3_test.cpp | 2 +- .../convert_strided_slice_to_crop_test.cpp | 4 +- .../convert_ti_to_sequences_test.cpp | 4 +- .../transformations/convert_topk3_test.cpp | 2 +- .../transformations/convert_topk_test.cpp | 4 +- .../transformations/depth_to_space_fusion_test.cpp | 4 +- .../transformations/fc_bias_fusion_test.cpp | 4 +- .../transformations/hswish_decomposition_test.cpp | 2 +- .../transformations/hswish_fusion_test.cpp | 2 +- .../lin_op_sequence_fusion_test.cpp | 2 +- .../transformations/mish_fusion_test.cpp | 4 +- .../transformations/mul_add_conversion_test.cpp | 10 +-- .../transformations/ngraph_1d_ops_reshape_test.cpp | 2 +- .../ngraph_depth_to_space_transform_test.cpp | 4 +- .../transformations/ngraph_fq_transpose_test.cpp | 2 +- .../ngraph_mode_decomposition_test.cpp | 2 +- .../transformations/normalize_l2_fusion_test.cpp | 2 +- .../optimize_strided_slice_test.cpp | 6 +- .../reduce_l1_decomposition_test.cpp | 2 +- .../reduce_l2_decomposition_test.cpp | 2 +- .../transformations/reshape_fc_fusion_test.cpp | 4 +- .../softplus_decomposition_test.cpp | 2 +- .../transformations/softplus_fusion_test.cpp | 2 +- .../transformations/swish_fusion_test.cpp | 2 +- .../unroll_tensor_iterator_test.cpp | 4 +- .../functional/plugin/cpu/bfloat16/memory_conv.cpp | 2 +- .../layer_transformation.cpp | 8 +- .../layer_transformation.cpp | 8 +- .../depth_to_space_transformation.cpp | 4 +- .../shared/src/single_layer_tests/gru_cell.cpp | 2 +- .../shared/src/single_layer_tests/gru_sequence.cpp | 2 +- .../shared/src/single_layer_tests/lstm_cell.cpp | 2 +- .../src/single_layer_tests/lstm_sequence.cpp | 2 +- .../src/single_layer_tests/prior_box_clustered.cpp | 2 +- .../shared/src/single_layer_tests/rnn_cell.cpp | 2 +- .../shared/src/single_layer_tests/rnn_sequence.cpp | 2 +- .../src/subgraph_tests/conv_eltwise_fusion.cpp | 4 +- .../shared/src/subgraph_tests/memory_LSTMCell.cpp | 2 +- .../src/subgraph_tests/multiple_LSTMCell.cpp | 2 +- .../functional_test_utils/layer_test_utils.cpp | 4 +- .../tests/unit/cpu/bf16_transformer_test.cpp | 2 +- .../unit/engines/gna/layers/activation_test.cpp | 2 +- .../unit/engines/gna/layers/gna_eltwise_test.cpp | 2 +- .../engines/vpu/get_vpu_scale_from_ir_tests.cpp | 2 +- 281 files changed, 550 insertions(+), 553 deletions(-) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/crop_ie.hpp (89%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/eltwise.hpp (89%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/fully_connected.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/gather_ie.hpp (89%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/gather_tree_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/gru_cell_ie.hpp (94%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/gru_sequence_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/hard_sigmoid_ie.hpp (90%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/interp.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/lrn_ie.hpp (93%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/lstm_cell_ie.hpp (94%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/lstm_sequence_ie.hpp (91%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/nms_ie.hpp (91%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/normalize_ie.hpp (91%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/onehot_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/pad_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/power.hpp (88%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/prior_box_clustered_ie.hpp (91%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/prior_box_ie.hpp (91%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/proposal_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/relu_ie.hpp (88%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/rnn_cell_ie.hpp (94%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/rnn_sequence_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/scaleshift.hpp (87%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/selu_ie.hpp (87%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/swish_ie.hpp (89%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/tile_ie.hpp (87%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/ngraph_ops/topk_ie.hpp (92%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp (79%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp (85%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp (76%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp (82%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp (82%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp (88%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp (96%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp (84%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp (89%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp (78%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp (85%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp (83%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp (79%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp (82%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp (87%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp (78%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp (82%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp (88%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp (82%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp (84%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp (81%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp (98%) rename inference-engine/src/{transformations/include => legacy_api/include/legacy}/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp (93%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/crop_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/eltwise.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/fully_connected.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/gather_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/gather_tree_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/gru_cell_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/gru_sequence_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/hard_sigmoid_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/interp.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/lrn_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/lstm_cell_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/lstm_sequence_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/nms_ie.cpp (99%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/normalize_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/onehot_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/pad_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/power.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/prior_box_clustered_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/prior_box_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/proposal_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/relu_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/rnn_cell_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/rnn_sequence_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/scaleshift.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/selu_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/swish_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/tile_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/ngraph_ops/topk_ie.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp (94%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp (93%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp (95%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp (61%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp (92%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp (92%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp (92%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp (94%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp (90%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp (92%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp (96%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp (97%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp (98%) rename inference-engine/src/{transformations => legacy_api}/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp (95%) rename inference-engine/src/transformations/include/transformations/{convert_opset1_to_legacy => common_optimizations}/conv_bias_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/convert_quantize_dequantize.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/depth_to_space_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/hswish_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{lin_op_sequence_fusoin.hpp => common_optimizations/lin_op_sequence_fusion.hpp} (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/mish_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/normalize_l2_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/optimize_strided_slice.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/pull_transpose_through_fq.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/remove_filtering_boxes_by_size.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/softplus_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/softplus_to_mish_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => common_optimizations}/swish_fusion.hpp (100%) rename inference-engine/src/transformations/include/transformations/{tensor_iterator_transformations => control_flow}/unroll_tensor_iterator.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/batch_norm_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/bidirectional_sequences_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_batch_to_space.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_broadcast3.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_broadcast_to_tiles.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset1_to_legacy => op_conversions}/convert_convolutions.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_depth_to_space.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_divide.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_extract_image_patches_to_reorg_yolo.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_gelu.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_minimum_to_power_and_max.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_mod.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_negative.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_nms3.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_pad_to_group_conv.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_reduce_to_pooling.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_scatter_elements_to_scatter.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_shapeof3.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_shuffle_channels3.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_space_to_batch.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_space_to_depth.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/convert_subtract.hpp (100%) rename inference-engine/src/transformations/include/transformations/{tensor_iterator_transformations/convert_ti_to_sequences.h => op_conversions/convert_ti_to_sequences.hpp} (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_topk3.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/gru_cell_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/hswish_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/lstm_cell_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/reduce_l1_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/reduce_l2_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/rnn_cell_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{ => op_conversions}/softplus_decomposition.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset2_to_opset1 => opset_conversions}/convert_opset2_to_opset1.hpp (100%) rename inference-engine/src/transformations/include/transformations/{convert_opset3_to_opset2 => opset_conversions}/convert_opset3_to_opset2.hpp (100%) rename inference-engine/src/transformations/src/transformations/{convert_opset1_to_legacy => common_optimizations}/conv_bias_fusion.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/convert_quantize_dequantize.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/depth_to_space_fusion.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/hswish_fusion.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/lin_op_sequence_fusion.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/mish_fusion.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/normalize_l2_fusion.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/optimize_strided_slice.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/pull_transpose_through_fq.cpp (97%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/remove_filtering_boxes_by_size.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/softplus_fusion.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/softplus_to_mish_fusion.cpp (95%) rename inference-engine/src/transformations/src/transformations/{ => common_optimizations}/swish_fusion.cpp (99%) rename inference-engine/src/transformations/src/transformations/{tensor_iterator_transformations => control_flow}/unroll_tensor_iterator.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/batch_norm_decomposition.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/bidirectional_sequences_decomposition.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_batch_to_space.cpp (99%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_broadcast3.cpp (97%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_broadcast_to_tiles.cpp (98%) rename inference-engine/src/transformations/src/transformations/{convert_opset1_to_legacy => op_conversions}/convert_convolutions.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_depth_to_space.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_divide.cpp (95%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_extract_image_patches_to_reorg_yolo.cpp (97%) rename inference-engine/src/transformations/src/transformations/{convert_opset1_to_legacy => op_conversions}/convert_gelu.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_minimum_to_power_and_max.cpp (95%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_mod.cpp (97%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_negative.cpp (94%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_nms3.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_pad_to_group_conv.cpp (97%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_scatter_elements_to_scatter.cpp (99%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_shapeof3.cpp (95%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_shuffle_channels3.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_space_to_batch.cpp (99%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_space_to_depth.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/convert_subtract.cpp (95%) rename inference-engine/src/transformations/src/transformations/{tensor_iterator_transformations => op_conversions}/convert_ti_to_sequences.cpp (99%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => op_conversions}/convert_topk3.cpp (97%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/gru_cell_decomposition.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/hswish_decomposition.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/lstm_cell_decomposition.cpp (98%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/reduce_l1_decomposition.cpp (95%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/reduce_l2_decomposition.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/rnn_cell_decomposition.cpp (96%) rename inference-engine/src/transformations/src/transformations/{ => op_conversions}/softplus_decomposition.cpp (95%) rename inference-engine/src/transformations/src/transformations/{convert_opset2_to_opset1 => opset_conversions}/convert_opset2_to_opset1.cpp (75%) rename inference-engine/src/transformations/src/transformations/{convert_opset3_to_opset2 => opset_conversions}/convert_opset3_to_opset2.cpp (64%) diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp index 72a470e..5b2818b 100644 --- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp @@ -26,12 +26,12 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include 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 243d1bf..aed1baa 100644 --- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp +++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp @@ -21,12 +21,12 @@ #include #include -#include #include -#include "ngraph_ops/eltwise.hpp" -#include "exec_graph_info.hpp" +#include #include + +#include "exec_graph_info.hpp" #include "ie_itt.hpp" #include "network_serializer.hpp" #include "generic_ie.hpp" diff --git a/inference-engine/src/transformations/include/ngraph_ops/crop_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/crop_ie.hpp similarity index 89% rename from inference-engine/src/transformations/include/ngraph_ops/crop_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/crop_ie.hpp index 9677e75..945cb5b 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/crop_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/crop_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API CropIE : public Op { +class INFERENCE_ENGINE_API_CLASS(CropIE) : public Op { public: static constexpr NodeTypeInfo type_info{"CropIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/eltwise.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/eltwise.hpp similarity index 89% rename from inference-engine/src/transformations/include/ngraph_ops/eltwise.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/eltwise.hpp index 660c574..33ba5e0 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/eltwise.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/eltwise.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include "ngraph/op/op.hpp" @@ -15,7 +15,7 @@ enum class ELTWISE_TYPE {Sum, Prod, Max, Sub, Min, Div}; namespace ngraph { namespace op { -class TRANSFORMATIONS_API Eltwise : public Op { +class INFERENCE_ENGINE_API_CLASS(Eltwise) : public Op { public: static constexpr NodeTypeInfo type_info{"Eltwise", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/fully_connected.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/fully_connected.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/fully_connected.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/fully_connected.hpp index 4471e8a..7714358 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/fully_connected.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/fully_connected.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include "ngraph/node.hpp" #include "ngraph/op/op.hpp" @@ -16,7 +16,7 @@ namespace ngraph { namespace op { /// \brief Operator performing Matrix Multiplication. -class TRANSFORMATIONS_API FullyConnected : public Op { +class INFERENCE_ENGINE_API_CLASS(FullyConnected) : public Op { public: static constexpr NodeTypeInfo type_info{"FullyConnected", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/gather_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_ie.hpp similarity index 89% rename from inference-engine/src/transformations/include/ngraph_ops/gather_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_ie.hpp index e59160f..aea5636 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/gather_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API GatherIE : public Op { +class INFERENCE_ENGINE_API_CLASS(GatherIE) : public Op { public: static constexpr NodeTypeInfo type_info{"GatherIE", 0}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/gather_tree_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_tree_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/gather_tree_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_tree_ie.hpp index 88840f5..02d914c 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/gather_tree_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_tree_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API GatherTreeIE : public Op { +class INFERENCE_ENGINE_API_CLASS(GatherTreeIE) : public Op { public: static constexpr NodeTypeInfo type_info{"GatherTreeIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/gru_cell_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_cell_ie.hpp similarity index 94% rename from inference-engine/src/transformations/include/ngraph_ops/gru_cell_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_cell_ie.hpp index 0d02711..9d3e1c1 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/gru_cell_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_cell_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API GRUCellIE : public Op { +class INFERENCE_ENGINE_API_CLASS(GRUCellIE) : public Op { public: static constexpr NodeTypeInfo type_info{"GRUCellIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/gru_sequence_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_sequence_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/gru_sequence_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_sequence_ie.hpp index 8bd2991..4ce569a 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/gru_sequence_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_sequence_ie.hpp @@ -8,14 +8,16 @@ #include #include -#include +#include + +#include #include "ngraph/opsets/opset4.hpp" #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API GRUSequenceIE : public ngraph::op::util::RNNCellBase { +class INFERENCE_ENGINE_API_CLASS(GRUSequenceIE) : public ngraph::op::util::RNNCellBase { public: NGRAPH_RTTI_DECLARATION; diff --git a/inference-engine/src/transformations/include/ngraph_ops/hard_sigmoid_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp similarity index 90% rename from inference-engine/src/transformations/include/ngraph_ops/hard_sigmoid_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp index 02cf581..ac8489b 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/hard_sigmoid_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API HardSigmoid_IE : public Op { +class INFERENCE_ENGINE_API_CLASS(HardSigmoid_IE) : public Op { public: static constexpr NodeTypeInfo type_info{"HardSigmoid_IE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/interp.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/interp.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/interp.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/interp.hpp index 5e1a0b6..d7a7dbd 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/interp.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/interp.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" @@ -28,7 +28,7 @@ struct InterpolateIEAttrs { int pad_end = 0; }; -class TRANSFORMATIONS_API Interp : public Op { +class INFERENCE_ENGINE_API_CLASS(Interp) : public Op { public: static constexpr NodeTypeInfo type_info{"Interp", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -51,7 +51,7 @@ struct ResampleIEAttrs { std::string mode = ""; }; -class TRANSFORMATIONS_API ResampleV2 : public Op { +class INFERENCE_ENGINE_API_CLASS(ResampleV2) : public Op { public: static constexpr NodeTypeInfo type_info{"ResampleV2", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/lrn_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lrn_ie.hpp similarity index 93% rename from inference-engine/src/transformations/include/ngraph_ops/lrn_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/lrn_ie.hpp index 291e865..a56d3d7 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/lrn_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lrn_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API LRN_IE : public Op { +class INFERENCE_ENGINE_API_CLASS(LRN_IE) : public Op { public: static constexpr NodeTypeInfo type_info{"LRN_IE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/lstm_cell_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_cell_ie.hpp similarity index 94% rename from inference-engine/src/transformations/include/ngraph_ops/lstm_cell_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_cell_ie.hpp index 7b5b9b5..32e54c2 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/lstm_cell_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_cell_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API LSTMCellIE : public Op { +class INFERENCE_ENGINE_API_CLASS(LSTMCellIE) : public Op { public: static constexpr NodeTypeInfo type_info{"LSTMCellIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/lstm_sequence_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_sequence_ie.hpp similarity index 91% rename from inference-engine/src/transformations/include/ngraph_ops/lstm_sequence_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_sequence_ie.hpp index 12bd31b..debe93b 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/lstm_sequence_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_sequence_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include "ngraph/opsets/opset4.hpp" #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API LSTMSequenceIE : public ngraph::op::util::RNNCellBase { +class INFERENCE_ENGINE_API_CLASS(LSTMSequenceIE) : public ngraph::op::util::RNNCellBase { public: NGRAPH_RTTI_DECLARATION; diff --git a/inference-engine/src/transformations/include/ngraph_ops/nms_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/nms_ie.hpp similarity index 91% rename from inference-engine/src/transformations/include/ngraph_ops/nms_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/nms_ie.hpp index 79a31de..1aff882 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/nms_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/nms_ie.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API NonMaxSuppressionIE : public Op { +class INFERENCE_ENGINE_API_CLASS(NonMaxSuppressionIE) : public Op { public: static constexpr NodeTypeInfo type_info{"NonMaxSuppressionIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } @@ -39,7 +39,7 @@ public: element::Type m_output_type; }; -class TRANSFORMATIONS_API NonMaxSuppressionIE2 : public NonMaxSuppressionIE { +class INFERENCE_ENGINE_API_CLASS(NonMaxSuppressionIE2) : public NonMaxSuppressionIE { public: static constexpr NodeTypeInfo type_info{"NonMaxSuppressionIE", 2}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/normalize_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/normalize_ie.hpp similarity index 91% rename from inference-engine/src/transformations/include/ngraph_ops/normalize_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/normalize_ie.hpp index 79af2db..d4a3b56 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/normalize_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/normalize_ie.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include "ngraph/node.hpp" #include "ngraph/op/op.hpp" @@ -14,7 +14,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API NormalizeIE : public Op { +class INFERENCE_ENGINE_API_CLASS(NormalizeIE) : public Op { public: static constexpr NodeTypeInfo type_info{"NormalizeIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/onehot_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/onehot_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/onehot_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/onehot_ie.hpp index 629266e..8f9f0aa 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/onehot_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/onehot_ie.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "ngraph/node.hpp" #include "ngraph/op/op.hpp" @@ -16,7 +16,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API OneHotIE : public Op { +class INFERENCE_ENGINE_API_CLASS(OneHotIE) : public Op { public: static constexpr NodeTypeInfo type_info{"OneHotIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/pad_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/pad_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/pad_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/pad_ie.hpp index 345663d..05bab1c 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/pad_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/pad_ie.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "ngraph/node.hpp" #include "ngraph/op/op.hpp" @@ -16,7 +16,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API PadIE : public Op { +class INFERENCE_ENGINE_API_CLASS(PadIE) : public Op { public: static constexpr NodeTypeInfo type_info{"PadIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/power.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/power.hpp similarity index 88% rename from inference-engine/src/transformations/include/ngraph_ops/power.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/power.hpp index 7fb3a84..ab62636 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/power.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/power.hpp @@ -6,14 +6,14 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API PowerIE : public Op { +class INFERENCE_ENGINE_API_CLASS(PowerIE) : public Op { public: static constexpr NodeTypeInfo type_info{"PowerIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/prior_box_clustered_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_clustered_ie.hpp similarity index 91% rename from inference-engine/src/transformations/include/ngraph_ops/prior_box_clustered_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_clustered_ie.hpp index a3a6692..9f1193c 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/prior_box_clustered_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_clustered_ie.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include #include @@ -14,7 +14,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API PriorBoxClusteredIE : public Op { +class INFERENCE_ENGINE_API_CLASS(PriorBoxClusteredIE) : public Op { public: static constexpr NodeTypeInfo type_info{"PriorBoxClusteredIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/prior_box_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_ie.hpp similarity index 91% rename from inference-engine/src/transformations/include/ngraph_ops/prior_box_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_ie.hpp index 9925662..334a86b 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/prior_box_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_ie.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include "ngraph/op/op.hpp" #include "ngraph/op/prior_box.hpp" @@ -14,7 +14,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API PriorBoxIE : public Op { +class INFERENCE_ENGINE_API_CLASS(PriorBoxIE) : public Op { public: static constexpr NodeTypeInfo type_info{"PriorBoxIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/proposal_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/proposal_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/proposal_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/proposal_ie.hpp index 0f8b15b..d5a1556 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/proposal_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/proposal_ie.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include #include "ngraph/op/op.hpp" @@ -14,7 +14,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API ProposalIE : public Op { +class INFERENCE_ENGINE_API_CLASS(ProposalIE) : public Op { public: static constexpr NodeTypeInfo type_info{"ProposalIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/relu_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/relu_ie.hpp similarity index 88% rename from inference-engine/src/transformations/include/ngraph_ops/relu_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/relu_ie.hpp index a61d84b..5d7c92b 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/relu_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/relu_ie.hpp @@ -6,14 +6,14 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API ReLUIE : public Op { +class INFERENCE_ENGINE_API_CLASS(ReLUIE) : public Op { public: static constexpr NodeTypeInfo type_info{"ReLUIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/rnn_cell_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_cell_ie.hpp similarity index 94% rename from inference-engine/src/transformations/include/ngraph_ops/rnn_cell_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_cell_ie.hpp index b00d28e..9920941 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/rnn_cell_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_cell_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API RNNCellIE : public Op { +class INFERENCE_ENGINE_API_CLASS(RNNCellIE) : public Op { public: static constexpr NodeTypeInfo type_info{"RNNCellIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/rnn_sequence_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_sequence_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/rnn_sequence_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_sequence_ie.hpp index 0315318..26378ca 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/rnn_sequence_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_sequence_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include "ngraph/opsets/opset4.hpp" #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API RNNSequenceIE : public ngraph::op::util::RNNCellBase { +class INFERENCE_ENGINE_API_CLASS(RNNSequenceIE) : public ngraph::op::util::RNNCellBase { public: NGRAPH_RTTI_DECLARATION; diff --git a/inference-engine/src/transformations/include/ngraph_ops/scaleshift.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/scaleshift.hpp similarity index 87% rename from inference-engine/src/transformations/include/ngraph_ops/scaleshift.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/scaleshift.hpp index f701c20..4d9a4d1 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/scaleshift.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/scaleshift.hpp @@ -6,14 +6,14 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API ScaleShiftIE : public Op { +class INFERENCE_ENGINE_API_CLASS(ScaleShiftIE) : public Op { public: static constexpr NodeTypeInfo type_info{"ScaleShiftIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/selu_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/selu_ie.hpp similarity index 87% rename from inference-engine/src/transformations/include/ngraph_ops/selu_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/selu_ie.hpp index 584a0b6..b776a9d 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/selu_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/selu_ie.hpp @@ -6,14 +6,14 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API SeluIE : public Op { +class INFERENCE_ENGINE_API_CLASS(SeluIE) : public Op { public: static constexpr NodeTypeInfo type_info{"SeluIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/swish_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/swish_ie.hpp similarity index 89% rename from inference-engine/src/transformations/include/ngraph_ops/swish_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/swish_ie.hpp index 4434ad0..6fc5889 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/swish_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/swish_ie.hpp @@ -6,13 +6,13 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API SwishIE : public Op { +class INFERENCE_ENGINE_API_CLASS(SwishIE) : public Op { public: static constexpr NodeTypeInfo type_info{"SwishIE", 1}; const NodeTypeInfo &get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/tile_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/tile_ie.hpp similarity index 87% rename from inference-engine/src/transformations/include/ngraph_ops/tile_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/tile_ie.hpp index 676de68..6310225 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/tile_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/tile_ie.hpp @@ -6,14 +6,14 @@ #include -#include +#include #include "ngraph/op/op.hpp" namespace ngraph { namespace op { -class TRANSFORMATIONS_API TileIE : public Op { +class INFERENCE_ENGINE_API_CLASS(TileIE) : public Op { public: static constexpr NodeTypeInfo type_info{"TileIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/ngraph_ops/topk_ie.hpp b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/topk_ie.hpp similarity index 92% rename from inference-engine/src/transformations/include/ngraph_ops/topk_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/ngraph_ops/topk_ie.hpp index 4a377c5..65641f2 100644 --- a/inference-engine/src/transformations/include/ngraph_ops/topk_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/ngraph_ops/topk_ie.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "ngraph/op/op.hpp" #include "ngraph/op/topk.hpp" @@ -15,7 +15,7 @@ namespace ngraph { namespace op { -class TRANSFORMATIONS_API TopKIE : public Op { +class INFERENCE_ENGINE_API_CLASS(TopKIE) : public Op { public: static constexpr NodeTypeInfo type_info{"TopKIE", 1}; const NodeTypeInfo& get_type_info() const override { return type_info; } diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp similarity index 79% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp index fe742e5..17b1a40 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp @@ -8,16 +8,16 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertLSTMCellMatcher; -class TRANSFORMATIONS_API ConvertGRUCellMatcher; -class TRANSFORMATIONS_API ConvertRNNCellMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertLSTMCellMatcher); +class INFERENCE_ENGINE_API_CLASS(ConvertGRUCellMatcher); +class INFERENCE_ENGINE_API_CLASS(ConvertRNNCellMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp similarity index 85% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp index 80cac91..56bbe3b 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp @@ -8,10 +8,10 @@ #include #include -#include +#include #include -#include +#include #include "ngraph/op/gather.hpp" #include "ngraph/op/constant.hpp" @@ -22,7 +22,7 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertGatherToGatherIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertGatherToGatherIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp similarity index 76% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp index 17ce13a..1571696 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp @@ -7,17 +7,17 @@ #include #include -#include +#include #include #include -#include +#include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertGatherTreeToGatherTreeIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertGatherTreeToGatherTreeIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp index aa2a5e1..c2cc49f 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertHardSigmoidToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertHardSigmoidToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp index 3de8d3a..8973893 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp @@ -10,14 +10,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertInterpolateToInterpOrResampleMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertInterpolateToInterpOrResampleMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp similarity index 82% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp index adf4bbb..c6df673 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertLRNToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertLRNToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp similarity index 82% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp index b3bff32..16ed619 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp @@ -11,16 +11,16 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertMatMulToFCorGemm; -class TRANSFORMATIONS_API ConvertMatMulToFC; -class TRANSFORMATIONS_API ConvertMatMulToGemm; +class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToFCorGemm); +class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToFC); +class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToGemm); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp similarity index 88% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp index 53f8b6d..e1e515e 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertMulAddToScaleShiftOrPower; +class INFERENCE_ENGINE_API_CLASS(ConvertMulAddToScaleShiftOrPower); } // namespace pass } // namespace ngraph @@ -44,5 +44,5 @@ enum class CONVERSION_RESULT { * NONE - default return value */ -TRANSFORMATIONS_API CONVERSION_RESULT +INFERENCE_ENGINE_API_CPP(CONVERSION_RESULT) check_constant(const std::shared_ptr & constant, const ngraph::PartialShape & shape); diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp similarity index 96% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp index 89f26cc..76fdacc 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp @@ -7,25 +7,25 @@ #include #include -#include +#include #include #include #include -#include "ngraph_ops/scaleshift.hpp" -#include "ngraph_ops/eltwise.hpp" -#include "ngraph_ops/power.hpp" +#include "legacy/ngraph_ops/scaleshift.hpp" +#include "legacy/ngraph_ops/eltwise.hpp" +#include "legacy/ngraph_ops/power.hpp" #include "transformations/utils/utils.hpp" -#include "transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp" namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertMulOrAddFinally; +class INFERENCE_ENGINE_API_CLASS(ConvertMulOrAddFinally); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp similarity index 84% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp index 9363278..affd092 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { - class TRANSFORMATIONS_API ConvertNMS4ToLegacyMatcher; + class INFERENCE_ENGINE_API_CLASS(ConvertNMS4ToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp similarity index 89% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp index 377885d..3455a08 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertNMSToNMSIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertNMSToNMSIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp similarity index 78% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp index 066cd88..e11bcaa 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include @@ -15,8 +15,8 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertNormalizeL2WithMulToNormalizeIE; -class TRANSFORMATIONS_API ConvertNormalizeL2ToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertNormalizeL2WithMulToNormalizeIE); +class INFERENCE_ENGINE_API_CLASS(ConvertNormalizeL2ToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp similarity index 85% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp index 911fbef..f0d7f54 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertOneHotToOneHotIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertOneHotToOneHotIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp similarity index 83% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp index f702495..b22968f 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include @@ -15,7 +15,7 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertOpSet1ToLegacy; +class INFERENCE_ENGINE_API_CLASS(ConvertOpSet1ToLegacy); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp similarity index 79% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp index c5202f0..b798a31 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp @@ -8,10 +8,10 @@ #include #include -#include +#include #include -#include +#include #include "ngraph/op/lrn.hpp" #include "ngraph/op/constant.hpp" @@ -19,7 +19,7 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertPadToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertPadToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp index 1487b1d..5deebfd 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertPowerToPowerIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertPowerToPowerIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp similarity index 82% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp index 11d1668..7e35404 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertPReLUToReLUIE; +class INFERENCE_ENGINE_API_CLASS(ConvertPReLUToReLUIE); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp similarity index 87% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp index 962e4ef..ec61eb4 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertPriorBox; +class INFERENCE_ENGINE_API_CLASS(ConvertPriorBox); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp similarity index 78% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp index f9daab4..9575b99 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp @@ -7,15 +7,15 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertProposalToLegacyMatcher; -class TRANSFORMATIONS_API ConvertProposal4ToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertProposalToLegacyMatcher); +class INFERENCE_ENGINE_API_CLASS(ConvertProposal4ToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp similarity index 82% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp index c2b6286..77109a1 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertSeluToSeluIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertSeluToSeluIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp similarity index 88% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp index a0ca240..2447219 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp @@ -8,16 +8,16 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertLSTMSequenceMatcher; -class TRANSFORMATIONS_API ConvertGRUSequenceMatcher; -class TRANSFORMATIONS_API ConvertRNNSequenceMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertLSTMSequenceMatcher); +class INFERENCE_ENGINE_API_CLASS(ConvertGRUSequenceMatcher); +class INFERENCE_ENGINE_API_CLASS(ConvertRNNSequenceMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp index 50e1758..01bc726 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertSqrtToPowerIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertSqrtToPowerIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp index 545bd38..6e71311 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertStridedSliceToCropMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertStridedSliceToCropMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp index 3f840f9..6e45792 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp @@ -8,13 +8,13 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { - class TRANSFORMATIONS_API ConvertSwishToSwishIEMatcher; + class INFERENCE_ENGINE_API_CLASS(ConvertSwishToSwishIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp index 0dc4809..91fc8f7 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp @@ -7,14 +7,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertTileToLegacyMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertTileToLegacyMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp similarity index 82% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp index 3ea4bf1..a53534e 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ConvertTopKToTopKIEMatcher; +class INFERENCE_ENGINE_API_CLASS(ConvertTopKToTopKIEMatcher); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp similarity index 84% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp index 3e5b0b3..94db3df 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp @@ -7,9 +7,9 @@ #include #include -#include +#include -#include +#include #include #include #include @@ -25,7 +25,7 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API FullyConnectedBiasFusion; +class INFERENCE_ENGINE_API_CLASS(FullyConnectedBiasFusion); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp similarity index 81% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp index 6cfe345..b3e0d08 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp @@ -7,17 +7,17 @@ #include #include -#include +#include #include namespace ngraph { namespace pass { -class TRANSFORMATIONS_API Reshape1DOps; -class TRANSFORMATIONS_API Reshape1DConvolution; -class TRANSFORMATIONS_API Reshape1DAvgPool; -class TRANSFORMATIONS_API Reshape1DMaxPool; +class INFERENCE_ENGINE_API_CLASS(Reshape1DOps); +class INFERENCE_ENGINE_API_CLASS(Reshape1DConvolution); +class INFERENCE_ENGINE_API_CLASS(Reshape1DAvgPool); +class INFERENCE_ENGINE_API_CLASS(Reshape1DMaxPool); } // namespace pass } // namespace ngraph diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp similarity index 98% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp index b811841..9b76ff9 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp similarity index 93% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp rename to inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp index 9240dfd..4a1f581 100644 --- a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp +++ b/inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include @@ -15,7 +15,7 @@ namespace ngraph { namespace pass { -class TRANSFORMATIONS_API ReshapeFullyConnected; +class INFERENCE_ENGINE_API_CLASS(ReshapeFullyConnected); } // namespace pass } // namespace ngraph 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 c4c666c..4e45abc 100644 --- a/inference-engine/src/legacy_api/src/cnn_network_impl.cpp +++ b/inference-engine/src/legacy_api/src/cnn_network_impl.cpp @@ -21,10 +21,10 @@ #include "cnn_network_ngraph_impl.hpp" #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "legacy/convert_function_to_cnn_network.hpp" #include "legacy/graph_tools.hpp" 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 863de89..50a296f 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 @@ -10,33 +10,33 @@ #include #include "ngraph_ops/convolution_ie.hpp" #include "ngraph_ops/deconvolution_ie.hpp" -#include "ngraph_ops/eltwise.hpp" -#include "ngraph_ops/fully_connected.hpp" -#include "ngraph_ops/gather_ie.hpp" -#include "ngraph_ops/gather_tree_ie.hpp" -#include "ngraph_ops/gru_cell_ie.hpp" -#include "ngraph_ops/interp.hpp" -#include "ngraph_ops/lrn_ie.hpp" -#include "ngraph_ops/lstm_cell_ie.hpp" -#include "ngraph_ops/normalize_ie.hpp" -#include "ngraph_ops/pad_ie.hpp" -#include "ngraph_ops/onehot_ie.hpp" -#include "ngraph_ops/power.hpp" -#include "ngraph_ops/prior_box_clustered_ie.hpp" -#include "ngraph_ops/prior_box_ie.hpp" -#include "ngraph_ops/proposal_ie.hpp" -#include "ngraph_ops/relu_ie.hpp" -#include "ngraph_ops/scaleshift.hpp" -#include "ngraph_ops/tile_ie.hpp" -#include "ngraph_ops/hard_sigmoid_ie.hpp" -#include "ngraph_ops/nms_ie.hpp" -#include "ngraph_ops/crop_ie.hpp" -#include "ngraph_ops/selu_ie.hpp" -#include "ngraph_ops/rnn_cell_ie.hpp" -#include "ngraph_ops/topk_ie.hpp" -#include "ngraph_ops/rnn_sequence_ie.hpp" -#include "ngraph_ops/lstm_sequence_ie.hpp" -#include "ngraph_ops/gru_sequence_ie.hpp" +#include "legacy/ngraph_ops/eltwise.hpp" +#include "legacy/ngraph_ops/fully_connected.hpp" +#include "legacy/ngraph_ops/gather_ie.hpp" +#include "legacy/ngraph_ops/gather_tree_ie.hpp" +#include "legacy/ngraph_ops/gru_cell_ie.hpp" +#include "legacy/ngraph_ops/interp.hpp" +#include "legacy/ngraph_ops/lrn_ie.hpp" +#include "legacy/ngraph_ops/lstm_cell_ie.hpp" +#include "legacy/ngraph_ops/normalize_ie.hpp" +#include "legacy/ngraph_ops/pad_ie.hpp" +#include "legacy/ngraph_ops/onehot_ie.hpp" +#include "legacy/ngraph_ops/power.hpp" +#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp" +#include "legacy/ngraph_ops/prior_box_ie.hpp" +#include "legacy/ngraph_ops/proposal_ie.hpp" +#include "legacy/ngraph_ops/relu_ie.hpp" +#include "legacy/ngraph_ops/scaleshift.hpp" +#include "legacy/ngraph_ops/tile_ie.hpp" +#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp" +#include "legacy/ngraph_ops/nms_ie.hpp" +#include "legacy/ngraph_ops/crop_ie.hpp" +#include "legacy/ngraph_ops/selu_ie.hpp" +#include "legacy/ngraph_ops/rnn_cell_ie.hpp" +#include "legacy/ngraph_ops/topk_ie.hpp" +#include "legacy/ngraph_ops/rnn_sequence_ie.hpp" +#include "legacy/ngraph_ops/lstm_sequence_ie.hpp" +#include "legacy/ngraph_ops/gru_sequence_ie.hpp" #include "generic_ie.hpp" #include "exec_graph_info.hpp" 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 b91c4f0..3f459e8 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 @@ -8,33 +8,33 @@ #include #include -#include "ngraph_ops/crop_ie.hpp" +#include "legacy/ngraph_ops/crop_ie.hpp" #include "ngraph_ops/convolution_ie.hpp" #include "ngraph_ops/deconvolution_ie.hpp" -#include "ngraph_ops/eltwise.hpp" -#include "ngraph_ops/fully_connected.hpp" -#include "ngraph_ops/gather_ie.hpp" -#include "ngraph_ops/gather_tree_ie.hpp" -#include "ngraph_ops/gru_cell_ie.hpp" -#include "ngraph_ops/interp.hpp" -#include "ngraph_ops/lrn_ie.hpp" -#include +#include "legacy/ngraph_ops/eltwise.hpp" +#include "legacy/ngraph_ops/fully_connected.hpp" +#include "legacy/ngraph_ops/gather_ie.hpp" +#include "legacy/ngraph_ops/gather_tree_ie.hpp" +#include "legacy/ngraph_ops/gru_cell_ie.hpp" +#include "legacy/ngraph_ops/interp.hpp" +#include "legacy/ngraph_ops/lrn_ie.hpp" +#include "legacy/ngraph_ops/lstm_cell_ie.hpp" #include -#include "ngraph_ops/normalize_ie.hpp" -#include "ngraph_ops/nms_ie.hpp" -#include "ngraph_ops/onehot_ie.hpp" -#include "ngraph_ops/pad_ie.hpp" -#include "ngraph_ops/power.hpp" -#include "ngraph_ops/prior_box_clustered_ie.hpp" -#include "ngraph_ops/prior_box_ie.hpp" -#include "ngraph_ops/proposal_ie.hpp" -#include "ngraph_ops/relu_ie.hpp" -#include "ngraph_ops/selu_ie.hpp" -#include "ngraph_ops/scaleshift.hpp" -#include "ngraph_ops/tile_ie.hpp" -#include "ngraph_ops/topk_ie.hpp" -#include "ngraph_ops/rnn_cell_ie.hpp" -#include "ngraph_ops/hard_sigmoid_ie.hpp" +#include "legacy/ngraph_ops/normalize_ie.hpp" +#include "legacy/ngraph_ops/nms_ie.hpp" +#include "legacy/ngraph_ops/onehot_ie.hpp" +#include "legacy/ngraph_ops/pad_ie.hpp" +#include "legacy/ngraph_ops/power.hpp" +#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp" +#include "legacy/ngraph_ops/prior_box_ie.hpp" +#include "legacy/ngraph_ops/proposal_ie.hpp" +#include "legacy/ngraph_ops/relu_ie.hpp" +#include "legacy/ngraph_ops/selu_ie.hpp" +#include "legacy/ngraph_ops/scaleshift.hpp" +#include "legacy/ngraph_ops/tile_ie.hpp" +#include "legacy/ngraph_ops/topk_ie.hpp" +#include "legacy/ngraph_ops/rnn_cell_ie.hpp" +#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp" #include "generic_ie.hpp" #include "exec_graph_info.hpp" diff --git a/inference-engine/src/transformations/src/ngraph_ops/crop_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/crop_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/ngraph_ops/crop_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/crop_ie.cpp index 4216b8a..950a1f1 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/crop_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/crop_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/crop_ie.hpp" +#include "legacy/ngraph_ops/crop_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/eltwise.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/eltwise.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/eltwise.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/eltwise.cpp index 0e5229f..c2e486d 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/eltwise.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/eltwise.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/eltwise.hpp" +#include "legacy/ngraph_ops/eltwise.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/fully_connected.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/fully_connected.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/fully_connected.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/fully_connected.cpp index 5427298..0596750 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/fully_connected.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/fully_connected.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/fully_connected.hpp" +#include "legacy/ngraph_ops/fully_connected.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/gather_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/gather_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/gather_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/gather_ie.cpp index f9659ea..35e0957 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/gather_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/gather_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/gather_ie.hpp" +#include "legacy/ngraph_ops/gather_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/gather_tree_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/gather_tree_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/gather_tree_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/gather_tree_ie.cpp index c42f3df..0e3c04c 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/gather_tree_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/gather_tree_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/gather_tree_ie.hpp" +#include "legacy/ngraph_ops/gather_tree_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/gru_cell_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/gru_cell_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/ngraph_ops/gru_cell_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/gru_cell_ie.cpp index a4806bd..fb50c25 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/gru_cell_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/gru_cell_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/gru_cell_ie.hpp" +#include "legacy/ngraph_ops/gru_cell_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/gru_sequence_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/gru_sequence_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/gru_sequence_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/gru_sequence_ie.cpp index 1759c50..532f63f 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/gru_sequence_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/gru_sequence_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/gru_sequence_ie.hpp" +#include "legacy/ngraph_ops/gru_sequence_ie.hpp" #include "ngraph/op/util/recurrent_sequence.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/hard_sigmoid_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/hard_sigmoid_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/hard_sigmoid_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/hard_sigmoid_ie.cpp index df32511..d85796c 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/hard_sigmoid_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/hard_sigmoid_ie.cpp @@ -5,7 +5,7 @@ #include #include -#include "ngraph_ops/hard_sigmoid_ie.hpp" +#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp" #include "ngraph/op/hard_sigmoid.hpp" #include "ngraph/op/constant.hpp" diff --git a/inference-engine/src/transformations/src/ngraph_ops/interp.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/interp.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/interp.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/interp.cpp index 4040631..ae60f7a 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/interp.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/interp.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/interp.hpp" +#include "legacy/ngraph_ops/interp.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/lrn_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/lrn_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/lrn_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/lrn_ie.cpp index ea9b9fe..bd96c94 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/lrn_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/lrn_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/lrn_ie.hpp" +#include "legacy/ngraph_ops/lrn_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/lstm_cell_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/lstm_cell_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/ngraph_ops/lstm_cell_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/lstm_cell_ie.cpp index 58d0fb4..67f417a 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/lstm_cell_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/lstm_cell_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/lstm_cell_ie.hpp" +#include "legacy/ngraph_ops/lstm_cell_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/lstm_sequence_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/lstm_sequence_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/lstm_sequence_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/lstm_sequence_ie.cpp index ba3d0ba..dd0e31b 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/lstm_sequence_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/lstm_sequence_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/lstm_sequence_ie.hpp" +#include "legacy/ngraph_ops/lstm_sequence_ie.hpp" #include "ngraph/op/util/recurrent_sequence.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/nms_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/nms_ie.cpp similarity index 99% rename from inference-engine/src/transformations/src/ngraph_ops/nms_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/nms_ie.cpp index 02473ad..2aba26e 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/nms_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/nms_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/nms_ie.hpp" +#include "legacy/ngraph_ops/nms_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/normalize_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/normalize_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/normalize_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/normalize_ie.cpp index 8c7e1c0..10fb8a6 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/normalize_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/normalize_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/normalize_ie.hpp" +#include "legacy/ngraph_ops/normalize_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/onehot_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/onehot_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/onehot_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/onehot_ie.cpp index a31b886..012b076 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/onehot_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/onehot_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/onehot_ie.hpp" +#include "legacy/ngraph_ops/onehot_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/pad_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/pad_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/ngraph_ops/pad_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/pad_ie.cpp index 4fd08a7..f2cde75 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/pad_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/pad_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/pad_ie.hpp" +#include "legacy/ngraph_ops/pad_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/power.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/power.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/power.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/power.cpp index b1f682a..4967cfd 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/power.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/power.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/power.hpp" +#include "legacy/ngraph_ops/power.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/prior_box_clustered_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/prior_box_clustered_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/prior_box_clustered_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/prior_box_clustered_ie.cpp index ccb80b5..3bacb01 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/prior_box_clustered_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/prior_box_clustered_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/prior_box_clustered_ie.hpp" +#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/prior_box_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/prior_box_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/prior_box_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/prior_box_ie.cpp index 366b2aa..7dbe428 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/prior_box_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/prior_box_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/prior_box_ie.hpp" +#include "legacy/ngraph_ops/prior_box_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/proposal_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/proposal_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/proposal_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/proposal_ie.cpp index b61eba9..385a70a 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/proposal_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/proposal_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/proposal_ie.hpp" +#include "legacy/ngraph_ops/proposal_ie.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/relu_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/relu_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/relu_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/relu_ie.cpp index 9517dce..1c84fd3 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/relu_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/relu_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/relu_ie.hpp" +#include "legacy/ngraph_ops/relu_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/rnn_cell_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/rnn_cell_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/ngraph_ops/rnn_cell_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/rnn_cell_ie.cpp index e5a5e32..e6b4de4 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/rnn_cell_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/rnn_cell_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/rnn_cell_ie.hpp" +#include "legacy/ngraph_ops/rnn_cell_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/rnn_sequence_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/rnn_sequence_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/rnn_sequence_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/rnn_sequence_ie.cpp index e247bba..632ba2e 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/rnn_sequence_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/rnn_sequence_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/rnn_sequence_ie.hpp" +#include "legacy/ngraph_ops/rnn_sequence_ie.hpp" #include "ngraph/op/util/recurrent_sequence.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/scaleshift.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/scaleshift.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/scaleshift.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/scaleshift.cpp index 1af3715..c289ccc 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/scaleshift.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/scaleshift.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/scaleshift.hpp" +#include "legacy/ngraph_ops/scaleshift.hpp" #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/selu_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/selu_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/ngraph_ops/selu_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/selu_ie.cpp index 9430f73..c55d4b8 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/selu_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/selu_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/selu_ie.hpp" +#include "legacy/ngraph_ops/selu_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/swish_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/swish_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/swish_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/swish_ie.cpp index cd04251..e2cd788 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/swish_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/swish_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/swish_ie.hpp" +#include "legacy/ngraph_ops/swish_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/tile_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/tile_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/ngraph_ops/tile_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/tile_ie.cpp index 92d39a7..41b3f25 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/tile_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/tile_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/tile_ie.hpp" +#include "legacy/ngraph_ops/tile_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/ngraph_ops/topk_ie.cpp b/inference-engine/src/legacy_api/src/ngraph_ops/topk_ie.cpp similarity index 98% rename from inference-engine/src/transformations/src/ngraph_ops/topk_ie.cpp rename to inference-engine/src/legacy_api/src/ngraph_ops/topk_ie.cpp index 7bf2d63..59a6687 100644 --- a/inference-engine/src/transformations/src/ngraph_ops/topk_ie.cpp +++ b/inference-engine/src/legacy_api/src/ngraph_ops/topk_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/topk_ie.hpp" +#include "legacy/ngraph_ops/topk_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp index 9b5961e..c7b0059 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp" #include #include @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include "legacy/ngraph_ops/lstm_cell_ie.hpp" +#include "legacy/ngraph_ops/gru_cell_ie.hpp" +#include "legacy/ngraph_ops/rnn_cell_ie.hpp" NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertLSTMCellMatcher, "ConvertLSTMCellMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp index e64340f..3b8e978 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp similarity index 94% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp index cdd1759..705db05 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp similarity index 93% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp index 9353abf..41b80db 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp" #include #include @@ -11,7 +11,7 @@ #include #include -#include +#include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertHardSigmoidToLegacyMatcher, "ConvertHardSigmoidToLegacyMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp index b793315..bc5e200 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp" #include #include @@ -13,7 +13,7 @@ #include #include -#include +#include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertInterpolateToInterpOrResampleMatcher, "ConvertInterpolateToInterpOrResampleMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp index 02206ce..6ce2e68 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp" #include #include @@ -11,7 +11,7 @@ #include #include -#include +#include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertLRNToLegacyMatcher, "ConvertLRNToLegacyMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp index f3d56ab..c6608d4 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp" #include #include @@ -14,7 +14,7 @@ #include #include -#include +#include #include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertMatMulToFC, "ConvertMatMulToFC", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp index 3b27cbc..6606ff1 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp" #include #include @@ -13,8 +13,8 @@ #include "transformations/utils/utils.hpp" -#include "ngraph_ops/power.hpp" -#include "ngraph_ops/scaleshift.hpp" +#include "legacy/ngraph_ops/power.hpp" +#include "legacy/ngraph_ops/scaleshift.hpp" CONVERSION_RESULT check_constant(const std::shared_ptr& constant, const ngraph::PartialShape& shape) { diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp index 6d9eaba..ca6a745 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp @@ -8,11 +8,11 @@ #include #include #include -#include +#include #include #include -#include "transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp" NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertNMS4ToLegacyMatcher, "ConvertNMS4ToLegacyMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp index 3da560e..31dd374 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp index 86e2eed..3ba205e 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -#include "ngraph_ops/normalize_ie.hpp" +#include "legacy/ngraph_ops/normalize_ie.hpp" NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertNormalizeL2WithMulToNormalizeIE, "ConvertNormalizeL2WithMulToNormalizeIE", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp index 625a6a5..f23ce0d 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp" #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp similarity index 61% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp index 77eec04..342f4e8 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp @@ -2,57 +2,51 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp" + +#include "legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp" + #include #include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "ie_legacy_itt.hpp" #include #include @@ -65,7 +59,7 @@ NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertOpSet1ToLegacy, "ConvertOpSet1ToLegacy", 0); bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_function(std::shared_ptr f) { - OV_ITT_SCOPED_TASK(itt::domains::IETransform, "ngraph::pass::ConvertOpSet1ToLegacy"); + OV_ITT_SCOPED_TASK(InferenceEngine::itt::domains::IELegacy, "ngraph::pass::ConvertOpSet1ToLegacy"); ngraph::pass::Manager manager; diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp similarity index 92% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp index 1b5a3bd..272f3d1 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp similarity index 92% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp index 86b54f3..8fc294d 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp" #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp similarity index 92% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp index 9bafda8..3af9f2f 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp" #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp index 556f53b..63a64f3 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp" #include #include @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertPriorBox, "ConvertPriorBox", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp index cc53939..2f8abc8 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp" #include #include @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include bool convert_to_proposal_ie(std::shared_ptr proposal, bool infer_probs = false) { diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp similarity index 94% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp index 826c919..f013efc 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp" #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp index 36bec24..c832d34 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp" #include @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include ngraph::pass::ConvertLSTMSequenceMatcher::ConvertLSTMSequenceMatcher() { auto lstm_sequence_ngraph = ngraph::pattern::wrap_type(); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp similarity index 90% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp index 2e677ab..0d593d8 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp" #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp index c54917f..7b55925 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp" #include #include @@ -10,7 +10,7 @@ #include -#include +#include #include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertStridedSliceToCropMatcher, "ConvertStridedSliceToCropMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp similarity index 92% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp index a52db7c..6279e4a 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp" #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp index c6685ac..083ff7b 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp" #include #include #include -#include +#include #include NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertTileToLegacyMatcher, "ConvertTileToLegacyMatcher", 0); diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp index 8cc6e94..8b01bd4 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp" #include #include @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp index 3247875..274a4f1 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/fc_bias_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp index f457bf9..940a74c 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp rename to inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp index 0cc2be9..1444d3b 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp +++ b/inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp" +#include "legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -#include "ngraph_ops/fully_connected.hpp" +#include "legacy/ngraph_ops/fully_connected.hpp" #include "transformations/utils/utils.hpp" NGRAPH_RTTI_DEFINITION(ngraph::pass::ReshapeFullyConnected, "ReshapeFullyConnected", 0); diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp index 86b246e..39b19a9 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp @@ -22,33 +22,36 @@ #include #include +#include +#include +#include +#include + +#include +#include + #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include + #include #include #include #include #include -#include "ngraph_ops/fully_connected.hpp" #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__) && !defined(_M_ARM64) #if defined(_WIN32) || defined(WIN32) diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/conv_bias_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/conv_bias_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_quantize_dequantize.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_quantize_dequantize.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp diff --git a/inference-engine/src/transformations/include/transformations/depth_to_space_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/depth_to_space_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/hswish_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/hswish_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/hswish_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/hswish_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/lin_op_sequence_fusoin.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/lin_op_sequence_fusoin.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/mish_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/mish_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/mish_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/mish_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/normalize_l2_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/normalize_l2_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/optimize_strided_slice.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/optimize_strided_slice.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp diff --git a/inference-engine/src/transformations/include/transformations/pull_transpose_through_fq.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/pull_transpose_through_fq.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp diff --git a/inference-engine/src/transformations/include/transformations/remove_filtering_boxes_by_size.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/remove_filtering_boxes_by_size.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp diff --git a/inference-engine/src/transformations/include/transformations/softplus_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/softplus_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/softplus_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/softplus_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/softplus_to_mish_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/softplus_to_mish_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/swish_fusion.hpp b/inference-engine/src/transformations/include/transformations/common_optimizations/swish_fusion.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/swish_fusion.hpp rename to inference-engine/src/transformations/include/transformations/common_optimizations/swish_fusion.hpp diff --git a/inference-engine/src/transformations/include/transformations/tensor_iterator_transformations/unroll_tensor_iterator.hpp b/inference-engine/src/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/tensor_iterator_transformations/unroll_tensor_iterator.hpp rename to inference-engine/src/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp diff --git a/inference-engine/src/transformations/include/transformations/batch_norm_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/batch_norm_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/bidirectional_sequences_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/bidirectional_sequences_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_batch_to_space.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_batch_to_space.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_broadcast3.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_broadcast3.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_broadcast3.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_broadcast3.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_broadcast_to_tiles.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_broadcast_to_tiles.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_convolutions.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_convolutions.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset1_to_legacy/convert_convolutions.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_convolutions.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_depth_to_space.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_depth_to_space.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_divide.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_divide.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_divide.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_divide.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_extract_image_patches_to_reorg_yolo.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_extract_image_patches_to_reorg_yolo.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_gelu.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_gelu.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_gelu.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_gelu.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_minimum_to_power_and_max.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_minimum_to_power_and_max.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_mod.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_mod.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_mod.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_mod.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_negative.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_negative.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_negative.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_negative.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_nms3.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_nms3.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_nms3.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_nms3.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_pad_to_group_conv.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_pad_to_group_conv.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_reduce_to_pooling.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_reduce_to_pooling.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_scatter_elements_to_scatter.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_scatter_elements_to_scatter.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_shapeof3.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_shapeof3.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_shapeof3.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_shapeof3.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_shuffle_channels3.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_shuffle_channels3.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_space_to_batch.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_space_to_batch.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_space_to_depth.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_space_to_depth.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_subtract.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_subtract.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_subtract.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_subtract.hpp diff --git a/inference-engine/src/transformations/include/transformations/tensor_iterator_transformations/convert_ti_to_sequences.h b/inference-engine/src/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/tensor_iterator_transformations/convert_ti_to_sequences.h rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_topk3.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/convert_topk3.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_topk3.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/convert_topk3.hpp diff --git a/inference-engine/src/transformations/include/transformations/gru_cell_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/gru_cell_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/hswish_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/hswish_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/hswish_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/hswish_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/lstm_cell_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/lstm_cell_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/reduce_l1_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/reduce_l1_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/reduce_l2_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/reduce_l2_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/rnn_cell_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/rnn_cell_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/softplus_decomposition.hpp b/inference-engine/src/transformations/include/transformations/op_conversions/softplus_decomposition.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/softplus_decomposition.hpp rename to inference-engine/src/transformations/include/transformations/op_conversions/softplus_decomposition.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp b/inference-engine/src/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp rename to inference-engine/src/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp diff --git a/inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp b/inference-engine/src/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp similarity index 100% rename from inference-engine/src/transformations/include/transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp rename to inference-engine/src/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp diff --git a/inference-engine/src/transformations/src/transformations/common_optimizations/common_optimizations.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/common_optimizations.cpp index 4989409..f4e5df8 100644 --- a/inference-engine/src/transformations/src/transformations/common_optimizations/common_optimizations.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/common_optimizations.cpp @@ -4,43 +4,43 @@ #include +#include "transformations/init_node_info.hpp" +#include "transformations/itt.hpp" #include "transformations/common_optimizations/algebraic_simplification.hpp" #include "transformations/common_optimizations/nop_elimination.hpp" #include "transformations/common_optimizations/common_optimizations.hpp" #include "transformations/common_optimizations/conv_mul_fusion.hpp" #include "transformations/common_optimizations/fq_mul_fusion.hpp" #include "transformations/common_optimizations/fq_reshape_fusion.hpp" -#include "transformations/depth_to_space_fusion.hpp" -#include "transformations/optimize_strided_slice.hpp" -#include "transformations/init_node_info.hpp" -#include "transformations/itt.hpp" -#include "transformations/mish_fusion.hpp" -#include "transformations/softplus_fusion.hpp" -#include "transformations/softplus_to_mish_fusion.hpp" -#include "transformations/swish_fusion.hpp" -#include "transformations/normalize_l2_fusion.hpp" -#include "transformations/bidirectional_sequences_decomposition.hpp" -#include "transformations/convert_pad_to_group_conv.hpp" -#include "transformations/convert_divide.hpp" -#include "transformations/convert_quantize_dequantize.hpp" -#include "transformations/convert_mod.hpp" -#include "transformations/convert_minimum_to_power_and_max.hpp" -#include "transformations/convert_negative.hpp" -#include "transformations/convert_scatter_elements_to_scatter.hpp" -#include "transformations/convert_reduce_to_pooling.hpp" -#include "transformations/convert_subtract.hpp" -#include "transformations/convert_depth_to_space.hpp" -#include "transformations/convert_space_to_depth.hpp" -#include "transformations/convert_broadcast_to_tiles.hpp" -#include "transformations/convert_gelu.hpp" -#include "transformations/batch_norm_decomposition.hpp" -#include "transformations/pull_transpose_through_fq.hpp" -#include "transformations/lin_op_sequence_fusoin.hpp" -#include "transformations/reduce_l1_decomposition.hpp" -#include "transformations/reduce_l2_decomposition.hpp" -#include "transformations/remove_filtering_boxes_by_size.hpp" -#include "transformations/hswish_decomposition.hpp" -#include "transformations/hswish_fusion.hpp" +#include "transformations/common_optimizations/depth_to_space_fusion.hpp" +#include "transformations/common_optimizations/optimize_strided_slice.hpp" +#include "transformations/common_optimizations/mish_fusion.hpp" +#include "transformations/common_optimizations/softplus_fusion.hpp" +#include "transformations/common_optimizations/softplus_to_mish_fusion.hpp" +#include "transformations/common_optimizations/swish_fusion.hpp" +#include "transformations/common_optimizations/normalize_l2_fusion.hpp" +#include "transformations/common_optimizations/pull_transpose_through_fq.hpp" +#include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" +#include "transformations/common_optimizations/remove_filtering_boxes_by_size.hpp" +#include "transformations/common_optimizations/hswish_fusion.hpp" +#include "transformations/common_optimizations/convert_quantize_dequantize.hpp" +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/convert_pad_to_group_conv.hpp" +#include "transformations/op_conversions/convert_divide.hpp" +#include "transformations/op_conversions/convert_mod.hpp" +#include "transformations/op_conversions/convert_minimum_to_power_and_max.hpp" +#include "transformations/op_conversions/convert_negative.hpp" +#include "transformations/op_conversions/convert_scatter_elements_to_scatter.hpp" +#include "transformations/op_conversions/convert_reduce_to_pooling.hpp" +#include "transformations/op_conversions/convert_subtract.hpp" +#include "transformations/op_conversions/convert_depth_to_space.hpp" +#include "transformations/op_conversions/convert_space_to_depth.hpp" +#include "transformations/op_conversions/convert_broadcast_to_tiles.hpp" +#include "transformations/op_conversions/convert_gelu.hpp" +#include "transformations/op_conversions/batch_norm_decomposition.hpp" +#include "transformations/op_conversions/reduce_l1_decomposition.hpp" +#include "transformations/op_conversions/reduce_l2_decomposition.hpp" +#include "transformations/op_conversions/hswish_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/conv_bias_fusion.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/conv_bias_fusion.cpp index 0f8e2d7..2cbcb8f 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/conv_bias_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp" +#include "transformations/common_optimizations/conv_bias_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_quantize_dequantize.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/convert_quantize_dequantize.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp index e2a2ca3..4cb11ab 100644 --- a/inference-engine/src/transformations/src/transformations/convert_quantize_dequantize.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_quantize_dequantize.hpp" +#include "transformations/common_optimizations/convert_quantize_dequantize.hpp" #include "transformations/utils/utils.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/depth_to_space_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/depth_to_space_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp index 411bda6..d46a9c1 100644 --- a/inference-engine/src/transformations/src/transformations/depth_to_space_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/depth_to_space_fusion.hpp" +#include "transformations/common_optimizations/depth_to_space_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/hswish_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/hswish_fusion.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/hswish_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/hswish_fusion.cpp index 2a168a4..e64909b 100644 --- a/inference-engine/src/transformations/src/transformations/hswish_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/hswish_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/hswish_fusion.hpp" +#include "transformations/common_optimizations/hswish_fusion.hpp" #include "transformations/utils/utils.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/lin_op_sequence_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/lin_op_sequence_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp index 7b4b010..cfcfe71 100644 --- a/inference-engine/src/transformations/src/transformations/lin_op_sequence_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/lin_op_sequence_fusoin.hpp" +#include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/mish_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/mish_fusion.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/mish_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/mish_fusion.cpp index 267c5b7..bb2a708 100644 --- a/inference-engine/src/transformations/src/transformations/mish_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/mish_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/mish_fusion.hpp" +#include "transformations/common_optimizations/mish_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/normalize_l2_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/normalize_l2_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp index a1b13b5..cea9fa3 100644 --- a/inference-engine/src/transformations/src/transformations/normalize_l2_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/normalize_l2_fusion.hpp" +#include "transformations/common_optimizations/normalize_l2_fusion.hpp" #include "transformations/utils/utils.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/optimize_strided_slice.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/optimize_strided_slice.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp index 8c3608e..67125a0 100644 --- a/inference-engine/src/transformations/src/transformations/optimize_strided_slice.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/transformations/src/transformations/pull_transpose_through_fq.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/pull_transpose_through_fq.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp index 2bfdfdb..047fd19 100644 --- a/inference-engine/src/transformations/src/transformations/pull_transpose_through_fq.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/pull_transpose_through_fq.hpp" +#include "transformations/common_optimizations/pull_transpose_through_fq.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/remove_filtering_boxes_by_size.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/remove_filtering_boxes_by_size.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp index 3406654..56ea8be 100644 --- a/inference-engine/src/transformations/src/transformations/remove_filtering_boxes_by_size.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp @@ -8,7 +8,7 @@ #include #include -#include "transformations/remove_filtering_boxes_by_size.hpp" +#include "transformations/common_optimizations/remove_filtering_boxes_by_size.hpp" NGRAPH_RTTI_DEFINITION(ngraph::pass::RemoveFilteringBoxesBySize, "RemoveFilteringBoxesBySize", 0); diff --git a/inference-engine/src/transformations/src/transformations/softplus_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/softplus_fusion.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/softplus_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/softplus_fusion.cpp index 79386fe..bd57b0a 100644 --- a/inference-engine/src/transformations/src/transformations/softplus_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/softplus_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/softplus_fusion.hpp" +#include "transformations/common_optimizations/softplus_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/softplus_to_mish_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/softplus_to_mish_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp index ead17a3..798da88 100644 --- a/inference-engine/src/transformations/src/transformations/softplus_to_mish_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/softplus_to_mish_fusion.hpp" +#include "transformations/common_optimizations/softplus_to_mish_fusion.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/swish_fusion.cpp b/inference-engine/src/transformations/src/transformations/common_optimizations/swish_fusion.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/swish_fusion.cpp rename to inference-engine/src/transformations/src/transformations/common_optimizations/swish_fusion.cpp index f206f73..0125665 100644 --- a/inference-engine/src/transformations/src/transformations/swish_fusion.cpp +++ b/inference-engine/src/transformations/src/transformations/common_optimizations/swish_fusion.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/swish_fusion.hpp" +#include "transformations/common_optimizations/swish_fusion.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/unroll_tensor_iterator.cpp b/inference-engine/src/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/unroll_tensor_iterator.cpp rename to inference-engine/src/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp index fdca119..53a5262 100644 --- a/inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/unroll_tensor_iterator.cpp +++ b/inference-engine/src/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/tensor_iterator_transformations/unroll_tensor_iterator.hpp" +#include "transformations/control_flow/unroll_tensor_iterator.hpp" #include "transformations/utils/utils.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/batch_norm_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/batch_norm_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp index 080fdb2..97e3182 100644 --- a/inference-engine/src/transformations/src/transformations/batch_norm_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/batch_norm_decomposition.hpp" +#include "transformations/op_conversions/batch_norm_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/bidirectional_sequences_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/bidirectional_sequences_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp index ac5021d..03f0a1b 100644 --- a/inference-engine/src/transformations/src/transformations/bidirectional_sequences_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/convert_batch_to_space.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/convert_batch_to_space.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp index ef709bc..a6d6f3f 100644 --- a/inference-engine/src/transformations/src/transformations/convert_batch_to_space.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_batch_to_space.hpp" +#include "transformations/op_conversions/convert_batch_to_space.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_broadcast3.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast3.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_broadcast3.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast3.cpp index e56d29f..581a9f1 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_broadcast3.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast3.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_broadcast3.hpp" +#include "transformations/op_conversions/convert_broadcast3.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_broadcast_to_tiles.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_broadcast_to_tiles.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp index 939648c..540dd3d 100644 --- a/inference-engine/src/transformations/src/transformations/convert_broadcast_to_tiles.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_broadcast_to_tiles.hpp" +#include "transformations/op_conversions/convert_broadcast_to_tiles.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_convolutions.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_convolutions.cpp index 306f926..7dcdc71 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_convolutions.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_convolutions.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset1_to_legacy/convert_convolutions.hpp" +#include "transformations/op_conversions/convert_convolutions.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_depth_to_space.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_depth_to_space.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp index e2d9de3..07f580c 100644 --- a/inference-engine/src/transformations/src/transformations/convert_depth_to_space.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_depth_to_space.hpp" +#include "transformations/op_conversions/convert_depth_to_space.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_divide.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_divide.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_divide.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_divide.cpp index c257142..9696562 100644 --- a/inference-engine/src/transformations/src/transformations/convert_divide.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_divide.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_divide.hpp" +#include "transformations/op_conversions/convert_divide.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_extract_image_patches_to_reorg_yolo.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_extract_image_patches_to_reorg_yolo.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.cpp index d586011..9fb6e62 100644 --- a/inference-engine/src/transformations/src/transformations/convert_extract_image_patches_to_reorg_yolo.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_extract_image_patches_to_reorg_yolo.hpp" +#include "transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gelu.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_gelu.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gelu.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_gelu.cpp index 2a9fc54..cba0fe6 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset1_to_legacy/convert_gelu.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_gelu.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_minimum_to_power_and_max.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_minimum_to_power_and_max.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp index c6fc6e6..b98c6fa 100644 --- a/inference-engine/src/transformations/src/transformations/convert_minimum_to_power_and_max.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_minimum_to_power_and_max.hpp" +#include "transformations/op_conversions/convert_minimum_to_power_and_max.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_mod.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_mod.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_mod.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_mod.cpp index 9e31801..4df761c 100644 --- a/inference-engine/src/transformations/src/transformations/convert_mod.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_mod.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_mod.hpp" +#include "transformations/op_conversions/convert_mod.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_negative.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_negative.cpp similarity index 94% rename from inference-engine/src/transformations/src/transformations/convert_negative.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_negative.cpp index c264945..422391f 100644 --- a/inference-engine/src/transformations/src/transformations/convert_negative.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_negative.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_negative.hpp" +#include "transformations/op_conversions/convert_negative.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_nms3.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_nms3.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_nms3.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_nms3.cpp index f891710..fa90efa 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_nms3.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_nms3.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_nms3.hpp" +#include "transformations/op_conversions/convert_nms3.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_pad_to_group_conv.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_pad_to_group_conv.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp index b987e96..911bbb8 100644 --- a/inference-engine/src/transformations/src/transformations/convert_pad_to_group_conv.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_pad_to_group_conv.hpp" +#include "transformations/op_conversions/convert_pad_to_group_conv.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_scatter_elements_to_scatter.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/convert_scatter_elements_to_scatter.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp index 1248fab..975c8e2 100644 --- a/inference-engine/src/transformations/src/transformations/convert_scatter_elements_to_scatter.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_scatter_elements_to_scatter.hpp" +#include "transformations/op_conversions/convert_scatter_elements_to_scatter.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shapeof3.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_shapeof3.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shapeof3.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_shapeof3.cpp index 8d1de35..4cf68db 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shapeof3.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_shapeof3.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_shapeof3.hpp" +#include "transformations/op_conversions/convert_shapeof3.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shuffle_channels3.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shuffle_channels3.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp index eb30e3c..ab7511f 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_shuffle_channels3.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_shuffle_channels3.hpp" +#include "transformations/op_conversions/convert_shuffle_channels3.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_space_to_batch.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/convert_space_to_batch.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp index d45b046..2f141cb 100644 --- a/inference-engine/src/transformations/src/transformations/convert_space_to_batch.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_space_to_batch.hpp" +#include "transformations/op_conversions/convert_space_to_batch.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_space_to_depth.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/convert_space_to_depth.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp index 50caba7..d00af46 100644 --- a/inference-engine/src/transformations/src/transformations/convert_space_to_depth.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_space_to_depth.hpp" +#include "transformations/op_conversions/convert_space_to_depth.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_subtract.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_subtract.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/convert_subtract.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_subtract.cpp index 47f05a2..4591f84 100644 --- a/inference-engine/src/transformations/src/transformations/convert_subtract.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_subtract.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_subtract.hpp" +#include "transformations/op_conversions/convert_subtract.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/convert_ti_to_sequences.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp similarity index 99% rename from inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/convert_ti_to_sequences.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp index 9908ed0..9f59c36 100644 --- a/inference-engine/src/transformations/src/transformations/tensor_iterator_transformations/convert_ti_to_sequences.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/tensor_iterator_transformations/convert_ti_to_sequences.h" +#include "transformations/op_conversions/convert_ti_to_sequences.hpp" #include "transformations/utils/utils.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_topk3.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/convert_topk3.cpp similarity index 97% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_topk3.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/convert_topk3.cpp index b555bef..112a637 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_topk3.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/convert_topk3.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_topk3.hpp" +#include "transformations/op_conversions/convert_topk3.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/gru_cell_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/gru_cell_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp index 6a3d1c9..88fa5f2 100644 --- a/inference-engine/src/transformations/src/transformations/gru_cell_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/gru_cell_decomposition.hpp" +#include "transformations/op_conversions/gru_cell_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/hswish_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/hswish_decomposition.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/hswish_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/hswish_decomposition.cpp index e0a52fb..48fff5a 100644 --- a/inference-engine/src/transformations/src/transformations/hswish_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/hswish_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/hswish_decomposition.hpp" +#include "transformations/op_conversions/hswish_decomposition.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/lstm_cell_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp similarity index 98% rename from inference-engine/src/transformations/src/transformations/lstm_cell_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp index 6f062ba..a93d3fa 100644 --- a/inference-engine/src/transformations/src/transformations/lstm_cell_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/lstm_cell_decomposition.hpp" +#include "transformations/op_conversions/lstm_cell_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/reduce_l1_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/reduce_l1_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp index 6d83866..0fe67ae 100644 --- a/inference-engine/src/transformations/src/transformations/reduce_l1_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/reduce_l1_decomposition.hpp" +#include "transformations/op_conversions/reduce_l1_decomposition.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/reduce_l2_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/reduce_l2_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp index 87c58b5..14ebe79 100644 --- a/inference-engine/src/transformations/src/transformations/reduce_l2_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/reduce_l2_decomposition.hpp" +#include "transformations/op_conversions/reduce_l2_decomposition.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/rnn_cell_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp similarity index 96% rename from inference-engine/src/transformations/src/transformations/rnn_cell_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp index f294ee1..2e4fd9a 100644 --- a/inference-engine/src/transformations/src/transformations/rnn_cell_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/rnn_cell_decomposition.hpp" +#include "transformations/op_conversions/rnn_cell_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/softplus_decomposition.cpp b/inference-engine/src/transformations/src/transformations/op_conversions/softplus_decomposition.cpp similarity index 95% rename from inference-engine/src/transformations/src/transformations/softplus_decomposition.cpp rename to inference-engine/src/transformations/src/transformations/op_conversions/softplus_decomposition.cpp index 16a373e..5dcb465 100644 --- a/inference-engine/src/transformations/src/transformations/softplus_decomposition.cpp +++ b/inference-engine/src/transformations/src/transformations/op_conversions/softplus_decomposition.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/softplus_decomposition.hpp" +#include "transformations/op_conversions/softplus_decomposition.hpp" #include #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.cpp b/inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp similarity index 75% rename from inference-engine/src/transformations/src/transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.cpp rename to inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp index ded5783..558cbe8 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.cpp +++ b/inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp @@ -2,11 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp" +#include "transformations/opset_conversions/convert_opset2_to_opset1.hpp" -#include "transformations/convert_gelu.hpp" -#include "transformations/convert_batch_to_space.hpp" -#include "transformations/convert_space_to_batch.hpp" +#include "transformations/op_conversions/convert_batch_to_space.hpp" +#include "transformations/op_conversions/convert_space_to_batch.hpp" #include "transformations/itt.hpp" #include diff --git a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.cpp b/inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp similarity index 64% rename from inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.cpp rename to inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp index 9689256..02c45bd 100644 --- a/inference-engine/src/transformations/src/transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.cpp +++ b/inference-engine/src/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp" - -#include "transformations/convert_opset3_to_opset2/convert_broadcast3.hpp" -#include "transformations/convert_opset3_to_opset2/convert_nms3.hpp" -#include "transformations/convert_opset3_to_opset2/convert_shapeof3.hpp" -#include "transformations/convert_opset3_to_opset2/convert_shuffle_channels3.hpp" -#include "transformations/convert_opset3_to_opset2/convert_topk3.hpp" -#include "transformations/convert_extract_image_patches_to_reorg_yolo.hpp" -#include "transformations/softplus_decomposition.hpp" +#include "transformations/opset_conversions/convert_opset3_to_opset2.hpp" + +#include "transformations/op_conversions/convert_broadcast3.hpp" +#include "transformations/op_conversions/convert_nms3.hpp" +#include "transformations/op_conversions/convert_shapeof3.hpp" +#include "transformations/op_conversions/convert_shuffle_channels3.hpp" +#include "transformations/op_conversions/convert_topk3.hpp" +#include "transformations/op_conversions/convert_extract_image_patches_to_reorg_yolo.hpp" +#include "transformations/op_conversions/softplus_decomposition.hpp" #include "transformations/itt.hpp" #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 1834b33..32a6c40 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp @@ -25,10 +25,10 @@ #include #include #include -#include -#include -#include -#include +#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 a1d2f6c..e43c402 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 @@ -19,7 +19,7 @@ #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 3f22b42..43f1457 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 @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #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 8a53c62..703b4fc 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 @@ -15,11 +15,11 @@ #include #include "ngraph_functions/subgraph_builders.hpp" #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "generic_ie.hpp" #include "functional_test_utils/low_precision_transformations/layer_transformation.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/batch_to_space_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/batch_to_space_decomposition_test.cpp index 7d16f11..3017e2e 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/batch_to_space_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/batch_to_space_decomposition_test.cpp @@ -13,9 +13,8 @@ #include #include #include -#include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp index 39f1baa..5125f03 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp index 2f0aaeb..65ad9f1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_cells_to_cells_ie_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_cells_to_cells_ie_test.cpp index 3f6bff5..d1e8248 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_cells_to_cells_ie_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_cells_to_cells_ie_test.cpp @@ -16,11 +16,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp index 0937cea..2dcbf29 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp index 21f83d8..0244f5d 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_divide.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_divide.cpp index 655c8ab..21efa57 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_divide.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_divide.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_extract_image_patches_to_reorg_yolo_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_extract_image_patches_to_reorg_yolo_test.cpp index 5cccbd8..f9347e4 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_extract_image_patches_to_reorg_yolo_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_extract_image_patches_to_reorg_yolo_test.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_gather_to_gather_ie.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_gather_to_gather_ie.cpp index d13c2b6..80a0020 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_gather_to_gather_ie.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_gather_to_gather_ie.cpp @@ -10,10 +10,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_matmul_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_matmul_test.cpp index f40bfe9..db462a4 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_matmul_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_matmul_test.cpp @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_nms3_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_nms3_test.cpp index 497cba2..ae4ee04 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_nms3_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_nms3_test.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_nms4_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_nms4_test.cpp index 3c5d045..6b62756 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_nms4_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_nms4_test.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_nms_to_nms_ie_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_nms_to_nms_ie_test.cpp index cf88cce..07529e1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_nms_to_nms_ie_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_nms_to_nms_ie_test.cpp @@ -11,10 +11,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_pad_to_group_conv.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_pad_to_group_conv.cpp index 3b38707..66ef8d6 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_pad_to_group_conv.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_pad_to_group_conv.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_quantize_dequantize.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_quantize_dequantize.cpp index bdb44ce..9d107fa 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_quantize_dequantize.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_quantize_dequantize.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp index d646ec1..c63b7bd 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp index e12520e..edcabe5 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_scatter_elements_to_scatter_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_sequences_to_sequences_ie_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_sequences_to_sequences_ie_test.cpp index 71d5ea5..00ce827 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_sequences_to_sequences_ie_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_sequences_to_sequences_ie_test.cpp @@ -8,14 +8,14 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include "common_test_utils/test_common.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_shapeof3.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_shapeof3.cpp index f24e865..d19423b 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_shapeof3.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_shapeof3.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_shuffle_channels3_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_shuffle_channels3_test.cpp index 4ed49a0..ef45e69 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_shuffle_channels3_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_shuffle_channels3_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_strided_slice_to_crop_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_strided_slice_to_crop_test.cpp index 9a09144..8f5d414 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_strided_slice_to_crop_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_strided_slice_to_crop_test.cpp @@ -17,9 +17,9 @@ #include #include #include -#include +#include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_ti_to_sequences_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_ti_to_sequences_test.cpp index 65e24b3..608e7f9 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_ti_to_sequences_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_ti_to_sequences_test.cpp @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_topk3_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_topk3_test.cpp index 334a8cf..b9849cc 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_topk3_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_topk3_test.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_topk_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_topk_test.cpp index 37a89d4..233a19c 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_topk_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_topk_test.cpp @@ -10,10 +10,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/depth_to_space_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/depth_to_space_fusion_test.cpp index 1b42d69..0ed942a 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/depth_to_space_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/depth_to_space_fusion_test.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/fc_bias_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/fc_bias_fusion_test.cpp index 9192179..54dfd99 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/fc_bias_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/fc_bias_fusion_test.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/hswish_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/hswish_decomposition_test.cpp index 7356a79..f504680 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/hswish_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/hswish_decomposition_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/hswish_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/hswish_fusion_test.cpp index fb34a24..b360595 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/hswish_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/hswish_fusion_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/lin_op_sequence_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/lin_op_sequence_fusion_test.cpp index c7f84d1..dcd9b39 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/lin_op_sequence_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/lin_op_sequence_fusion_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/mish_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/mish_fusion_test.cpp index 1921148..7c202a1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/mish_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/mish_fusion_test.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp index 8eb6ae6..5ca6ad1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp @@ -17,12 +17,12 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp index 5953d23..0b61df3 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/ngraph_1d_ops_reshape_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/ngraph_depth_to_space_transform_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/ngraph_depth_to_space_transform_test.cpp index 5132c5d..692e784 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/ngraph_depth_to_space_transform_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/ngraph_depth_to_space_transform_test.cpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/ngraph_fq_transpose_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/ngraph_fq_transpose_test.cpp index a8cf29b..7af719b 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/ngraph_fq_transpose_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/ngraph_fq_transpose_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/ngraph_mode_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/ngraph_mode_decomposition_test.cpp index 81f1d5d..1db87ec 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/ngraph_mode_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/ngraph_mode_decomposition_test.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/normalize_l2_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/normalize_l2_fusion_test.cpp index 7c02aca..6389749 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/normalize_l2_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/normalize_l2_fusion_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/optimize_strided_slice_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/optimize_strided_slice_test.cpp index 7c16c59..5d01d5d 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/optimize_strided_slice_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/optimize_strided_slice_test.cpp @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/reduce_l1_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/reduce_l1_decomposition_test.cpp index db9a68a..239a737 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/reduce_l1_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/reduce_l1_decomposition_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/reduce_l2_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/reduce_l2_decomposition_test.cpp index 4306fba..31a4d47 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/reduce_l2_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/reduce_l2_decomposition_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/reshape_fc_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/reshape_fc_fusion_test.cpp index ba634af..7ee29b7 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/reshape_fc_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/reshape_fc_fusion_test.cpp @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/inference-engine/tests/functional/inference_engine/transformations/softplus_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/softplus_decomposition_test.cpp index 952a50f..52ecf6e 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/softplus_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/softplus_decomposition_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/softplus_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/softplus_fusion_test.cpp index d7a2f9e..dcb6bd0 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/softplus_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/softplus_fusion_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/swish_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/swish_fusion_test.cpp index e6125ae..27b5740 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/swish_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/swish_fusion_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/tests/functional/inference_engine/transformations/unroll_tensor_iterator_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/unroll_tensor_iterator_test.cpp index d19024c..6a99ebf 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/unroll_tensor_iterator_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/unroll_tensor_iterator_test.cpp @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp index d4ee0cd..ba283ab 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp @@ -9,7 +9,7 @@ #include "ie_system_conf.h" #include -#include +#include namespace LayerTestsDefinitions { 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 a384b22..8bf3e51 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 @@ -16,10 +16,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include 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 4a3cc72..16b4bb8 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 @@ -16,10 +16,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index 98a48e2..c94dbd4 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -21,10 +21,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp index fa004c1..1882437 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_cell.cpp @@ -16,7 +16,7 @@ #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/skip_tests_config.hpp" -#include +#include #include "single_layer_tests/gru_cell.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp index f1d8afe..eb4bc78 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/gru_sequence.cpp @@ -17,7 +17,7 @@ #include "functional_test_utils/skip_tests_config.hpp" #include "single_layer_tests/gru_sequence.hpp" -#include +#include namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp index 733c740..cb46306 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_cell.cpp @@ -16,7 +16,7 @@ #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/skip_tests_config.hpp" -#include +#include #include "single_layer_tests/lstm_cell.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp index d910194..e47b753 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/lstm_sequence.cpp @@ -17,7 +17,7 @@ #include "functional_test_utils/skip_tests_config.hpp" #include "single_layer_tests/lstm_sequence.hpp" -#include +#include namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp index 174f920..1530eaa 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/prior_box_clustered.cpp @@ -20,7 +20,7 @@ #include "functional_test_utils/layer_test_utils.hpp" #include "single_layer_tests/prior_box_clustered.hpp" -#include "ngraph_ops/prior_box_clustered_ie.hpp" +#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp" namespace LayerTestsDefinitions { std::string PriorBoxClusteredLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp index ec86160..059c0f7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_cell.cpp @@ -16,7 +16,7 @@ #include "functional_test_utils/plugin_cache.hpp" #include "functional_test_utils/skip_tests_config.hpp" -#include +#include #include "single_layer_tests/rnn_cell.hpp" namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp index 90ac191..cd3c6fd 100644 --- a/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/single_layer_tests/rnn_sequence.cpp @@ -17,7 +17,7 @@ #include "functional_test_utils/skip_tests_config.hpp" #include "single_layer_tests/rnn_sequence.hpp" -#include +#include namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp index da959ed..c5d4a75 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/conv_eltwise_fusion.cpp @@ -8,8 +8,8 @@ #include "subgraph_tests/conv_eltwise_fusion.hpp" #include #include -#include -#include +#include +#include namespace LayerTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp index b9d9761..051aa47 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/memory_LSTMCell.cpp @@ -18,7 +18,7 @@ #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include +#include #include "subgraph_tests/memory_LSTMCell.hpp" namespace SubgraphTestsDefinitions { diff --git a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp index d8b772a..2253296 100644 --- a/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/subgraph_tests/multiple_LSTMCell.cpp @@ -18,7 +18,7 @@ #include "ngraph_functions/utils/ngraph_helpers.hpp" #include "ngraph_functions/builders.hpp" -#include +#include #include "subgraph_tests/multiple_LSTMCell.hpp" namespace SubgraphTestsDefinitions { diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp index 7409965..d53d4fb 100644 --- a/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp +++ b/inference-engine/tests/ie_test_utils/functional_test_utils/layer_test_utils.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include +#include +#include #include "layer_test_utils.hpp" diff --git a/inference-engine/tests/unit/cpu/bf16_transformer_test.cpp b/inference-engine/tests/unit/cpu/bf16_transformer_test.cpp index 7692c14..2678f2f 100644 --- a/inference-engine/tests/unit/cpu/bf16_transformer_test.cpp +++ b/inference-engine/tests/unit/cpu/bf16_transformer_test.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp index c565d6d..d1dd417 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include "../gna_matcher.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp index 962c31c..2b42d35 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "../gna_matcher.hpp" using namespace InferenceEngine; diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/get_vpu_scale_from_ir_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/get_vpu_scale_from_ir_tests.cpp index 7f96dd9..cbb1fc2 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/get_vpu_scale_from_ir_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/get_vpu_scale_from_ir_tests.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include -- 2.7.4