diff options
author | Vijay Vasudevan <vrv@google.com> | 2016-05-12 15:26:42 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-05-12 16:31:33 -0700 |
commit | c34a0d7ea6b557588a7a0c9f9c4e60d59f593af7 (patch) | |
tree | 1f1c419c9b32ef79d7ca8f03974c534576663cc4 /tensorflow/core/common_runtime/simple_placer.cc | |
parent | f5264a80ce137a9a44f6edc504f9cea9d88be4ea (diff) |
Change behavior of DirectSession so that it places the entire graph
by default, instead of only the pruned graphs.
Several reasons motivate this change:
- A bug in a the graph (program) today is only identified when
you run the op.
- Interactive sessions need to allow graphs that have "bugs" in it
because people just continue to add to their existing graph,
so we need a way to preserve the old behavior. We do that
by setting the field by default to true in InteractiveSession.
Tests added for both the change in direct_session as well as
the InteractiveSession use case.
Fixes #1914, #1748
This refactors direct_session and simple_graph_execution_state (used by the distributed
runtime) to share the same graph execution and placement code, to reduce code
divergence.
Change: 122210923
Diffstat (limited to 'tensorflow/core/common_runtime/simple_placer.cc')
-rw-r--r-- | tensorflow/core/common_runtime/simple_placer.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc index 19a44c6a98..c14c37a4c3 100644 --- a/tensorflow/core/common_runtime/simple_placer.cc +++ b/tensorflow/core/common_runtime/simple_placer.cc @@ -469,7 +469,6 @@ class ColocationGraph { // If the NodeDef contains a device, then we interpret it as a // (partial) device specification. - string colocated_node_name; if (!node.def().device().empty()) { // The user has specified a device in the NodeDef, try to find a // valid device matching their specification in the set of @@ -659,7 +658,6 @@ Status SimplePlacer::Run() { // and we can experiment with other algorithms when given a choice of // devices. node->set_assigned_device_name(devices[0]->name()); - // Log placement if log_device_placement is set. if (options_ && options_->config.log_device_placement()) { printf("%s: %s\n", node->name().c_str(), |