Stop overriding destination device to nullptr (CPU:0) when its on CPU

Akshay Modi · tensorflower-gardener · commit f8d9f1f2f084 · 2018-08-28T14:27:10.000-07:00
PiperOrigin-RevId: 210604794
diff --git a/tensorflow/core/common_runtime/eager/tensor_handle.cc b/tensorflow/core/common_runtime/eager/tensor_handle.cc
@@ -193,7 +193,6 @@ Status TensorHandle::CopyToDevice(EagerContext* ctx, tensorflow::Device* dstd,
   // has device type XLA_CPU, and the other CPU.
   const bool both_on_cpu = src_cpu && dst_cpu;
   if (is_same_device || both_on_cpu) {
-    dstd = dst_cpu ? nullptr : dstd;
     *output = new tensorflow::TensorHandle(*src, dstd, dstd, ctx);
     return tensorflow::Status::OK();
   }

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ Status TensorHandle::CopyToDevice(EagerContext* ctx, tensorflow::Device* dstd,`
`193`	`193`	`// has device type XLA_CPU, and the other CPU.`
`194`	`194`	`const bool both_on_cpu = src_cpu && dst_cpu;`
`195`	`195`	`if (is_same_device \|\| both_on_cpu) {`
`196`		`- dstd = dst_cpu ? nullptr : dstd;`
`197`	`196`	`output = new tensorflow::TensorHandle(src, dstd, dstd, ctx);`
`198`	`197`	`return tensorflow::Status::OK();`
`199`	`198`	`}`