From facd95e6e32f8f7fafdf3261e579ef025435cf45 Mon Sep 17 00:00:00 2001
From: lujun <lujun315023@126.com>
Date: Wed, 3 Apr 2019 18:11:51 +0800
Subject: [PATCH] merge confict, test=develop

---
 paddle/fluid/operators/load_op.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paddle/fluid/operators/load_op.cc b/paddle/fluid/operators/load_op.cc
index 656728c60..435c755df 100644
--- 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;
   }
 };
-- 
GitLab