From 5a174f605ee22ef8ecb562215051c8a11551d5bb Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Wed, 7 Feb 2018 21:05:41 -0800 Subject: [PATCH] Temporarily weaken Identity pruning in model_pruner while investigating test failure of //robotics/learning/sensor_predict:utils_multi_sensor_rnn_test. PiperOrigin-RevId: 184942554 --- tensorflow/core/grappler/optimizers/model_pruner.cc | 14 ++++++++------ tensorflow/core/grappler/optimizers/model_pruner_test.cc | 5 +++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tensorflow/core/grappler/optimizers/model_pruner.cc b/tensorflow/core/grappler/optimizers/model_pruner.cc index 0128240..ece9df0 100644 --- a/tensorflow/core/grappler/optimizers/model_pruner.cc +++ b/tensorflow/core/grappler/optimizers/model_pruner.cc @@ -32,12 +32,14 @@ bool IsTrivialOp(const NodeDef& node, const GraphRewriter& rewriter) { if (IsStopGradient(node)) { return true; } - if (IsIdentity(node) && - !(rewriter.FeedsMerge(node) && - rewriter.IsDrivenByControlDependency(node)) && - !(rewriter.IsDrivenBySwitch(node) && - rewriter.DrivesControlDependency(node))) { - return true; + if (IsIdentity(node)) { + if (rewriter.FeedsMerge(node) || rewriter.IsDrivenBySwitch(node) || + rewriter.IsDrivenByControlDependency(node) || + rewriter.DrivesControlDependency(node)) { + return false; + } else { + return true; + } } if (IsAddN(node) && NumNonControlInputs(node) <= 1) { return true; diff --git a/tensorflow/core/grappler/optimizers/model_pruner_test.cc b/tensorflow/core/grappler/optimizers/model_pruner_test.cc index c394442..8480a74 100644 --- a/tensorflow/core/grappler/optimizers/model_pruner_test.cc +++ b/tensorflow/core/grappler/optimizers/model_pruner_test.cc @@ -234,6 +234,10 @@ TEST_F(ModelPrunerTest, PruningSkipsRefOutputs) { EXPECT_EQ("b", new_e.input(0)); } +// TODO(rmlarsen): Reenable this test when the issues with +// //robotics/learning/sensor_predict:utils_multi_sensor_rnn_test +// have been resolved. +/* TEST_F(ModelPrunerTest, PruningForwardsCtrlDependencies) { // Build a simple graph with a few trivially prunable ops. tensorflow::Scope s = tensorflow::Scope::NewRootScope(); @@ -276,6 +280,7 @@ TEST_F(ModelPrunerTest, PruningForwardsCtrlDependencies) { } } } +*/ TEST_F(ModelPrunerTest, PruningPerservesFetch) { // Build a simple graph with a few trivially prunable ops. -- 2.7.4