diff --git a/docs/template_plugin/src/transformations/preprocessing/mean_image_or_value.cpp b/docs/template_plugin/src/transformations/preprocessing/mean_image_or_value.cpp index 7f20813e1ba..a74d8501981 100644 --- a/docs/template_plugin/src/transformations/preprocessing/mean_image_or_value.cpp +++ b/docs/template_plugin/src/transformations/preprocessing/mean_image_or_value.cpp @@ -14,7 +14,7 @@ NGRAPH_RTTI_DEFINITION(ngraph::pass::AddMeanSubtract, "AddMeanSubtract", 0); ngraph::pass::AddMeanSubtract::AddMeanSubtract(const MeanMap & inputInfoMap) { // RUN_ON_FUNCTION_SCOPE(AddMeanSubtract); - auto param = ngraph::pattern::wrap_type(); + auto label = ngraph::pattern::wrap_type(); ngraph::matcher_pass_callback callback = [=] (pattern::Matcher& m) { auto param = std::dynamic_pointer_cast(m.get_match_root()); @@ -42,7 +42,7 @@ ngraph::pass::AddMeanSubtract::AddMeanSubtract(const MeanMap & inputInfoMap) { }; // Register pattern with Parameter operation as a pattern root node - auto m = std::make_shared(param, "AddMeanSubtract"); + auto m = std::make_shared(label, "AddMeanSubtract"); // Register Matcher register_matcher(m, callback); } diff --git a/docs/template_plugin/src/transformations/preprocessing/std_scale.cpp b/docs/template_plugin/src/transformations/preprocessing/std_scale.cpp index a27e017451b..44ad4d6080c 100644 --- a/docs/template_plugin/src/transformations/preprocessing/std_scale.cpp +++ b/docs/template_plugin/src/transformations/preprocessing/std_scale.cpp @@ -14,7 +14,7 @@ NGRAPH_RTTI_DEFINITION(ngraph::pass::AddStdScale, "AddStdScale", 0); ngraph::pass::AddStdScale::AddStdScale(const ScaleMap& inputInfoMap) { // RUN_ON_FUNCTION_SCOPE(AddStdScale); - auto param = ngraph::pattern::wrap_type(); + auto label = ngraph::pattern::wrap_type(); ngraph::matcher_pass_callback callback = [=] (pattern::Matcher& m) { auto param = std::dynamic_pointer_cast(m.get_match_root()); @@ -42,7 +42,7 @@ ngraph::pass::AddStdScale::AddStdScale(const ScaleMap& inputInfoMap) { }; // Register pattern with Parameter operation as a pattern root node - auto m = std::make_shared(param, "AddStdScale"); + auto m = std::make_shared(label, "AddStdScale"); // Register Matcher register_matcher(m, callback); } diff --git a/inference-engine/ie_bridges/c/src/ie_c_api.cpp b/inference-engine/ie_bridges/c/src/ie_c_api.cpp index d9fe8a2b372..2d7093b5a9c 100644 --- a/inference-engine/ie_bridges/c/src/ie_c_api.cpp +++ b/inference-engine/ie_bridges/c/src/ie_c_api.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/inference-engine/include/cpp/ie_executable_network.hpp b/inference-engine/include/cpp/ie_executable_network.hpp index 19136fee575..6f686699754 100644 --- a/inference-engine/include/cpp/ie_executable_network.hpp +++ b/inference-engine/include/cpp/ie_executable_network.hpp @@ -10,6 +10,7 @@ #pragma once +#include #include #include #include diff --git a/inference-engine/include/ie_core.hpp b/inference-engine/include/ie_core.hpp index 2829d3234f2..ffa1f58b7a5 100644 --- a/inference-engine/include/ie_core.hpp +++ b/inference-engine/include/ie_core.hpp @@ -9,6 +9,7 @@ */ #pragma once +#include #include #include #include diff --git a/inference-engine/include/ie_iexecutable_network.hpp b/inference-engine/include/ie_iexecutable_network.hpp index 526ce8fda81..cb5d660ee08 100644 --- a/inference-engine/include/ie_iexecutable_network.hpp +++ b/inference-engine/include/ie_iexecutable_network.hpp @@ -9,6 +9,7 @@ */ #pragma once +#include #include #include #include diff --git a/inference-engine/include/ie_locked_memory.hpp b/inference-engine/include/ie_locked_memory.hpp index 2bc272091fa..5242b171198 100644 --- a/inference-engine/include/ie_locked_memory.hpp +++ b/inference-engine/include/ie_locked_memory.hpp @@ -9,7 +9,6 @@ */ #pragma once -#include #include #include "ie_allocator.hpp" diff --git a/inference-engine/include/inference_engine.hpp b/inference-engine/include/inference_engine.hpp index 8c6c4768a53..45111176fbb 100644 --- a/inference-engine/include/inference_engine.hpp +++ b/inference-engine/include/inference_engine.hpp @@ -12,3 +12,6 @@ #include "ie_plugin_config.hpp" #include "ie_compound_blob.h" #include "ie_core.hpp" + +// remove in 2022.1 major release +#include diff --git a/inference-engine/samples/benchmark_app/utils.cpp b/inference-engine/samples/benchmark_app/utils.cpp index e41bfbd1be8..2b99c3b555c 100644 --- a/inference-engine/samples/benchmark_app/utils.cpp +++ b/inference-engine/samples/benchmark_app/utils.cpp @@ -4,7 +4,6 @@ // clang-format off #include -#include #include #include #include diff --git a/inference-engine/samples/common/utils/include/samples/common.hpp b/inference-engine/samples/common/utils/include/samples/common.hpp index 48de4961ad9..b77b38c1ed2 100644 --- a/inference-engine/samples/common/utils/include/samples/common.hpp +++ b/inference-engine/samples/common/utils/include/samples/common.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp index 5ce4654dca0..b963d96a16f 100644 --- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp +++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/inference-engine/src/gna_plugin/backend/am_intel_dnn.cpp b/inference-engine/src/gna_plugin/backend/am_intel_dnn.cpp index 6257d8da47d..76cb57425cd 100644 --- a/inference-engine/src/gna_plugin/backend/am_intel_dnn.cpp +++ b/inference-engine/src/gna_plugin/backend/am_intel_dnn.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/inference-engine/src/gna_plugin/backend/dnn.hpp b/inference-engine/src/gna_plugin/backend/dnn.hpp index 7b8feda361c..4cb0b74a54b 100644 --- a/inference-engine/src/gna_plugin/backend/dnn.hpp +++ b/inference-engine/src/gna_plugin/backend/dnn.hpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/inference-engine/src/gna_plugin/frontend/quantization.cpp b/inference-engine/src/gna_plugin/frontend/quantization.cpp index 69dcc1ccb58..f9a4b9018c8 100644 --- a/inference-engine/src/gna_plugin/frontend/quantization.cpp +++ b/inference-engine/src/gna_plugin/frontend/quantization.cpp @@ -3,7 +3,6 @@ // #include -#include #include #include #include "backend/gna_types.h" diff --git a/inference-engine/src/gna_plugin/gna_plugin.cpp b/inference-engine/src/gna_plugin/gna_plugin.cpp index a1f7e003dc7..e997e49cf91 100644 --- a/inference-engine/src/gna_plugin/gna_plugin.cpp +++ b/inference-engine/src/gna_plugin/gna_plugin.cpp @@ -5,7 +5,6 @@ #define NOMINMAX #include -#include #include #include #include diff --git a/inference-engine/src/inference_engine/ie_system_conf.cpp b/inference-engine/src/inference_engine/ie_system_conf.cpp index c4fbe597aa3..d9219597a93 100644 --- a/inference-engine/src/inference_engine/ie_system_conf.cpp +++ b/inference-engine/src/inference_engine/ie_system_conf.cpp @@ -4,10 +4,10 @@ #include #include +#include + #include "threading/ie_parallel_custom_arena.hpp" #include "ie_system_conf.h" -#include -#include # define XBYAK_NO_OP_NAMES # define XBYAK_UNDEF_JNL diff --git a/inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp b/inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp index 8143e0634e1..297929aa4ae 100644 --- a/inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp +++ b/inference-engine/src/inference_engine/os/lin/lin_shared_object_loader.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // - #include #include diff --git a/inference-engine/src/inference_engine/system_allocator.hpp b/inference-engine/src/inference_engine/system_allocator.hpp index 66c56511a67..ce609fff6ec 100644 --- a/inference-engine/src/inference_engine/system_allocator.hpp +++ b/inference-engine/src/inference_engine/system_allocator.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "ie_allocator.hpp" namespace InferenceEngine { diff --git a/inference-engine/src/legacy_api/src/ie_layers.cpp b/inference-engine/src/legacy_api/src/ie_layers.cpp index 1649aaea12b..3f640711f1f 100644 --- a/inference-engine/src/legacy_api/src/ie_layers.cpp +++ b/inference-engine/src/legacy_api/src/ie_layers.cpp @@ -180,7 +180,7 @@ unsigned int CNNLayer::GetParamAsUInt(const char* param, unsigned int def) const std::string message = "Cannot parse parameter " + std::string(param) + " from IR for layer " + name + ". Value " + val + " cannot be casted to unsigned int."; try { - long value = std::stol(val); + long long value = std::stoll(val); if ((value < 0) || (value > std::numeric_limits::max())) { IE_THROW() << message; } @@ -195,7 +195,7 @@ unsigned int CNNLayer::GetParamAsUInt(const char* param) const { std::string message = "Cannot parse parameter " + std::string(param) + " from IR for layer " + name + ". Value " + val + " cannot be casted to unsigned int."; try { - long value = std::stol(val); + long long value = std::stoll(val); if ((value < 0) || (value > std::numeric_limits::max())) { IE_THROW() << message; } @@ -215,7 +215,7 @@ std::vector CNNLayer::GetParamAsUInts(const char* param, std::vect if (vals.empty()) return def; while (getline(stream, str, ',')) { try { - long value = std::stol(str); + long long value = std::stoll(str); if ((value < 0) || (value > std::numeric_limits::max())) { IE_THROW() << message; } @@ -236,7 +236,7 @@ std::vector CNNLayer::GetParamAsUInts(const char* param) const { name + ". Value " + vals + " cannot be casted to unsigned int."; while (getline(stream, str, ',')) { try { - long value = std::stol(str); + long long value = std::stoll(str); if ((value < 0) || (value > std::numeric_limits::max())) { IE_THROW() << message; } diff --git a/inference-engine/src/low_precision_transformations/src/transformer.cpp b/inference-engine/src/low_precision_transformations/src/transformer.cpp index eee96c562e7..d8b484bcbce 100644 --- a/inference-engine/src/low_precision_transformations/src/transformer.cpp +++ b/inference-engine/src/low_precision_transformations/src/transformer.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/inference-engine/src/mkldnn_plugin/nodes/proposal_onnx.cpp b/inference-engine/src/mkldnn_plugin/nodes/proposal_onnx.cpp index d10f495b723..878797e6d17 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/proposal_onnx.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/proposal_onnx.cpp @@ -304,13 +304,6 @@ public: } } - void print_shape(const Blob::Ptr& b) { - for (size_t i = 0; i < b->getTensorDesc().getDims().size(); ++i) { - std::cout << b->getTensorDesc().getDims()[i] << ", "; - } - std::cout << std::endl; - } - StatusCode execute(std::vector &inputs, std::vector &outputs, ResponseDesc *resp) noexcept override { try { diff --git a/inference-engine/src/plugin_api/debug.h b/inference-engine/src/plugin_api/debug.h index 1848e5f3905..838c5b02941 100644 --- a/inference-engine/src/plugin_api/debug.h +++ b/inference-engine/src/plugin_api/debug.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/inference-engine/src/readers/onnx_reader/onnx_model_validator.cpp b/inference-engine/src/readers/onnx_reader/onnx_model_validator.cpp index 26e1b020e94..ae472990c6a 100644 --- a/inference-engine/src/readers/onnx_reader/onnx_model_validator.cpp +++ b/inference-engine/src/readers/onnx_reader/onnx_model_validator.cpp @@ -9,7 +9,7 @@ #include #include #include -#include + namespace detail { namespace onnx { enum Field { diff --git a/inference-engine/src/snippets/src/pass/insert_movebroadcast.cpp b/inference-engine/src/snippets/src/pass/insert_movebroadcast.cpp index 2186335dc4d..9da8f240d69 100644 --- a/inference-engine/src/snippets/src/pass/insert_movebroadcast.cpp +++ b/inference-engine/src/snippets/src/pass/insert_movebroadcast.cpp @@ -11,7 +11,6 @@ #include #include -#include #include using namespace ngraph; diff --git a/inference-engine/src/snippets/src/pass/load_movebroadcast_to_broadcastload.cpp b/inference-engine/src/snippets/src/pass/load_movebroadcast_to_broadcastload.cpp index 36fccd8bb7d..8fa9a604ddc 100644 --- a/inference-engine/src/snippets/src/pass/load_movebroadcast_to_broadcastload.cpp +++ b/inference-engine/src/snippets/src/pass/load_movebroadcast_to_broadcastload.cpp @@ -12,8 +12,6 @@ #include #include -#include - ngraph::snippets::pass::LoadMoveBroadcastToBroadcastLoad::LoadMoveBroadcastToBroadcastLoad() { MATCHER_SCOPE(LoadMoveBroadcastToBroadcastLoad); auto param_pattern = ngraph::pattern::wrap_type(); diff --git a/inference-engine/src/vpu/common/include/vpu/utils/enums.hpp b/inference-engine/src/vpu/common/include/vpu/utils/enums.hpp index 6eddf988c7f..6e089dcd21d 100644 --- a/inference-engine/src/vpu/common/include/vpu/utils/enums.hpp +++ b/inference-engine/src/vpu/common/include/vpu/utils/enums.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/common/src/utils/io.cpp b/inference-engine/src/vpu/common/src/utils/io.cpp index dcaa8043d1a..e7324fb1bf3 100644 --- a/inference-engine/src/vpu/common/src/utils/io.cpp +++ b/inference-engine/src/vpu/common/src/utils/io.cpp @@ -4,7 +4,7 @@ #include -#include +#include namespace vpu { diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/middleend/hw/utility.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/middleend/hw/utility.hpp index ec7cd057f81..db89d14bdaa 100644 --- a/inference-engine/src/vpu/graph_transformer/include/vpu/middleend/hw/utility.hpp +++ b/inference-engine/src/vpu/graph_transformer/include/vpu/middleend/hw/utility.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp index ab56c310dc0..d92a948ce57 100644 --- a/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp +++ b/inference-engine/src/vpu/myriad_plugin/myriad_executor.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include #include #include diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp index 631c6a88c4d..a9e6a6aeac0 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp @@ -59,6 +59,7 @@ std::vector disabledTestPatterns() { R"(.*ConstantResultSubgraphTest.*inPrc=I16.*)", // TODO: Issue: 54436 R"(.*LSTMSequence.*CompareWithRefs.*mode=PURE_SEQ_RAND_SEQ_LEN_PARAM.*direction=bidirectional_clip=0.7_netPRC=FP32.*)", + R"(.*LSTMSequence.*CompareWithRefs.*mode=CONVERT_TO_TI_RAND_SEQ_LEN_PARAM_seq.*direction=bidirectional_clip=0.7_netPRC=FP32.*)", // TODO: Issue: 54194 R"(.*ActivationLayerTest.*SoftPlus.*)", }; diff --git a/inference-engine/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt b/inference-engine/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt index 3ccecefe8fb..69e9c5c1402 100644 --- a/inference-engine/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt +++ b/inference-engine/tests_deprecated/fluid_preproc/fluid_test_computations/CMakeLists.txt @@ -18,3 +18,5 @@ target_include_directories(fluid_test_computations PUBLIC "${CMAKE_CURRENT_SOURC target_link_libraries(fluid_test_computations PRIVATE inference_engine_preproc_s inference_engine fluid) target_compile_definitions(fluid_test_computations PRIVATE IMPLEMENT_FLUID_COMPUTATION_API) + +add_dependencies(fluid_test_computations inference_engine_preproc)