提交 4ebf5118 编写于 作者: Q QI JUN 提交者: GitHub

Merge pull request #3108 from Superjom/fix_rnn

fix paddle/develop build error concerning rnnop
...@@ -69,9 +69,10 @@ void ConcatOutputs(std::vector<std::shared_ptr<Scope>>& step_scopes, ...@@ -69,9 +69,10 @@ void ConcatOutputs(std::vector<std::shared_ptr<Scope>>& step_scopes,
Tensor* step_output = step_scopes[j] Tensor* step_output = step_scopes[j]
->GetVariable(outlinks[i].internal) ->GetVariable(outlinks[i].internal)
->GetMutable<Tensor>(); ->GetMutable<Tensor>();
// TODO data type and platform::DeviceContext() should set correctly // TODO(luotao02) data type and platform::DeviceContext() should set
// correctly
(output->Slice<float>(j, j + 1)) (output->Slice<float>(j, j + 1))
.CopyFrom<float>(*step_output, platform::CPUDeviceContext()); .CopyFrom<float>(*step_output, platform::CPUPlace());
} }
} }
} }
......
...@@ -43,7 +43,7 @@ Eigen::GpuDevice* DeviceContext::get_eigen_device<Eigen::GpuDevice>() const { ...@@ -43,7 +43,7 @@ Eigen::GpuDevice* DeviceContext::get_eigen_device<Eigen::GpuDevice>() const {
CUDADeviceContext::CUDADeviceContext(GPUPlace place) : place_(place) { CUDADeviceContext::CUDADeviceContext(GPUPlace place) : place_(place) {
SetDeviceId(place_.device); SetDeviceId(place_.device);
// TODO (qijun) Pass a created cuda stream to Eigen::CudaStreamDevice directly // TODO(qijun) Pass a created cuda stream to Eigen::CudaStreamDevice directly
// here will cause segment fault. We must implement a class derived from // here will cause segment fault. We must implement a class derived from
// Eigen::StreamInterface, and reinitialize it with a cuda stream and a gpu id // Eigen::StreamInterface, and reinitialize it with a cuda stream and a gpu id
// later. Please refer to the implementation of class EigenCudaStreamDevice // later. Please refer to the implementation of class EigenCudaStreamDevice
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册