From 57676cf64d5c4a4625932918406da3b74b188ca5 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Sat, 24 Aug 2019 23:14:26 +0300 Subject: [PATCH] Fix https://github.com/opencv/opencv/issues/15141 --- modules/dnn/src/tensorflow/tf_graph_simplifier.cpp | 4 ++-- modules/dnn/test/test_tf_importer.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/dnn/src/tensorflow/tf_graph_simplifier.cpp b/modules/dnn/src/tensorflow/tf_graph_simplifier.cpp index 96bcdbd..0f9670e 100644 --- a/modules/dnn/src/tensorflow/tf_graph_simplifier.cpp +++ b/modules/dnn/src/tensorflow/tf_graph_simplifier.cpp @@ -787,7 +787,7 @@ void RemoveIdentityOps(tensorflow::GraphDef& net) const tensorflow::NodeDef &layer = net.node(li); String type = layer.op(); - if (type == "Identity" || type == "Dropout") { + if (type == "Identity" || type == "Dropout" || type == "PlaceholderWithDefault") { identity_ops_idx.push_back(li); identity_ops[layer.name()] = layer.input(0); } @@ -1031,7 +1031,7 @@ void removePhaseSwitches(tensorflow::GraphDef& net) } } nodesToRemove.push_back(i); - if (node.op() == "Merge") + if (node.op() == "Merge" || node.op() == "Switch") mergeOpSubgraphNodes.push(i); } } diff --git a/modules/dnn/test/test_tf_importer.cpp b/modules/dnn/test/test_tf_importer.cpp index dac55d6..dd10a4d 100644 --- a/modules/dnn/test/test_tf_importer.cpp +++ b/modules/dnn/test/test_tf_importer.cpp @@ -729,6 +729,7 @@ TEST_P(Test_TensorFlow_layers, subpixel) TEST_P(Test_TensorFlow_layers, keras_mobilenet_head) { runTensorFlowNet("keras_mobilenet_head"); + runTensorFlowNet("keras_learning_phase"); } TEST_P(Test_TensorFlow_layers, resize_bilinear) -- 2.7.4