Removed CNNLayer entries from ie_common.h (#1420)

* Removed useless header include

* Removed CNNLayer entries from ie_common.h

inference-engine/include/ie_common.h

@@ -28,20 +28,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
  */

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 {

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);

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>
 

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>

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"

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"

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 {

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 {

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"

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>

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"
 

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>

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>

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>

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>

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"

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"

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"

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>

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"
 

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;

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>

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>

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 {

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 {

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>
 

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>

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;

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>

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"

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>
 

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;