Enabled Convolution + post ops fusing (openvinotoolkit#20)

mandrono · Mar 25, 2021 · 1ec5f8c · 1ec5f8c
1 parent f0dab6a
commit 1ec5f8c
Show file tree

Hide file tree

Showing 27 changed files with 513 additions and 519 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
@@ -99,10 +99,6 @@ set(LAYERS
 #    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/unique.cpp
 #    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/unsqueeze.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nodes/common/softmax.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/common/emitter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/jit_eltwise_emitters.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/jit_mkldnn_emitters.cpp
-#
 #    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/argmax.cpp
 #    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/argmax_imp.cpp
 #    ${CMAKE_CURRENT_SOURCE_DIR}/nodes/topk.cpp

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp
@@ -265,11 +265,6 @@ void MKLDNNGraph::Replicate(const CNNNetwork &network, const MKLDNNExtensionMana
 
         op2node[op] = node;
 
-        const auto& rtInfo = op->get_rt_info();
-        if (rtInfo.count("originalLayersNames")) {
-            node->originalLayers = getRTInfoValue(rtInfo, "originalLayersNames");
-        }
-
         for (size_t port = 0; port < op->get_input_size(); port++) {
             auto parentOp = op->get_input_node_shared_ptr(port);
 
@@ -349,7 +344,6 @@ void MKLDNNGraph::InitGraph() {
 
     CreatePrimitives();
 
-    SetOriginalLayerNames();
 //
 //    if (!config.dumpToDot.empty())
 //        dumpToDotFile(config.dumpToDot + "_init.dot");
@@ -381,30 +375,6 @@ void MKLDNNGraph::InitGraph() {
     ExecuteConstantNodesOnly();
 }
 
-void MKLDNNGraph::SetOriginalLayerNames() {
-    OV_ITT_SCOPED_TASK(itt::domains::MKLDNN_LT, "MKLDNNGraph::SetOriginalLayerNames");
-    // Do it before cleanup. Because it will lose original layers information
-    for (auto &graphNode : graphNodes) {
-        auto nodeType = graphNode->getType();
-        if (nodeType == Reorder || nodeType == Output) continue;
-
-        if (graphNode->getOriginalLayers().empty()) {
-            graphNode->addOriginalLayer(graphNode->getOriginalName());
-        }
-
-        if (!graphNode->getFusedWith().empty() || !graphNode->getMergeWith().empty()) {
-            // Original layer names
-            std::vector<MKLDNNNodePtr> internal = graphNode->getFusedWith();
-            auto &merged = graphNode->getMergeWith();
-            internal.insert(internal.end(), merged.begin(), merged.end());
-
-            for (auto &sub_node : internal) {
-                graphNode->addOriginalLayer(sub_node->getOriginalName());
-            }
-        }
-    }
-}
-
 void MKLDNNGraph::InitNodes() {
     OV_ITT_SCOPED_TASK(itt::domains::MKLDNN_LT, "MKLDNNGraph::InitNodes");
     for (auto &node : graphNodes) {

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.h b/inference-engine/src/mkldnn_plugin/mkldnn_graph.h
@@ -200,7 +200,6 @@ class MKLDNNGraph {
     void AllocateWithReuse();
     void CreatePrimitives();
     void ExecuteConstantNodesOnly();
-    void SetOriginalLayerNames();
 
     void do_before(const std::string &dir, const MKLDNNNodePtr &node);
     void do_after(const std::string &dir, const MKLDNNNodePtr &node);