Removed useless iostream include (#5357)

* Removed useless iostream include * Fixed samples compilation * Klockwork fixes for template plugin
2021-05-03 17:12:00 +03:00
parent 5d8f209df6
commit b47d11e31e
31 changed files with 26 additions and 37 deletions
--- 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<ngraph::opset3::Parameter>();
+    auto label = ngraph::pattern::wrap_type<ngraph::opset3::Parameter>();

    ngraph::matcher_pass_callback callback = [=] (pattern::Matcher& m) {
        auto param = std::dynamic_pointer_cast<ngraph::opset3::Parameter>(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<ngraph::pattern::Matcher>(param, "AddMeanSubtract");
+    auto m = std::make_shared<ngraph::pattern::Matcher>(label, "AddMeanSubtract");
    // Register Matcher
    register_matcher(m, callback);
 }
--- 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<ngraph::opset3::Parameter>();
+    auto label = ngraph::pattern::wrap_type<ngraph::opset3::Parameter>();

    ngraph::matcher_pass_callback callback = [=] (pattern::Matcher& m) {
        auto param = std::dynamic_pointer_cast<ngraph::opset3::Parameter>(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<ngraph::pattern::Matcher>(param, "AddStdScale");
+    auto m = std::make_shared<ngraph::pattern::Matcher>(label, "AddStdScale");
    // Register Matcher
    register_matcher(m, callback);
 }
--- 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 <map>
 #include <vector>
 #include <set>
-#include <iostream>
 #include <algorithm>
 #include <sstream>
 #include <chrono>
--- 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 <ostream>
 #include <map>
 #include <memory>
 #include <string>
--- a/inference-engine/include/ie_core.hpp
+++ b/inference-engine/include/ie_core.hpp
@@ -9,6 +9,7 @@
 */
 #pragma once

+#include <istream>
 #include <map>
 #include <memory>
 #include <string>
--- a/inference-engine/include/ie_iexecutable_network.hpp
+++ b/inference-engine/include/ie_iexecutable_network.hpp
@@ -9,6 +9,7 @@
 */
 #pragma once

+#include <ostream>
 #include <map>
 #include <memory>
 #include <string>
--- a/inference-engine/include/ie_locked_memory.hpp
+++ b/inference-engine/include/ie_locked_memory.hpp
@@ -9,7 +9,6 @@
 */
 #pragma once

-#include <iostream>
 #include <utility>

 #include "ie_allocator.hpp"
--- 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 <iostream>
--- a/inference-engine/samples/benchmark_app/utils.cpp
+++ b/inference-engine/samples/benchmark_app/utils.cpp
@@ -4,7 +4,6 @@

 // clang-format off
 #include <algorithm>
-#include <iostream>
 #include <map>
 #include <regex>
 #include <samples/common.hpp>
--- 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 <functional>
 #include <inference_engine.hpp>
 #include <iomanip>
+#include <iostream>
 #include <limits>
 #include <list>
 #include <map>
--- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
@@ -7,7 +7,6 @@
 #include <string>
 #include <map>
 #include <vector>
-#include <iostream>
 #include <cmath>
 #include <tuple>
 #include <cctype>
--- 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 <cstdint>
 #include <vector>
 #include <cmath>
+#include <iostream>
 #include <set>
 #include <string>
 #include <algorithm>
--- a/inference-engine/src/gna_plugin/backend/dnn.hpp
+++ b/inference-engine/src/gna_plugin/backend/dnn.hpp
@@ -8,7 +8,6 @@
 #include <cstdio>
 #include <memory.h>
 #include <xmmintrin.h>
-#include <iostream>
 #include <fstream>
 #include <sstream>
 #include <string>
--- a/inference-engine/src/gna_plugin/frontend/quantization.cpp
+++ b/inference-engine/src/gna_plugin/frontend/quantization.cpp
@@ -3,7 +3,6 @@
 //

 #include <cstring>
-#include <iostream>
 #include <gna_plugin_log.hpp>
 #include <limits>
 #include "backend/gna_types.h"
--- 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 <cstdlib>
-#include <iostream>
 #include <vector>
 #include <cstring>
 #include <list>
--- 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 <cstdlib>
 #include <cstring>
+#include <vector>
+
 #include "threading/ie_parallel_custom_arena.hpp"
 #include "ie_system_conf.h"
-#include <iostream>
-#include <vector>

 # define XBYAK_NO_OP_NAMES
 # define XBYAK_UNDEF_JNL
--- 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 <dlfcn.h>
 #include <iostream>

--- 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 <iostream>
-
 #include "ie_allocator.hpp"

 namespace InferenceEngine {
--- 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<unsigned int>::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<unsigned int>::max())) {
            IE_THROW() << message;
        }
@@ -215,7 +215,7 @@ std::vector<unsigned int> 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<unsigned int>::max())) {
                IE_THROW() << message;
            }
@@ -236,7 +236,7 @@ std::vector<unsigned int> 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<unsigned int>::max())) {
                IE_THROW() << message;
            }
--- 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 <limits>
 #include <map>
 #include <memory>
-#include <iostream>
 #include <string>
 #include <typeinfo>
 #include <unordered_set>
--- 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<Blob::Ptr> &inputs, std::vector<Blob::Ptr> &outputs,
                       ResponseDesc *resp) noexcept override {
        try {
--- a/inference-engine/src/plugin_api/debug.h
+++ b/inference-engine/src/plugin_api/debug.h
@@ -15,7 +15,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <functional>
-#include <iostream>
+#include <ostream>
 #include <iterator>
 #include <numeric>
 #include <sstream>
--- 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 <exception>
 #include <map>
 #include <vector>
-#include <iostream>
+
 namespace detail {
 namespace onnx {
    enum Field {
--- 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 <ngraph/opsets/opset1.hpp>
 #include <ngraph/rt_info.hpp>

-#include <iostream>
 #include <numeric>

 using namespace ngraph;
--- 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 <ngraph/rt_info.hpp>
 #include <ngraph/pattern/op/wrap_type.hpp>

-#include <iostream>
-
 ngraph::snippets::pass::LoadMoveBroadcastToBroadcastLoad::LoadMoveBroadcastToBroadcastLoad() {
    MATCHER_SCOPE(LoadMoveBroadcastToBroadcastLoad);
    auto param_pattern = ngraph::pattern::wrap_type<ngraph::opset1::Parameter>();
--- 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 <unordered_map>
 #include <unordered_set>
 #include <string>
-#include <iostream>
+#include <ostream>
 #include <sstream>

 #include <vpu/utils/checked_cast.hpp>
--- 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 <vpu/utils/io.hpp>

-#include <iostream>
+#include <ostream>

 namespace vpu {

--- 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 <string>
 #include <vector>
-#include <iostream>
+#include <ostream>

 #include <vpu/model/data.hpp>
 #include <vpu/backend/blob_format.hpp>
--- 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 <iostream>
 #include <fstream>
 #include <vector>
 #include <mutex>
--- 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<std::string> 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.*)",
    };
--- 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)