From: A. Unique TensorFlower <gardener@tensorflow.org>
Date: Fri, 2 Feb 2018 17:20:26 +0000 (-0800)
Subject: Fix latent bug in dependency optimizer.
X-Git-Tag: upstream/v1.7.0~31^2~1061
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cfdf520d997e73011ee7bd5a183ced622a913aa;p=platform%2Fupstream%2Ftensorflow.git

Fix latent bug in dependency optimizer.

PiperOrigin-RevId: 184291701
---

diff --git a/tensorflow/core/grappler/optimizers/dependency_optimizer.cc b/tensorflow/core/grappler/optimizers/dependency_optimizer.cc
index 0842fc9..7b4ca14 100644
--- a/tensorflow/core/grappler/optimizers/dependency_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/dependency_optimizer.cc
@@ -97,7 +97,12 @@ bool DependencyOptimizer::SafeToRemoveIdentity(const NodeDef& node) {
       // TODO(rmlarsen): Try to remove this artificial contraint.
       return false;
     }
-    for (auto consumer : node_map_->GetOutputs(node.name())) {
+  }
+  for (auto consumer : node_map_->GetOutputs(node.name())) {
+    if (node.input_size() > 1 && IsMerge(*consumer)) {
+      return false;
+    }
+    if (IsSwitch(*input)) {
       for (const string& consumer_input : consumer->input()) {
         if (consumer_input == AsControlDependency(node.name())) {
           return false;