From 8c118ef8b2517aff2fed1506a0c112d09a037dcf Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 7 Aug 2020 06:24:28 +0300 Subject: [PATCH] Moved caseless to Plugin API (#1664) --- inference-engine/src/cldnn_engine/cldnn_engine.cpp | 2 +- inference-engine/src/cldnn_engine/cldnn_program.cpp | 2 +- inference-engine/src/gna_plugin/gna_graph_compiler.cpp | 2 +- inference-engine/src/gna_plugin/gna_plugin_config.cpp | 2 +- inference-engine/src/gna_plugin/layers/gna_layer_info.hpp | 2 +- inference-engine/src/gna_plugin/layers/gna_layer_type.hpp | 2 +- inference-engine/src/gna_plugin/layers/layers_builder.hpp | 2 +- inference-engine/src/hetero_plugin/hetero_executable_network.cpp | 2 +- inference-engine/src/legacy_api/include/graph_transformer.h | 2 +- .../legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp | 2 +- .../src/legacy_api/src/convert_function_to_cnn_network.cpp | 2 +- inference-engine/src/legacy_api/src/ie_layer_validators.hpp | 2 +- inference-engine/src/legacy_api/src/ie_util_internal.cpp | 2 +- .../legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp | 2 +- inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp | 2 +- .../src/low_precision_transformations/src/activation.cpp | 2 +- inference-engine/src/low_precision_transformations/src/concat.cpp | 2 +- .../src/low_precision_transformations/src/concat_multi_channels.cpp | 2 +- inference-engine/src/low_precision_transformations/src/const.cpp | 2 +- .../src/low_precision_transformations/src/convolution.cpp | 2 +- .../src/low_precision_transformations/src/depth_to_space.cpp | 2 +- inference-engine/src/low_precision_transformations/src/eltwise.cpp | 2 +- .../src/low_precision_transformations/src/fake_quantize.cpp | 2 +- .../src/low_precision_transformations/src/fully_connected.cpp | 2 +- .../src/fuse_fake_quantize_and_scale_shift.cpp | 2 +- inference-engine/src/low_precision_transformations/src/gemm.cpp | 2 +- inference-engine/src/low_precision_transformations/src/mvn.cpp | 2 +- .../src/low_precision_transformations/src/network_helper.cpp | 2 +- inference-engine/src/low_precision_transformations/src/normalize.cpp | 2 +- inference-engine/src/low_precision_transformations/src/permute.cpp | 2 +- inference-engine/src/low_precision_transformations/src/pooling.cpp | 2 +- inference-engine/src/low_precision_transformations/src/power.cpp | 2 +- inference-engine/src/low_precision_transformations/src/reshape.cpp | 2 +- .../low_precision_transformations/src/scaleshift_to_convolution.cpp | 2 +- inference-engine/src/low_precision_transformations/src/squeeze.cpp | 2 +- .../src/low_precision_transformations/src/transformer.cpp | 2 +- .../src/weightable_layer_transformation.cpp | 2 +- inference-engine/src/mkldnn_plugin/bf16transformer.h | 2 +- inference-engine/src/mkldnn_plugin/mkldnn_node.cpp | 2 +- inference-engine/src/mkldnn_plugin/nodes/extract_image_patches.cpp | 2 +- inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.h | 2 +- inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp | 2 +- inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp | 2 +- inference-engine/{include/details => src/plugin_api}/caseless.hpp | 0 inference-engine/src/plugin_api/details/caseless.hpp | 5 +++++ inference-engine/src/readers/ir_reader/ie_ir_parser.cpp | 2 +- inference-engine/src/readers/ir_reader_v7/ie_format_parser.h | 2 +- inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp | 2 +- inference-engine/src/vpu/common/include/vpu/utils/string.hpp | 2 +- .../src/vpu/graph_transformer/include/vpu/frontend/custom_layer.hpp | 2 +- .../src/vpu/graph_transformer/include/vpu/graph_transformer.hpp | 2 +- .../src/vpu/graph_transformer/src/frontend/custom_kernel.cpp | 2 +- .../src/vpu/graph_transformer/src/frontend/custom_layer.cpp | 2 +- .../src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp | 2 +- inference-engine/src/vpu/graph_transformer/src/stages/proposal.cpp | 2 +- .../tests/functional/inference_engine/caseless_tests.cpp | 2 +- .../functional/shared_tests/transformations/common/validation.hpp | 2 +- inference-engine/tools/compile_tool/CMakeLists.txt | 1 + 58 files changed, 61 insertions(+), 55 deletions(-) rename inference-engine/{include/details => src/plugin_api}/caseless.hpp (100%) create mode 100644 inference-engine/src/plugin_api/details/caseless.hpp diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp index 6c797f3..ea21b51 100644 --- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp @@ -20,7 +20,7 @@ #include #include #include "ie_plugin_config.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include
#include #include diff --git a/inference-engine/src/cldnn_engine/cldnn_program.cpp b/inference-engine/src/cldnn_engine/cldnn_program.cpp index c799a04..d29e71e 100644 --- a/inference-engine/src/cldnn_engine/cldnn_program.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_program.cpp @@ -80,7 +80,7 @@ #include #include "cldnn_infer_request.h" #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include #include #include diff --git a/inference-engine/src/gna_plugin/gna_graph_compiler.cpp b/inference-engine/src/gna_plugin/gna_graph_compiler.cpp index c4dee7f..066cc6f 100644 --- a/inference-engine/src/gna_plugin/gna_graph_compiler.cpp +++ b/inference-engine/src/gna_plugin/gna_graph_compiler.cpp @@ -24,7 +24,7 @@ #include "gna_plugin_log.hpp" #include "layers/gna_layer_info.hpp" #include "ie_memcpy.h" -#include "details/caseless.hpp" +#include "caseless.hpp" #include "gna-api.h" #include "backend/am_intel_dnn.hpp" #include "runtime/pwl.h" diff --git a/inference-engine/src/gna_plugin/gna_plugin_config.cpp b/inference-engine/src/gna_plugin/gna_plugin_config.cpp index 163b2f1..cb7f9c7 100644 --- a/inference-engine/src/gna_plugin/gna_plugin_config.cpp +++ b/inference-engine/src/gna_plugin/gna_plugin_config.cpp @@ -6,7 +6,7 @@ #include "gna_plugin.hpp" #include "gna_plugin_config.hpp" #include "ie_common.h" -#include
+#include #include using namespace InferenceEngine; diff --git a/inference-engine/src/gna_plugin/layers/gna_layer_info.hpp b/inference-engine/src/gna_plugin/layers/gna_layer_info.hpp index 7e8910a..aacc2fe 100644 --- a/inference-engine/src/gna_plugin/layers/gna_layer_info.hpp +++ b/inference-engine/src/gna_plugin/layers/gna_layer_info.hpp @@ -8,7 +8,7 @@ #include #include #include "inference_engine.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_algorithm.hpp" #include "gna-api.h" #include "gna_permute.hpp" diff --git a/inference-engine/src/gna_plugin/layers/gna_layer_type.hpp b/inference-engine/src/gna_plugin/layers/gna_layer_type.hpp index fdc762c..8456999 100644 --- a/inference-engine/src/gna_plugin/layers/gna_layer_type.hpp +++ b/inference-engine/src/gna_plugin/layers/gna_layer_type.hpp @@ -8,7 +8,7 @@ #include #include -#include
+#include #include "backend/dnn_types.h" diff --git a/inference-engine/src/gna_plugin/layers/layers_builder.hpp b/inference-engine/src/gna_plugin/layers/layers_builder.hpp index f3ecb4d..8d2d535 100644 --- a/inference-engine/src/gna_plugin/layers/layers_builder.hpp +++ b/inference-engine/src/gna_plugin/layers/layers_builder.hpp @@ -8,7 +8,7 @@ #include #include -#include
+#include #include "gna_graph_compiler.hpp" namespace GNAPluginNS { diff --git a/inference-engine/src/hetero_plugin/hetero_executable_network.cpp b/inference-engine/src/hetero_plugin/hetero_executable_network.cpp index 3cb19fc..c0bfc5f 100644 --- a/inference-engine/src/hetero_plugin/hetero_executable_network.cpp +++ b/inference-engine/src/hetero_plugin/hetero_executable_network.cpp @@ -9,7 +9,7 @@ #include "hetero_graph_splitter.hpp" #include "hetero_itt.hpp" #include "xml_parse_utils.h" -#include
+#include #include #include diff --git a/inference-engine/src/legacy_api/include/graph_transformer.h b/inference-engine/src/legacy_api/include/graph_transformer.h index 929ba4b..36c678e 100644 --- a/inference-engine/src/legacy_api/include/graph_transformer.h +++ b/inference-engine/src/legacy_api/include/graph_transformer.h @@ -9,7 +9,7 @@ #pragma once -#include
+#include #include #include #include diff --git a/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp b/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp index bfff058..55d7565 100644 --- a/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp +++ b/inference-engine/src/legacy_api/include/shape_infer/built-in/ie_built_in_holder.hpp @@ -13,7 +13,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" namespace InferenceEngine { namespace ShapeInfer { 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 c00d8f3..1e386b5 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 @@ -38,7 +38,7 @@ #include "exec_graph_info.hpp" #include "ie_cnn_layer_builder_ngraph.h" -#include "details/caseless.hpp" +#include "caseless.hpp" #include #include diff --git a/inference-engine/src/legacy_api/src/ie_layer_validators.hpp b/inference-engine/src/legacy_api/src/ie_layer_validators.hpp index 9028af4..a7ab5b6 100644 --- a/inference-engine/src/legacy_api/src/ie_layer_validators.hpp +++ b/inference-engine/src/legacy_api/src/ie_layer_validators.hpp @@ -9,7 +9,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_layers.h" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/ie_util_internal.cpp b/inference-engine/src/legacy_api/src/ie_util_internal.cpp index dc2764d..846efef 100644 --- a/inference-engine/src/legacy_api/src/ie_util_internal.cpp +++ b/inference-engine/src/legacy_api/src/ie_util_internal.cpp @@ -17,7 +17,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "details/ie_cnn_network_tools.h" #include "graph_tools.hpp" #include "net_pass.h" diff --git a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp index 9d78514..555d128 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/const_infer/ie_const_infer_holder.hpp @@ -13,7 +13,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_const_infer_impl.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp index 82c415e..f7b4fb5 100644 --- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp +++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.hpp @@ -14,7 +14,7 @@ #include #include "ie_ishape_infer_extension.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_icnn_network.hpp" #include "ie_reshape_launcher.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/activation.cpp b/inference-engine/src/low_precision_transformations/src/activation.cpp index 1e33ff6..34e8830 100644 --- a/inference-engine/src/low_precision_transformations/src/activation.cpp +++ b/inference-engine/src/low_precision_transformations/src/activation.cpp @@ -6,7 +6,7 @@ #include "low_precision_transformations/network_helper.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/concat.cpp b/inference-engine/src/low_precision_transformations/src/concat.cpp index 58c7608..d00372f 100644 --- a/inference-engine/src/low_precision_transformations/src/concat.cpp +++ b/inference-engine/src/low_precision_transformations/src/concat.cpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp b/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp index 3c97312..bd088cc 100644 --- a/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp +++ b/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp @@ -8,7 +8,7 @@ #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/const.cpp b/inference-engine/src/low_precision_transformations/src/const.cpp index 7f6d5ce..234a6d4 100644 --- a/inference-engine/src/low_precision_transformations/src/const.cpp +++ b/inference-engine/src/low_precision_transformations/src/const.cpp @@ -10,7 +10,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/convolution.cpp b/inference-engine/src/low_precision_transformations/src/convolution.cpp index a2e4a18..cb1dddb 100644 --- a/inference-engine/src/low_precision_transformations/src/convolution.cpp +++ b/inference-engine/src/low_precision_transformations/src/convolution.cpp @@ -6,7 +6,7 @@ #include "low_precision_transformations/network_helper.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/depth_to_space.cpp b/inference-engine/src/low_precision_transformations/src/depth_to_space.cpp index 47be4df..2ccbdc8 100644 --- a/inference-engine/src/low_precision_transformations/src/depth_to_space.cpp +++ b/inference-engine/src/low_precision_transformations/src/depth_to_space.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/depth_to_space.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/eltwise.cpp b/inference-engine/src/low_precision_transformations/src/eltwise.cpp index 5f439bb..c1a5f9d 100644 --- a/inference-engine/src/low_precision_transformations/src/eltwise.cpp +++ b/inference-engine/src/low_precision_transformations/src/eltwise.cpp @@ -7,7 +7,7 @@ #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp b/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp index 3f971ab..8be26b3 100644 --- a/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp +++ b/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/fully_connected.cpp b/inference-engine/src/low_precision_transformations/src/fully_connected.cpp index 1c9c432..4eb4b43 100644 --- a/inference-engine/src/low_precision_transformations/src/fully_connected.cpp +++ b/inference-engine/src/low_precision_transformations/src/fully_connected.cpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/fuse_fake_quantize_and_scale_shift.cpp b/inference-engine/src/low_precision_transformations/src/fuse_fake_quantize_and_scale_shift.cpp index a6cedb8..2b9eaaf 100644 --- a/inference-engine/src/low_precision_transformations/src/fuse_fake_quantize_and_scale_shift.cpp +++ b/inference-engine/src/low_precision_transformations/src/fuse_fake_quantize_and_scale_shift.cpp @@ -8,7 +8,7 @@ #include #include -#include
+#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/gemm.cpp b/inference-engine/src/low_precision_transformations/src/gemm.cpp index 1ab592f..199610a 100644 --- a/inference-engine/src/low_precision_transformations/src/gemm.cpp +++ b/inference-engine/src/low_precision_transformations/src/gemm.cpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/mvn.cpp b/inference-engine/src/low_precision_transformations/src/mvn.cpp index 95e5815..ec613ce 100644 --- a/inference-engine/src/low_precision_transformations/src/mvn.cpp +++ b/inference-engine/src/low_precision_transformations/src/mvn.cpp @@ -3,7 +3,7 @@ // #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/network_helper.cpp b/inference-engine/src/low_precision_transformations/src/network_helper.cpp index ab1167d..a2348b8 100644 --- a/inference-engine/src/low_precision_transformations/src/network_helper.cpp +++ b/inference-engine/src/low_precision_transformations/src/network_helper.cpp @@ -7,7 +7,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/normalize.cpp b/inference-engine/src/low_precision_transformations/src/normalize.cpp index 8db734b..73be927 100644 --- a/inference-engine/src/low_precision_transformations/src/normalize.cpp +++ b/inference-engine/src/low_precision_transformations/src/normalize.cpp @@ -9,7 +9,7 @@ #include #include -#include
+#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/permute.cpp b/inference-engine/src/low_precision_transformations/src/permute.cpp index d44c3ac..da324ea 100644 --- a/inference-engine/src/low_precision_transformations/src/permute.cpp +++ b/inference-engine/src/low_precision_transformations/src/permute.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/permute.hpp" #include -#include
+#include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/pooling.cpp b/inference-engine/src/low_precision_transformations/src/pooling.cpp index 405e328..4d16966 100644 --- a/inference-engine/src/low_precision_transformations/src/pooling.cpp +++ b/inference-engine/src/low_precision_transformations/src/pooling.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/pooling.hpp" #include -#include
+#include #include using namespace InferenceEngine; diff --git a/inference-engine/src/low_precision_transformations/src/power.cpp b/inference-engine/src/low_precision_transformations/src/power.cpp index 429ca06..a86a1e1 100644 --- a/inference-engine/src/low_precision_transformations/src/power.cpp +++ b/inference-engine/src/low_precision_transformations/src/power.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/power.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/reshape.cpp b/inference-engine/src/low_precision_transformations/src/reshape.cpp index 9f754f9..0b7b57a 100644 --- a/inference-engine/src/low_precision_transformations/src/reshape.cpp +++ b/inference-engine/src/low_precision_transformations/src/reshape.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/reshape.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/scaleshift_to_convolution.cpp b/inference-engine/src/low_precision_transformations/src/scaleshift_to_convolution.cpp index 25a5f51..cad5082 100644 --- a/inference-engine/src/low_precision_transformations/src/scaleshift_to_convolution.cpp +++ b/inference-engine/src/low_precision_transformations/src/scaleshift_to_convolution.cpp @@ -10,7 +10,7 @@ #include #include -#include
+#include #include "low_precision_transformations/common/ie_lpt_exception.hpp" #include "low_precision_transformations/network_helper.hpp" diff --git a/inference-engine/src/low_precision_transformations/src/squeeze.cpp b/inference-engine/src/low_precision_transformations/src/squeeze.cpp index b73b956..0c654d1 100644 --- a/inference-engine/src/low_precision_transformations/src/squeeze.cpp +++ b/inference-engine/src/low_precision_transformations/src/squeeze.cpp @@ -6,7 +6,7 @@ #include "low_precision_transformations/network_helper.hpp" #include -#include
+#include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/transformer.cpp b/inference-engine/src/low_precision_transformations/src/transformer.cpp index e9fe16f..1be1a97 100644 --- a/inference-engine/src/low_precision_transformations/src/transformer.cpp +++ b/inference-engine/src/low_precision_transformations/src/transformer.cpp @@ -11,7 +11,7 @@ #include #include #include -#include
+#include #include #include #include diff --git a/inference-engine/src/low_precision_transformations/src/weightable_layer_transformation.cpp b/inference-engine/src/low_precision_transformations/src/weightable_layer_transformation.cpp index b30e3b1..d62c9e4 100644 --- a/inference-engine/src/low_precision_transformations/src/weightable_layer_transformation.cpp +++ b/inference-engine/src/low_precision_transformations/src/weightable_layer_transformation.cpp @@ -5,7 +5,7 @@ #include "low_precision_transformations/weightable_layer_transformation.hpp" #include -#include
+#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/bf16transformer.h b/inference-engine/src/mkldnn_plugin/bf16transformer.h index 5363383..71d3354 100644 --- a/inference-engine/src/mkldnn_plugin/bf16transformer.h +++ b/inference-engine/src/mkldnn_plugin/bf16transformer.h @@ -4,7 +4,7 @@ #pragma once -#include
+#include #include #include #include "inference_engine.hpp" diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp index da4aea2..e225b7e 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp @@ -5,7 +5,7 @@ #include "mkldnn_node.h" #include "mkldnn_extension_mngr.h" -#include "details/caseless.hpp" +#include "caseless.hpp" #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/extract_image_patches.cpp b/inference-engine/src/mkldnn_plugin/nodes/extract_image_patches.cpp index fed075a..92f83a2 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/extract_image_patches.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/extract_image_patches.cpp @@ -4,7 +4,7 @@ #include "list.hpp" #include "base.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.h b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.h index b8b334a..997d4a8 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.h +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.h @@ -6,7 +6,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp index 356ec72..124f14b 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_depthwise_node.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" using namespace mkldnn; using namespace MKLDNNPlugin; diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp index 5d0cbf9..d8493c6 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_input_node.cpp @@ -5,7 +5,7 @@ #include "mkldnn_input_node.h" #include "../mkldnn_extension_utils.h" #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_memcpy.h" using namespace mkldnn; diff --git a/inference-engine/include/details/caseless.hpp b/inference-engine/src/plugin_api/caseless.hpp similarity index 100% rename from inference-engine/include/details/caseless.hpp rename to inference-engine/src/plugin_api/caseless.hpp diff --git a/inference-engine/src/plugin_api/details/caseless.hpp b/inference-engine/src/plugin_api/details/caseless.hpp new file mode 100644 index 0000000..9cc661a --- /dev/null +++ b/inference-engine/src/plugin_api/details/caseless.hpp @@ -0,0 +1,5 @@ +// Copyright (C) 2018-2020 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "../caseless.hpp" diff --git a/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp b/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp index 8d9f63a..ebc4890 100644 --- a/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp +++ b/inference-engine/src/readers/ir_reader/ie_ir_parser.cpp @@ -27,7 +27,7 @@ #include #include "ie_blob_stream.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_ngraph_utils.hpp" #include "generic_ie.hpp" #include "precision_utils.h" diff --git a/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h b/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h index f4e1f12..5d30481 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h +++ b/inference-engine/src/readers/ir_reader_v7/ie_format_parser.h @@ -10,7 +10,7 @@ #include #include "cnn_network_impl.hpp" -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_layers.h" #include "parsers.h" diff --git a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp index 03a1988..3111425 100644 --- a/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp +++ b/inference-engine/src/readers/ir_reader_v7/ie_layer_validators.hpp @@ -9,7 +9,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "ie_layers.h" namespace InferenceEngine { diff --git a/inference-engine/src/vpu/common/include/vpu/utils/string.hpp b/inference-engine/src/vpu/common/include/vpu/utils/string.hpp index f5abdd7..ab352cd 100644 --- a/inference-engine/src/vpu/common/include/vpu/utils/string.hpp +++ b/inference-engine/src/vpu/common/include/vpu/utils/string.hpp @@ -11,7 +11,7 @@ #include #include -#include
+#include #include diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/custom_layer.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/custom_layer.hpp index 10b7b97..d337a15 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/custom_layer.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/custom_layer.hpp @@ -11,7 +11,7 @@ #include #include -#include
+#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/graph_transformer.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/graph_transformer.hpp index 0fa0d06..c3877b2 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/graph_transformer.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/graph_transformer.hpp @@ -16,7 +16,7 @@ #include #include -#include
+#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/custom_kernel.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/custom_kernel.cpp index c7ad6f6..c95750c 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/custom_kernel.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/custom_kernel.cpp @@ -4,7 +4,7 @@ #include #include -#include
+#include #include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/custom_layer.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/custom_layer.cpp index ee1aa84..4a9a209 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/custom_layer.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/custom_layer.cpp @@ -27,7 +27,7 @@ #include #include -#include
+#include #include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp index bc9a433..34a502a 100644 --- a/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/frontend/ie_parsed_network.cpp @@ -7,7 +7,7 @@ #include #include
-#include
+#include #include diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/proposal.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/proposal.cpp index 2c3368b..27d2d73 100644 --- a/inference-engine/src/vpu/graph_transformer/src/stages/proposal.cpp +++ b/inference-engine/src/vpu/graph_transformer/src/stages/proposal.cpp @@ -12,7 +12,7 @@ #include #include -#include
+#include namespace vpu { diff --git a/inference-engine/tests/functional/inference_engine/caseless_tests.cpp b/inference-engine/tests/functional/inference_engine/caseless_tests.cpp index 611304c..7656e72 100644 --- a/inference-engine/tests/functional/inference_engine/caseless_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/caseless_tests.cpp @@ -4,7 +4,7 @@ #include #include -#include "details/caseless.hpp" +#include "caseless.hpp" #include "debug.h" using namespace std; diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp index 15c30a6..017b98f 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.hpp @@ -11,7 +11,7 @@ #include #include "details/ie_cnn_network_tools.h" -#include
+#include #include "low_precision_transformations/network_helper.hpp" #include "low_precision_transformations/layer_transformation.hpp" diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt index e5fa636..3b4e032 100644 --- a/inference-engine/tools/compile_tool/CMakeLists.txt +++ b/inference-engine/tools/compile_tool/CMakeLists.txt @@ -25,6 +25,7 @@ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${IE_MAIN_SOURCE_DIR}/include ${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include ${IE_MAIN_SOURCE_DIR}/src/vpu/common/include + ${IE_MAIN_SOURCE_DIR}/src/plugin_api ) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- 2.7.4