fix ZeroCopyTensor::mutable_data(), test=release/1.6 (#21581)

Shixiaowei02 · web-flow · commit e228e7079fe1 · 2019-12-06T12:14:14.000+08:00
diff --git a/paddle/fluid/inference/api/details/zero_copy_tensor.cc b/paddle/fluid/inference/api/details/zero_copy_tensor.cc
@@ -52,7 +52,7 @@ T *ZeroCopyTensor::mutable_data(PaddlePlace place) {
       return tensor->mutable_data<T>(platform::CPUPlace());
     }
     case static_cast<int>(PaddlePlace::kGPU): {
-      return tensor->mutable_data<T>(platform::CUDAPlace());
+      return tensor->mutable_data<T>(platform::CUDAPlace(device_));
     }
     default:
       PADDLE_THROW("Unsupported place: %d", static_cast<int>(place));
diff --git a/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc b/paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc
@@ -51,6 +51,7 @@ TEST(ZeroCopyTensor, uint8) {
   input_t->Reshape({batch_size, length});
   input_t->copy_from_cpu(input);
   input_t->type();
+  input_t->mutable_data<uint8_t>(PaddlePlace::kGPU);
 
   ASSERT_TRUE(predictor->ZeroCopyRun());
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ T *ZeroCopyTensor::mutable_data(PaddlePlace place) {`
`52`	`52`	`return tensor->mutable_data<T>(platform::CPUPlace());`
`53`	`53`	`}`
`54`	`54`	`case static_cast<int>(PaddlePlace::kGPU): {`
`55`		`- return tensor->mutable_data<T>(platform::CUDAPlace());`
	`55`	`+ return tensor->mutable_data<T>(platform::CUDAPlace(device_));`
`56`	`56`	`}`
`57`	`57`	`default:`
`58`	`58`	`PADDLE_THROW("Unsupported place: %d", static_cast<int>(place));`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ TEST(ZeroCopyTensor, uint8) {`
`51`	`51`	`input_t->Reshape({batch_size, length});`
`52`	`52`	`input_t->copy_from_cpu(input);`
`53`	`53`	`input_t->type();`
	`54`	`+ input_t->mutable_data<uint8_t>(PaddlePlace::kGPU);`
`54`	`55`
`55`	`56`	`ASSERT_TRUE(predictor->ZeroCopyRun());`
`56`	`57`	`}`