From 69c2acbdb925e8a37467752512f2a906206611d2 Mon Sep 17 00:00:00 2001
From: chengduozh <zhaochengduo@baidu.com>
Date: Mon, 29 Oct 2018 19:57:55 +0800
Subject: [PATCH] fix ci fail test=release/1.1

---
 paddle/fluid/framework/operator.cc | 2 +-
 paddle/fluid/framework/operator.h  | 1 +
 paddle/fluid/operators/sum_op.cc   | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index 14fcde2fe..9259bb740 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -358,7 +358,7 @@ static bool VarIsTensor(const Variable* var) {
   return var->IsType<LoDTensor>() || var->IsType<SelectedRows>();
 }
 
-static const Tensor* GetTensorFromVar(Variable* var) {
+const Tensor* GetTensorFromVar(Variable* var) {
   if (var->IsType<LoDTensor>()) {
     return var->GetMutable<LoDTensor>();
   } else if (var->IsType<SelectedRows>()) {
diff --git a/paddle/fluid/framework/operator.h b/paddle/fluid/framework/operator.h
index 626b50edf..a04d2834e 100644
--- a/paddle/fluid/framework/operator.h
+++ b/paddle/fluid/framework/operator.h
@@ -63,6 +63,7 @@ inline std::string GradVarName(const std::string& var_name) {
 }
 
 proto::VarType::Type GetDataTypeOfVar(const Variable* var);
+const Tensor* GetTensorFromVar(Variable* var);
 
 class OperatorBase;
 class ExecutionContext;
diff --git a/paddle/fluid/operators/sum_op.cc b/paddle/fluid/operators/sum_op.cc
index cc3d8db3b..6fe30630e 100644
--- a/paddle/fluid/operators/sum_op.cc
+++ b/paddle/fluid/operators/sum_op.cc
@@ -81,10 +81,10 @@ class SumOp : public framework::OperatorWithKernel {
 
     if (x_vars[0]->IsType<framework::LoDTensor>()) {
       int dtype = -1;
-      auto x_var_names = ctx.Inputs("X");
-      for (auto& x_var_n : x_var_names) {
+      for (auto& x_var : x_vars) {
         // FIXME(zcd): The input x_var may be SelectedRows or LoDTensor.
-        auto tensor = ctx.Input<Tensor>(x_var_n);
+        auto tensor = framework::GetTensorFromVar(
+            const_cast<framework::Variable*>(x_var));
         if (tensor->numel() == 0) {
           continue;
         }
-- 
GitLab