Reshape v7: remove (#1379)
authorIlya Lavrenov <ilya.lavrenov@intel.com>
Tue, 15 Sep 2020 12:08:17 +0000 (15:08 +0300)
committerGitHub <noreply@github.com>
Tue, 15 Sep 2020 12:08:17 +0000 (15:08 +0300)
commit9ca5fbaf02ceff69392a4d595a9d128c27c4b89b
tree233004ebfac028fecfbf057f9757fc9f85c59824
parent9e8b42ff95a49acadbdf7770456c554d17242c45
Reshape v7: remove (#1379)

* Removed shape inference fr IR v7 and older

* Disabled dynamic batch tests which require reshape

* Fixes tests 2

* Disabled MKLDNN tests with convolution reshape

* Fixed GPU tests

* Disable VPU tests with batch size > 1 for old IRs

* Removed most of shape infer functions for old representation

* Removed most of CNNLayer validators

* Fixed validators and keep only parseParams

* Removed tests on invalid IR v7

* Disabled more VPU tests

* Removed Backetize validator

* Disable one more Myriad tests case where reshape for old IR is needed

* Removed useless reshape

* Need to replace GRUCell with Unique

* Moved shape infer functions for experimental layers to Core IE

* Fixed shape inference functions not to depend on legacy

* Added missed SparseToDense

* Added descriptive error message

* Fixed comments
163 files changed:
inference-engine/src/inference_engine/CMakeLists.txt
inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp
inference-engine/src/inference_engine/generic_ie.cpp
inference-engine/src/inference_engine/shape_infer/ie_built_in_holder.cpp [new file with mode: 0644]
inference-engine/src/inference_engine/shape_infer/ie_built_in_holder.hpp [moved from inference-engine/src/legacy_api/include/legacy/shape_infer/built-in/ie_built_in_holder.hpp with 86% similarity]
inference-engine/src/inference_engine/shape_infer/ie_built_in_impl.hpp [new file with mode: 0644]
inference-engine/src/inference_engine/shape_infer/ie_detectionoutput_onnx_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detectionoutput_onnx_shape_infer.hpp with 67% similarity]
inference-engine/src/inference_engine/shape_infer/ie_ishape_infer_extension.hpp [moved from inference-engine/src/legacy_api/include/legacy/ie_ishape_infer_extension.hpp with 100% similarity]
inference-engine/src/inference_engine/shape_infer/ie_priorgridgenerator_onnx_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorgridgenerator_onnx_shape_infer.hpp with 80% similarity]
inference-engine/src/inference_engine/shape_infer/ie_proposal_onnx_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_proposal_onnx_shape_infer.hpp with 71% similarity]
inference-engine/src/inference_engine/shape_infer/ie_proposal_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_proposal_shape_infer.hpp with 64% similarity]
inference-engine/src/inference_engine/shape_infer/ie_rnn_cell_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_rnn_cell_shape_infer.hpp with 60% similarity]
inference-engine/src/inference_engine/shape_infer/ie_roifeatureextractor_onnx_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roifeatureextractor_onnx_shape_infer.hpp with 74% similarity]
inference-engine/src/inference_engine/shape_infer/ie_simpler_nms_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_simpler_nms_shape_infer.hpp with 71% similarity]
inference-engine/src/inference_engine/shape_infer/ie_sparse_to_dense_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_sparse_to_dense_shape_infer.hpp with 69% similarity]
inference-engine/src/inference_engine/shape_infer/ie_topkrois_onnx_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_topkrois_onnx_shape_infer.hpp with 67% similarity]
inference-engine/src/inference_engine/shape_infer/ie_unique_shape_infer.hpp [moved from inference-engine/src/legacy_api/src/shape_infer/built-in/ie_unique_shape_infer.hpp with 73% similarity]
inference-engine/src/legacy_api/include/legacy/cnn_network_impl.hpp
inference-engine/src/legacy_api/src/cnn_network_impl.cpp
inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_argmax_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_bin_conv_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_broadcast_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_bucketize_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_holder.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_concat_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_conv_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_crop_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_ctc_greedy_decoder_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_deconv_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_deformable_conv_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_depth_to_space_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_detection_output_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_eltwise_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_equal_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_erf_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_fill_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_flatten_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_gather_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_gather_tree_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_gemm_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_inner_product_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_interp_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_non_max_suppression_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_one_hot_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_pad_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_permute_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_pool_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_clustered_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_priorbox_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_psroi_pooling_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_quantize_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_range_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reduce_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_region_yolo_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reorg_yolo_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_resample_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reshape_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_reverse_sequence_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_rnn_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_roi_pooling_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_scatter_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_select_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_shape_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_shuffle_channels_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_space_to_depth_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_sparse_fill_empty_rows_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_sparse_segment_reduce_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_sparse_weighted_reduce_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_split_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_squeeze_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_strided_slice_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tensor_iterator_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_tile_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_topk_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_unsqueeze_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/ie_upsampling_shape_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/built-in/impl_register.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/broadcast_offset.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_add_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_broadcast_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_concat_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_impl.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_impl.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_convert_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_div_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_eltw_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_fill_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_gather_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_in_place_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_mul_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_onehot_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_permute_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_pow_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_power_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_range_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reduce_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_reshape_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_shape_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_split_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_strided_slice_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_sub_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_tile_const_infer.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshape_io_controllers.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshape_launcher.hpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp [deleted file]
inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp [deleted file]
inference-engine/src/mkldnn_plugin/mkldnn_extension_mngr.h
inference-engine/src/mkldnn_plugin/nodes/mkldnn_generic_node.h
inference-engine/src/plugin_api/generic_ie.hpp
inference-engine/tests/ie_test_utils/unit_test_utils/empty.cpp
inference-engine/tests/ie_test_utils/unit_test_utils/mocks/shape_infer/mock_input_controller.hpp [deleted file]
inference-engine/tests/ie_test_utils/unit_test_utils/mocks/shape_infer/mock_ishape_infer_impl.hpp [deleted file]
inference-engine/tests/ie_test_utils/unit_test_utils/mocks/shape_infer/mock_output_controller.hpp [deleted file]
inference-engine/tests/ie_test_utils/unit_test_utils/mocks/shape_infer/mock_reshaper_launcher.hpp [deleted file]
inference-engine/tests_deprecated/behavior/cldnn/CMakeLists.txt
inference-engine/tests_deprecated/behavior/gna/CMakeLists.txt
inference-engine/tests_deprecated/behavior/mkldnn/CMakeLists.txt
inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt
inference-engine/tests_deprecated/functional/cldnn/CMakeLists.txt
inference-engine/tests_deprecated/functional/cldnn/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp
inference-engine/tests_deprecated/functional/gna/CMakeLists.txt
inference-engine/tests_deprecated/functional/mkldnn/CMakeLists.txt
inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp
inference-engine/tests_deprecated/functional/mkldnn/single_layer_tests/conv_tests.cpp
inference-engine/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp
inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_concat_test.hpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convert_test.hpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution_test.cpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_test.hpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_floor_test.hpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_log_test.hpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_squeeze_test.cpp
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_unsqueeze_test.hpp
inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp
inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/io_blob_tests/dims_tests.cpp
inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/io_blob_tests/layout_tests.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/extensions/fake_layer.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_activation_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_batchnorm_scaleshift_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_batchnorm_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_concat_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_conv_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_deconv_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_depthwise_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_eltwise_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_fullyconnected_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_gemm_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_lrn_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_pooling_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_power_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_softmax_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_split_test.cpp
inference-engine/tests_deprecated/unit/engines/mkldnn/graph/layers/internal/graph_tile_test.cpp
inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.cpp