From f7d6711137d24aba7d84846b2b60718a950bf05f Mon Sep 17 00:00:00 2001
From: Ilya Lavrenov <ilya.lavrenov@intel.com>
Date: Tue, 21 Jul 2020 06:36:18 +0300
Subject: [PATCH] Removed addLayer implementation from ngraph impl (#1400)

---
 .../src/inference_engine/cnn_network_ngraph_impl.cpp | 11 -----------
 .../src/inference_engine/cnn_network_ngraph_impl.hpp |  2 --
 inference-engine/src/legacy_api/src/net_pass.cpp     | 12 ++++--------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
index 86481bf9307..c77a5c0261e 100644
--- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
+++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
@@ -196,17 +196,6 @@ size_t CNNNetworkNGraphImpl::layerCount() const noexcept {
     return _ngraph_function->get_ops().size();
 }
 
-void CNNNetworkNGraphImpl::addLayer(const CNNLayerPtr& layer) noexcept {
-    try {
-        if (!cnnNetwork) {
-            convertToCNNNetworkImpl();
-        }
-        cnnNetwork->addLayer(layer);
-    } catch (...) {
-        return;
-    }
-}
-
 void CNNNetworkNGraphImpl::validate(int version) {
     if (cnnNetwork)
         cnnNetwork->validate();
diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp
index 95a1aca11ff..ba84a1a82b2 100644
--- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp
+++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp
@@ -56,8 +56,6 @@ public:
 
     void setInputInfo(InputInfo::Ptr data);
 
-    void addLayer(const CNNLayerPtr& layer) noexcept;
-
     // public version
     StatusCode setBatchSize(size_t size, ResponseDesc* responseDesc) noexcept override;
 
diff --git a/inference-engine/src/legacy_api/src/net_pass.cpp b/inference-engine/src/legacy_api/src/net_pass.cpp
index 36dc1a8015a..f3e613dacc5 100644
--- a/inference-engine/src/legacy_api/src/net_pass.cpp
+++ b/inference-engine/src/legacy_api/src/net_pass.cpp
@@ -492,8 +492,7 @@ bool convertToRNNSeq(CNNLayerPtr cur, const N& net) {
 
 bool unrollTI(CNNLayerPtr cur, ICNNNetwork& net) {
     auto inet = dynamic_cast<details::CNNNetworkImpl*>(&net);
-    auto ngraphnet = dynamic_cast<details::CNNNetworkNGraphImpl*>(&net);
-    IE_ASSERT(inet != nullptr || ngraphnet != nullptr);
+    IE_ASSERT(inet != nullptr);
 
     if (cur->type != "TensorIterator") return true;
 
@@ -513,8 +512,7 @@ bool unrollTI(CNNLayerPtr cur, ICNNNetwork& net) {
         auto holder = body_list[i].inputs.back();
         if (holder->getPrecision() == Precision::UNSPECIFIED) {
             for (auto kvp : getInputTo(holder)) {
-                if (inet) inet->addLayer(kvp.second);
-                else ngraphnet->addLayer(kvp.second);
+                inet->addLayer(kvp.second);
             }
         }
     }
@@ -1242,14 +1240,12 @@ std::vector<CNNLayerPtr> TopolSort(const details::CNNSubnet& net) {
 
 void restore_net_consistency(ICNNNetwork& net) {
     auto inet = dynamic_cast<details::CNNNetworkImpl*>(&net);
-    auto ngraphnet = dynamic_cast<details::CNNNetworkNGraphImpl*>(&net);
-    IE_ASSERT(inet != nullptr || ngraphnet != nullptr);
+    IE_ASSERT(inet != nullptr);
     // At first all layers should be available via findByName() api.
     // In other words all layers should be present in internal map<name, layer>
     IE_SUPPRESS_DEPRECATED_START
     for (auto& l : TopolSort(net)) {
-        if (inet) inet->addLayer(l);
-        else ngraphnet->addLayer(l);
+        inet->addLayer(l);
     }
     IE_SUPPRESS_DEPRECATED_END
 }