aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/util/device_name_utils.cc
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <bsteiner@google.com>2016-11-09 13:14:03 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-11-09 13:48:22 -0800
commita771598ad83ca33eb42594d7e804859371ba4ca9 (patch)
tree753237f3b4d22e1760084df1ea37975076d387ea /tensorflow/core/util/device_name_utils.cc
parentf0e9bd3c55868eb0a1f61f8cfb2b94ce011e47b4 (diff)
Merge changes from github.
Change: 138675832
Diffstat (limited to 'tensorflow/core/util/device_name_utils.cc')
-rw-r--r--tensorflow/core/util/device_name_utils.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/tensorflow/core/util/device_name_utils.cc b/tensorflow/core/util/device_name_utils.cc
index c38b5758fa..ac18300496 100644
--- a/tensorflow/core/util/device_name_utils.cc
+++ b/tensorflow/core/util/device_name_utils.cc
@@ -142,6 +142,7 @@ bool DeviceNameUtils::ParseFullName(StringPiece fullname, ParsedName* p) {
progress = true;
}
+ // Handle legacy naming convention for cpu and gpu.
if (str_util::ConsumePrefix(&fullname, "/cpu:") ||
str_util::ConsumePrefix(&fullname, "/CPU:")) {
p->has_type = true;