Removed CNNNetwork BlobTransformer (#1709)

* Removed CNNNetwork BlobTransformer

* Removed inference_engine_lp_transformations dependency for GNA and VPU plugins

diff --git a/inference-engine/src/gna_plugin/CMakeLists.txt b/inference-engine/src/gna_plugin/CMakeLists.txt
index 38a7e887009453b3bf0decb60a2b6e850d6d0a24..81649905502567a4a73fd19b80d8aa0d758d7f78 100644 (file)
--- a/inference-engine/src/gna_plugin/CMakeLists.txt
+++ b/inference-engine/src/gna_plugin/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 #saving rpath to GNA shared library be used by CI
 log_rpath_from_dir(GNA ${libGNA_LIBRARIES_BASE_PATH})
 
-target_link_libraries(${TARGET_NAME} PRIVATE inference_engine inference_engine_lp_transformations Threads::Threads libGNA)
+target_link_libraries(${TARGET_NAME} PRIVATE inference_engine Threads::Threads libGNA)
 target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(${TARGET_NAME}
     PRIVATE

diff --git a/inference-engine/src/gna_plugin/gna_plugin.cpp b/inference-engine/src/gna_plugin/gna_plugin.cpp
index b77bfe7e36aa93d3e98f0b096e3e55aa445e89a8..9254a96cf1d748c46a8ed92ce72795a5c4a52a62 100644 (file)
--- a/inference-engine/src/gna_plugin/gna_plugin.cpp
+++ b/inference-engine/src/gna_plugin/gna_plugin.cpp
@@ -18,7 +18,6 @@
 #include <utility>
 #include <limits>
 
-#include <low_precision_transformations/blob_transformation.hpp>
 #include <legacy/graph_tools.hpp>
 #include <legacy/net_pass.h>
 #include <debug.h>
@@ -349,10 +348,6 @@ void GNAPlugin::LoadNetwork(ICNNNetwork & _network) {
     NetPass::ConvertPrecision(network, Precision::U64, Precision::I32);
     NetPass::ConvertPrecision(network, Precision::U32, Precision::I32);
 
-    // move blobs from Constant layers to Convolution, Deconvolution, FullyConnected layers attributes
-    BlobTransformation blobsTransformation;
-    blobsTransformation.transform(network, true);
-
     //  Check the input network
     std::string error;
     if (!AreLayersSupported(network, error)) {

diff --git a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/blob_transformation.hpp b/inference-engine/src/low_precision_transformations/include/low_precision_transformations/blob_transformation.hpp
deleted file mode 100644 (file)
index 9d582e1..0000000
--- a/inference-engine/src/low_precision_transformations/include/low_precision_transformations/blob_transformation.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2018-2020 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#pragma once
-
-#include <algorithm>
-#include <string>
-#include <unordered_set>
-
-#include <ie_icnn_network.hpp>
-
-namespace InferenceEngine {
-namespace details {
-
-class INFERENCE_ENGINE_API_CLASS(BlobTransformation) {
-public:
-    BlobTransformation() = default;
-    void transform(ICNNNetwork& network, bool transformWithFakeQuantizeOnWeights = false) const;
-
-private:
-    const std::unordered_set<std::string> layersForTransformations = {
-        "Convolution",
-        "Deconvolution",
-        "FullyConnected"
-    };
-};
-
-}  // namespace details
-}  // namespace InferenceEngine

diff --git a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp b/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp
deleted file mode 100644 (file)
index 81c9ec2..0000000
--- a/inference-engine/src/low_precision_transformations/src/blob_transformation.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2018-2020 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include "low_precision_transformations/blob_transformation.hpp"
-#include "low_precision_transformations/network_helper.hpp"
-#include <legacy/details/ie_cnn_network_tools.h>
-
-#include <algorithm>
-#include <vector>
-
-
-using namespace InferenceEngine;
-using namespace InferenceEngine::details;
-
-void BlobTransformation::transform(ICNNNetwork& network, bool transformWithFakeQuantizeOnWeights) const {
-    const std::vector<CNNLayerPtr> layers = CNNNetSortTopologically(network);
-
-    for (const CNNLayerPtr& layer : layers) {
-        if (layer->insData.size() < 2) {
-            continue;
-        }
-        if (this->layersForTransformations.find(layer->type) == this->layersForTransformations.end()) {
-            continue;
-        }
-
-        const CNNLayerPtr weightsLayer = CNNNetworkHelper::getParent(*layer, 1);
-        if ((!transformWithFakeQuantizeOnWeights) &&
-            ((weightsLayer->type == "FakeQuantize") || (weightsLayer->type == "Quantize"))) {
-            continue;
-        }
-
-        WeightableLayer* weightableLayer = dynamic_cast<WeightableLayer*>(layer.get());
-        if (weightableLayer == nullptr) {
-            continue;
-        }
-
-        const Blob::Ptr weightsBlob = CNNNetworkHelper::getWeights(*layer, false);
-        if (weightsBlob != nullptr) {
-            weightableLayer->blobs["weights"] = weightsBlob;
-            weightableLayer->_weights = weightsBlob;
-        }
-
-        if (layer->insData.size() >= 3) {
-            const Blob::Ptr biasesBlob = CNNNetworkHelper::getBiases(*layer);
-            if (biasesBlob != nullptr) {
-                weightableLayer->blobs["biases"] = biasesBlob;
-                weightableLayer->_biases = biasesBlob;
-            }
-
-            CNNLayerPtr biasesLayer = CNNNetworkHelper::getParent(*layer, 2);
-            CNNNetworkHelper::removeLayer(network, biasesLayer);
-        }
-
-        CNNNetworkHelper::removeLayer(network, weightsLayer);
-    }
-}

diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
index 19ec225a44f790eeba7f2db51090b57c841e0684..a45437453f05c695a129f7f836df25544803f370 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
@@ -45,7 +45,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
         target_link_libraries(${TARGET_NAME} PUBLIC pugixml vpu_common_lib)
     endif()
 
-    target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_lp_transformations
+    target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES}
                                          PRIVATE openvino::itt)
 
     if(WIN32)

diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
index 8eaf3f3055193f26826ae6ed166d0ce3e4dcfc25..07c32ce549ac0c76f298da699f3f9d7192f37872 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
+++ b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
@@ -66,9 +66,6 @@ private:
     void removeConstLayers(
             ie::ICNNNetwork& network);
 
-    void moveConstInputsToBlobs(
-            ie::ICNNNetwork& network);
-
     //
     // Process internal VPU Model
     //

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp
index a64da5e433a58794a268849796c3c220c06ab93d..368cef9b4178ed7f792252aa796d3be519167e20 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/frontend/frontend.cpp
@@ -426,8 +426,6 @@ ModelPtr FrontEnd::runCommonPasses(ie::ICNNNetwork& network, const UnsupportedLa
         ie::NetPass::ConvertPrecision(*originalOrConvertNetwork, ie::Precision::U64, ie::Precision::I32);
         ie::NetPass::ConvertPrecision(*originalOrConvertNetwork, ie::Precision::BOOL, ie::Precision::I32);
 
-        moveConstInputsToBlobs(*originalOrConvertNetwork);
-
         removeConstLayers(*originalOrConvertNetwork);
 
         unrollLoops(*originalOrConvertNetwork);

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/move_const_inputs_to_blobs.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/move_const_inputs_to_blobs.cpp
deleted file mode 100644 (file)
index a9e0125..0000000
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/move_const_inputs_to_blobs.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2018-2020 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <vpu/frontend/frontend.hpp>
-
-#include <low_precision_transformations/blob_transformation.hpp>
-
-#include <vpu/compile_env.hpp>
-
-namespace vpu {
-
-void FrontEnd::moveConstInputsToBlobs(ie::ICNNNetwork& network) {
-    VPU_PROFILE(moveConstInputsToBlobs);
-
-    const auto& env = CompileEnv::get();
-
-    env.log->trace("Move const inputs to blobs");
-    VPU_LOGGER_SECTION(env.log);
-
-    ie::details::BlobTransformation blobsTransformation;
-    blobsTransformation.transform(network, true);
-}
-
-}  // namespace vpu