merge confict, test=develop

6 years ago · facd95e6e3
parent 01f4f2d7e4
commit facd95e6e3
1 changed files with 1 additions and 1 deletions
--- a/paddle/fluid/operators/load_op.cc
+++ b/paddle/fluid/operators/load_op.cc
@ -29,7 +29,7 @@ class LoadOp : public framework::OperatorWithKernel {
  framework::OpKernelType GetExpectedKernelType(
      const framework::ExecutionContext &ctx) const override {
    framework::OpKernelType kt = framework::OpKernelType(
-        framework::proto::VarType::FP32, platform::CPUPlace());
+        framework::proto::VarType::FP32, ctx.GetPlace());
    return kt;
  }
 };