Fix bug in importing MetaGraphDefs containing nested conds.
authorSkye Wanderman-Milne <skyewm@google.com>
Tue, 6 Mar 2018 22:43:10 +0000 (14:43 -0800)
committerTensorFlower Gardener <gardener@tensorflow.org>
Tue, 6 Mar 2018 22:48:47 +0000 (14:48 -0800)
commit86919effa2c1bfb36d0a3accbbbcd1727bf25cb1
tree2d232669107a1afe6e54ea0276684d85c9fd9258
parentfb6cebf5e8444c180713c5c3a71c640e30de1c6d
Fix bug in importing MetaGraphDefs containing nested conds.

This change makes CondContext._external_values more consistently store
Tensors external this context. These values are then not added to the
context when it's imported. This also removes the workaround I added
earlier to manually remove the predicate and pivot Tensors from the
context, instead adding them to _external_values were they're
automatically excluded.

PiperOrigin-RevId: 188083780
tensorflow/contrib/testing/python/framework/fake_summary_writer.py
tensorflow/python/ops/control_flow_ops.py
tensorflow/python/training/saver_test.py