Skip to content

P
Paddle

机器未来 / Paddle
与 Fork 源项目一致

Fork自 PaddlePaddle / Paddle

通知 1
Star 1
Fork 0
P
Paddle
提交 b17444c8 编写于 作者: Y Yu Yang
浏览文件
操作

Fix merge bug 

test=develop
上级 62b5772f
显示空白变更内容
内联 并排
Showing with 4 addition and 6 deletion
paddle/fluid/operators/psroi_pool_op.cc
浏览文件 @ b17444c8
...@@ -129,8 +129,7 @@ class PSROIPoolOp : public framework::OperatorWithKernel { ...@@ -129,8 +129,7 @@ class PSROIPoolOp : public framework::OperatorWithKernel {
protected: protected:
framework::OpKernelType GetExpectedKernelType( framework::OpKernelType GetExpectedKernelType(
const framework::ExecutionContext& ctx) const override { const framework::ExecutionContext& ctx) const override {
return framework::OpKernelType( return framework::OpKernelType(ctx.Input<framework::Tensor>("X")->type(),
framework::ToDataType(ctx.Input<framework::Tensor>("X")->type()),
ctx.device_context()); ctx.device_context());
} }
}; };
...@@ -150,8 +149,7 @@ class PSROIPoolGradOp : public framework::OperatorWithKernel { ...@@ -150,8 +149,7 @@ class PSROIPoolGradOp : public framework::OperatorWithKernel {
protected: protected:
framework::OpKernelType GetExpectedKernelType( framework::OpKernelType GetExpectedKernelType(
const framework::ExecutionContext& ctx) const override { const framework::ExecutionContext& ctx) const override {
return framework::OpKernelType( return framework::OpKernelType(ctx.Input<framework::Tensor>("X")->type(),
framework::ToDataType(ctx.Input<framework::Tensor>("X")->type()),
ctx.device_context()); ctx.device_context());
} }
}; };
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或