fix data trans

chengduoZH · chengduoZH · commit 4bfadcd136d3 · 2018-05-24T12:31:18.000+08:00
diff --git a/paddle/fluid/framework/data_device_transform.cc b/paddle/fluid/framework/data_device_transform.cc
@@ -38,7 +38,8 @@ void TransDataDevice(const Tensor& in, const platform::Place& dst_place,
   auto* dev_ctx = GetDeviceContext(in.place(), dst_place);
 
   TensorCopy(in, dst_place, *dev_ctx, out);
-  if (platform::is_gpu_place(in.place()) && platform::is_cpu_place(dst_place)) {
+
+  if (in.place().which() != dst_place.which()) {
     dev_ctx->Wait();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ void TransDataDevice(const Tensor& in, const platform::Place& dst_place,`
`38`	`38`	`auto* dev_ctx = GetDeviceContext(in.place(), dst_place);`
`39`	`39`
`40`	`40`	`TensorCopy(in, dst_place, *dev_ctx, out);`
`41`		`- if (platform::is_gpu_place(in.place()) && platform::is_cpu_place(dst_place)) {`
	`41`	`+`
	`42`	`+ if (in.place().which() != dst_place.which()) {`
`42`	`43`	`dev_ctx->Wait();`
`43`	`44`	`}`
`44`	`45`	`}`