diff options
| author |  Jacques Pienaar <jpienaar@google.com> | 2017-10-06 11:03:06 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-10-06 11:35:46 -0700 |
| commit | 549e651106e1e582dad0e8a6ea57b8f59ce95067 (patch) | |
| tree | 132b0716abc9c7f77fd8b08cf88762dc58a87123 /tensorflow/core/common_runtime | |
| parent | 32e044d333e85d535a27a3729ed836855383be1b (diff) | |
[TF2XLA] Update device name in convert and redo check that name parsing is correct.
* Update ConvertGraphToXla to use the new form for setting the assigned device name.
* Remove some stale comments.
* Revert workaround that allowed the requested device name to not be parsed.
PiperOrigin-RevId: 171314671
Diffstat (limited to 'tensorflow/core/common_runtime')
| -rw-r--r-- | tensorflow/core/common_runtime/executor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc index 11e063d8d2..f57834cfbe 100644 --- a/tensorflow/core/common_runtime/executor.cc +++ b/tensorflow/core/common_runtime/executor.cc @@ -2008,7 +2008,7 @@ bool ExecutorState::NodeDone(const Status& s, const Node* node, NodeExecStatsWrapper* stats, TaggedNodeReadyQueue* inline_ready) { nodestats::SetAllEnd(stats); - if (stats_collector_ != nullptr && !SetTimelineLabel(node, stats)) { + if (!SetTimelineLabel(node, stats)) { // Only record non-transfer nodes. // Transfers 'stats' ownership to 'stats_collector_'. stats_collector_->Save(impl_->params_.device->name(), stats); |