Removed CNNLayer entries from ie_common.h (#1420)

* Removed useless header include

* Removed CNNLayer entries from ie_common.h

diff --git a/inference-engine/include/ie_common.h b/inference-engine/include/ie_common.h
index a67a2e8..1dc5667 100644 (file)
--- a/inference-engine/include/ie_common.h
+++ b/inference-engine/include/ie_common.h
@@ -29,20 +29,6 @@ namespace InferenceEngine {
 using SizeVector = std::vector<size_t>;
 
 /**
- * @brief This class represents the generic layer.
- */
-class CNNLayer;
-
-/**
- * @brief A smart pointer to the CNNLayer
- */
-using CNNLayerPtr = std::shared_ptr<CNNLayer>;
-/**
- * @brief A smart weak pointer to the CNNLayer
- */
-using CNNLayerWeakPtr = std::weak_ptr<CNNLayer>;
-
-/**
  * @brief The main data representation node
  */
 class Data;

diff --git a/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h b/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h
index 7723f80..d043f00 100644 (file)
--- a/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h
+++ b/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <vector>
 
-#include "ie_common.h"
+#include "ie_layers.h"
 #include "ie_icnn_network.hpp"
 
 namespace InferenceEngine {

diff --git a/inference-engine/src/legacy_api/include/ie_layers.h b/inference-engine/src/legacy_api/include/ie_layers.h
index 87ec9e4..79ec1e3 100644 (file)
--- a/inference-engine/src/legacy_api/include/ie_layers.h
+++ b/inference-engine/src/legacy_api/include/ie_layers.h
@@ -380,11 +380,22 @@ public:
     std::map<std::string, Blob::Ptr> blobs;
 };
 
+IE_SUPPRESS_DEPRECATED_START
+
 /**
  * @brief Alias for CNNLayer object
  */
-IE_SUPPRESS_DEPRECATED_START
 using GenericLayer = class CNNLayer;
+
+/**
+ * @brief A smart pointer to the CNNLayer
+ */
+using CNNLayerPtr = std::shared_ptr<CNNLayer>;
+/**
+ * @brief A smart weak pointer to the CNNLayer
+ */
+using CNNLayerWeakPtr = std::weak_ptr<CNNLayer>;
+
 IE_SUPPRESS_DEPRECATED_END
 
 INFERENCE_ENGINE_API_CPP(CNNLayerWeakPtr&) getCreatorLayer(const DataPtr & data);

diff --git a/inference-engine/src/legacy_api/include/network_serializer.h b/inference-engine/src/legacy_api/include/network_serializer.h
index 9634e9a..0386abf 100644 (file)
--- a/inference-engine/src/legacy_api/include/network_serializer.h
+++ b/inference-engine/src/legacy_api/include/network_serializer.h
@@ -5,6 +5,8 @@
 #pragma once
 
 #include <ie_icnn_network.hpp>
+#include <ie_layers.h>
+
 #include <string>
 #include <vector>
 

diff --git a/inference-engine/src/legacy_api/src/graph_transformer.cpp b/inference-engine/src/legacy_api/src/graph_transformer.cpp
index 355f68a..f0e7bec 100644 (file)
--- a/inference-engine/src/legacy_api/src/graph_transformer.cpp
+++ b/inference-engine/src/legacy_api/src/graph_transformer.cpp
@@ -5,7 +5,6 @@
 #include "graph_transformer.h"
 
 #include <cpp/ie_cnn_network.h>
-#include <details/ie_cnn_network_tools.h>
 
 #include <details/caseless.hpp>
 #include <iterator>

diff --git a/inference-engine/src/legacy_api/src/network_serializer.cpp b/inference-engine/src/legacy_api/src/network_serializer.cpp
index 6e70108..483a209 100644 (file)
--- a/inference-engine/src/legacy_api/src/network_serializer.cpp
+++ b/inference-engine/src/legacy_api/src/network_serializer.cpp
@@ -15,7 +15,6 @@
 
 #include "ie_layers.h"
 #include "details/caseless.hpp"
-#include "details/ie_cnn_network_tools.h"
 #include "exec_graph_info.hpp"
 #include "xml_parse_utils.h"
 #include "ie_ngraph_utils.hpp"

diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/activation.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/activation.hpp
index bb67eff..bb71532 100644 (file)
--- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/activation.hpp
+++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/activation.hpp
@@ -13,7 +13,6 @@
 
 #include <ie_icnn_network.hpp>
 #include <cpp/ie_cnn_network.h>
-#include <details/ie_cnn_network_tools.h>
 
 #include "low_precision_transformations/layer_transformation.hpp"
 #include "low_precision_transformations/transformation_context.hpp"

diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp
index e34e9e6..30c4976 100644 (file)
--- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp
+++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/quantization_details.hpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 
+#include <ie_layers.h>
 #include <cpp/ie_cnn_network.h>
 
 namespace InferenceEngine {

diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transformation_context.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transformation_context.hpp
index 4877b65..1ae7811 100644 (file)
--- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transformation_context.hpp
+++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transformation_context.hpp
@@ -11,7 +11,6 @@
 
 #include <ie_icnn_network.hpp>
 #include <cpp/ie_cnn_network.h>
-#include <details/ie_cnn_network_tools.h>
 #include "low_precision_transformations/quantization_details.hpp"
 
 namespace InferenceEngine {

diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transparent_base_transformation.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transparent_base_transformation.hpp
index cee0f4d..bd4d718 100644 (file)
--- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transparent_base_transformation.hpp
+++ b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/transparent_base_transformation.hpp
@@ -13,7 +13,6 @@
 
 #include <ie_icnn_network.hpp>
 #include <cpp/ie_cnn_network.h>
-#include <details/ie_cnn_network_tools.h>
 
 #include "low_precision_transformations/layer_transformation.hpp"
 #include "low_precision_transformations/transformation_context.hpp"

diff --git a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp b/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp
index e8c9962..7ceefb6 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp
+++ b/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp
@@ -4,6 +4,7 @@
 
 #include "low_precision_transformations/blob_transformation.hpp"
 #include "low_precision_transformations/network_helper.hpp"
+#include "details/ie_cnn_network_tools.h"
 
 #include <algorithm>
 #include <vector>

diff --git a/inference-engine/src/low_precision_transformations/src/concat.cpp b/inference-engine/src/low_precision_transformations/src/concat.cpp
index bbb0d3d..58c7608 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/concat.cpp
+++ b/inference-engine/src/low_precision_transformations/src/concat.cpp
@@ -16,7 +16,6 @@
 #include <vector>
 
 #include <ie_common.h>
-#include <details/ie_cnn_network_tools.h>
 #include "cnn_network_impl.hpp"
 #include "ie_util_internal.hpp"
 

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 d6c5937..1fe4bcc 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp
+++ b/inference-engine/src/low_precision_transformations/src/concat_multi_channels.cpp
@@ -4,7 +4,6 @@
 
 #include "low_precision_transformations/concat_multi_channels.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <algorithm>

diff --git a/inference-engine/src/low_precision_transformations/src/const.cpp b/inference-engine/src/low_precision_transformations/src/const.cpp
index 1cb8e21..7f6d5ce 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/const.cpp
+++ b/inference-engine/src/low_precision_transformations/src/const.cpp
@@ -5,7 +5,6 @@
 #include "low_precision_transformations/const.hpp"
 #include "low_precision_transformations/network_helper.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <algorithm>

diff --git a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
index 9a2507f..f61095c 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
+++ b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
@@ -4,7 +4,6 @@
 
 #include "low_precision_transformations/common/dequantization_info.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <blob_factory.hpp>

diff --git a/inference-engine/src/low_precision_transformations/src/eltwise.cpp b/inference-engine/src/low_precision_transformations/src/eltwise.cpp
index 2b28e77..5f439bb 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/eltwise.cpp
+++ b/inference-engine/src/low_precision_transformations/src/eltwise.cpp
@@ -4,7 +4,6 @@
 
 #include "low_precision_transformations/eltwise.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <algorithm>

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 91c89e2..3f971ab 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp
+++ b/inference-engine/src/low_precision_transformations/src/fake_quantize.cpp
@@ -15,7 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 #include <precision_utils.h>
 #include "cnn_network_impl.hpp"

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 afb1da3..1c9c432 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/fully_connected.cpp
+++ b/inference-engine/src/low_precision_transformations/src/fully_connected.cpp
@@ -15,7 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 #include "cnn_network_impl.hpp"
 #include "ie_util_internal.hpp"

diff --git a/inference-engine/src/low_precision_transformations/src/gemm.cpp b/inference-engine/src/low_precision_transformations/src/gemm.cpp
index 1dac799..1ab592f 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/gemm.cpp
+++ b/inference-engine/src/low_precision_transformations/src/gemm.cpp
@@ -15,7 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 #include "cnn_network_impl.hpp"
 #include "ie_util_internal.hpp"

diff --git a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
index 590eeca..acbc151 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
+++ b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
@@ -5,7 +5,6 @@
 #include "low_precision_transformations/layer_transformation.hpp"
 #include "low_precision_transformations/network_helper.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <algorithm>

diff --git a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
index e4c3195..157c33d 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
+++ b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
@@ -20,7 +20,6 @@
 #include <ie_common.h>
 #include "cnn_network_impl.hpp"
 #include "ie_util_internal.hpp"
-#include <details/ie_cnn_network_tools.h>
 #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/transformation_context.cpp b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
index d2b005d..2c29faa 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
+++ b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
@@ -4,6 +4,7 @@
 
 #include "low_precision_transformations/transformation_context.hpp"
 #include "details/ie_cnn_network_iterator.hpp"
+#include "details/ie_cnn_network_tools.h"
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::details;

diff --git a/inference-engine/src/low_precision_transformations/src/transformer.cpp b/inference-engine/src/low_precision_transformations/src/transformer.cpp
index c39eaa1..365ecbc 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/transformer.cpp
+++ b/inference-engine/src/low_precision_transformations/src/transformer.cpp
@@ -5,7 +5,6 @@
 #include "low_precision_transformations/transformer.hpp"
 #include "low_precision_transformations/network_helper.hpp"
 
-#include <details/ie_cnn_network_tools.h>
 #include <ie_common.h>
 
 #include <algorithm>

diff --git a/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp b/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
index fb0221b..74f1f85 100644 (file)
--- a/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
@@ -10,7 +10,6 @@
 #pragma once
 
 #include <ie_plugin_config.hpp>
-#include <details/ie_cnn_network_tools.h>
 #include <ie_util_internal.hpp>
 
 #include <details/caseless.hpp>

diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp
index 9c15179..748eac1 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp
+++ b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/ie_parsed_network.hpp
@@ -7,6 +7,7 @@
 #include <vector>
 #include <unordered_map>
 
+#include <ie_layers.h>
 #include <ie_icnn_network.hpp>
 
 namespace vpu {

diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp
index 110109c..aec7fcf 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp
+++ b/inference-engine/src/vpu/graph_transformer/include/vpu/model/data_contents/priorbox_contents.hpp
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <ie_layers.h>
 #include <vpu/model/data_contents/calculated_data_content.hpp>
 
 namespace vpu {

diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp
index ea29b5b..6133221 100644 (file)
--- a/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp
+++ b/inference-engine/src/vpu/myriad_plugin/myriad_executable_network.cpp
@@ -12,7 +12,6 @@
 #include <vpu/blob_reader.hpp>
 #include <vpu/utils/profiling.hpp>
 #include <vpu/utils/runtime_graph.hpp>
-#include <details/ie_cnn_network_tools.h>
 #include <net_pass.h>
 #include <vpu/compile_env.hpp>
 

diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp
index 8aae624..57bd9c6 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/behavior/core_integration.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <gtest/gtest.h>
-#include <details/ie_cnn_network_tools.h>
 #include <ie_core.hpp>
 #include <ie_plugin_config.hpp>
 #include <memory>

diff --git a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp
index c8752e5..27ccd8e 100644 (file)
--- a/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp
+++ b/inference-engine/tests_deprecated/functional/mkldnn/shared_tests_instance/graph_tools/graph_tools_functional_tests.cpp
@@ -5,6 +5,7 @@
 #include <ie_core.hpp>
 #include <ngraph_functions/subgraph_builders.hpp>
 #include "graph_tools_functional_tests.hpp"
+#include "details/ie_cnn_network_tools.h"
 
 using namespace testing;
 using namespace InferenceEngine::details;

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp
index 85b7794..5270981 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/graph_tools/graph_tools_functional_tests.hpp
@@ -4,7 +4,6 @@
 
 #include <gtest/gtest.h>
 #include <ie_layers.h>
-#include <details/ie_cnn_network_tools.h>
 #include <cpp/ie_cnn_network.h>
 #include <memory>
 #include <test_model_path.hpp>

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp
index 2d4f710..986c403 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/low_precision_transformer_single_layer_tests.hpp
@@ -9,6 +9,7 @@
 #include <unordered_map>
 
 #include <ie_core.hpp>
+#include "details/ie_cnn_network_tools.h"
 #include "cpp_interfaces/impl/ie_plugin_internal.hpp"
 
 #include "common/low_precision_tests_utils.hpp"

diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
index ee010d0..37b52c9 100644 (file)
--- a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
+++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
@@ -12,7 +12,6 @@
 #include <gmock/gmock-more-actions.h>
 #include "ie_common.h"
 #include <memory>
-#include "details/ie_cnn_network_tools.h"
 #include "details/ie_cnn_network_iterator.hpp"
 #include <common_test_utils/common_utils.hpp>
 

diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp
index 1cab7b7..7ec5645 100644 (file)
--- a/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp
+++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/util_const_infer_test.hpp
@@ -18,7 +18,6 @@
 #include "blob_factory.hpp"
 #include "debug.h"
 #include "util_test.hpp"
-#include <details/ie_cnn_network_tools.h>
 
 namespace IE = InferenceEngine;