Fix merge bug

test=develop

Fix merge bug
test=develop
b17444c8 · Yu Yang · 62b5772f · b17444c8
隐藏空白更改
内联并排

Showing with 4 addition and 6 deletion

paddle/fluid/operators/psroi_pool_op.cc paddle/fluid/operators/psroi_pool_op.cc +4 -6

未找到文件。
--- a/paddle/fluid/operators/psroi_pool_op.cc
+++ b/paddle/fluid/operators/psroi_pool_op.cc
@@ -129,9 +129,8 @@ class PSROIPoolOp : public framework::OperatorWithKernel {
 protected:
  framework::OpKernelType GetExpectedKernelType(
      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,9 +149,8 @@ class PSROIPoolGradOp : public framework::OperatorWithKernel {
 protected:
  framework::OpKernelType GetExpectedKernelType(
      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());
  }
 };