From 2f0ac02d72483b109751fbe2ff170dc67fcc6216 Mon Sep 17 00:00:00 2001
From: Cesar Crusius <ccrusius@google.com>
Date: Mon, 6 Apr 2020 14:58:59 -0700
Subject: [PATCH] Use canonical CPU device name in TensorHandle::Resolve.

PiperOrigin-RevId: 305124817
Change-Id: I2e51fa917503d4deab90ed57b1407f77a89c280f
---
 tensorflow/core/common_runtime/eager/core.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/eager/core.cc b/tensorflow/core/common_runtime/eager/core.cc
index 20500ac210e..de7e7475a1c 100644
--- a/tensorflow/core/common_runtime/eager/core.cc
+++ b/tensorflow/core/common_runtime/eager/core.cc
@@ -41,7 +41,7 @@ AbstractTensorInterface* TensorHandle::Resolve(Status* status) {
     auto* custom_device = absl::get<CustomDevice*>(device());
     TensorHandle* copy;
     *status = custom_device->CopyTensorFromDevice(
-        this, "/job:localhost/task:0/replica:0/device:CPU:0", &copy);
+        this, "/job:localhost/replica:0/task:0/device:CPU:0", &copy);
     if (status->ok()) {
       return copy->Resolve(status);
     } else {