From 2594a50245ae7bfe91f05d3c162af39b2457fa21 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Wed, 4 Oct 2017 15:49:43 -0700
Subject: [PATCH] Polish code

---
 paddle/framework/backward.cc                      |  1 -
 paddle/framework/backward_test.cc                 | 12 ------------
 paddle/framework/op_info.h                        |  2 --
 paddle/framework/op_registry.cc                   |  1 -
 paddle/operators/mean_op.cc                       |  1 -
 paddle/operators/softmax_with_cross_entropy_op.cc |  5 -----
 6 files changed, 22 deletions(-)

diff --git a/paddle/framework/backward.cc b/paddle/framework/backward.cc
index 9193a1593e..3d81dadfc4 100644
--- a/paddle/framework/backward.cc
+++ b/paddle/framework/backward.cc
@@ -203,7 +203,6 @@ static std::unique_ptr<OperatorBase> BackwardRecursive(
     }
   } else {
     std::unique_ptr<OperatorBase> grad_op(CreateGradOp(forwardOp));
-    PADDLE_ENFORCE(grad_op != nullptr);
 
     ForEachVarName(grad_op->Inputs(), [&no_grad_names, &net, &grad_op](
                                           const std::string& grad_input) {
diff --git a/paddle/framework/backward_test.cc b/paddle/framework/backward_test.cc
index 830d0427fa..a9b71cd809 100644
--- a/paddle/framework/backward_test.cc
+++ b/paddle/framework/backward_test.cc
@@ -171,17 +171,6 @@ REGISTER_OP_WITHOUT_GRADIENT(fc, f::FcOp, f::FcOpMaker);
 REGISTER_OP(many_output_op, f::NOP, f::ManyOutputOpMaker, many_output_op_grad,
             f::NOP);
 
-// TEST(Backward, simple_op_grad) {
-//  auto fwd = f::OpRegistry::CreateOp(
-//      "rowwise_add", {{"X", {"x"}}, {"b", {"b"}}}, {{"Out", {"out"}}}, {});
-//  ASSERT_NE(fwd, nullptr);
-//  auto gop = f::OpRegistry::CreateGradOp(*fwd);
-//  ASSERT_EQ(1UL, gop->Inputs().size());
-//  ASSERT_EQ("rowwise_add_grad", gop->Type());
-//  ASSERT_EQ(f::GradVarName("x"), gop->Output(f::GradVarName("X")));
-//  ASSERT_EQ(f::GradVarName("b"), gop->Output(f::GradVarName("b")));
-//}
-
 TEST(Backward, simple_op_not_need_grad) {
   auto fwd = f::OpRegistry::CreateOp(
       "rowwise_add", {{"X", {"x"}}, {"b", {"b"}}}, {{"Out", {"out"}}}, {});
@@ -390,7 +379,6 @@ TEST(Backward, linear_net_intermediate_variable_has_no_grad) {
                 + 1UL /* external output number*/
                 + 1UL /* number of gradient of external output*/
                 + 2U /* internal variable number*/);
-
   EXPECT_EQ(grad_fc.Outputs(all).size(),
             2UL       /* input number of mul*/
                 + 2UL /* input number of rowwise_add
diff --git a/paddle/framework/op_info.h b/paddle/framework/op_info.h
index 968f587b46..231f212fa3 100644
--- a/paddle/framework/op_info.h
+++ b/paddle/framework/op_info.h
@@ -23,8 +23,6 @@
 #include "paddle/framework/type_defs.h"
 #include "paddle/platform/macros.h"
 
-#include "glog/logging.h"
-
 namespace paddle {
 namespace framework {
 
diff --git a/paddle/framework/op_registry.cc b/paddle/framework/op_registry.cc
index ac6aa8d28e..4dc83ec8fe 100644
--- a/paddle/framework/op_registry.cc
+++ b/paddle/framework/op_registry.cc
@@ -55,7 +55,6 @@ std::unique_ptr<OperatorBase> OpRegistry::CreateOp(const OpDesc& op_desc) {
 }
 
 std::unique_ptr<OperatorBase> OpRegistry::CreateOp(OpDescBind* op_desc) {
-  op_desc->Sync();
   return CreateOp(op_desc->Type(), op_desc->Inputs(), op_desc->Outputs(),
                   op_desc->GetAttrMap());
 }
diff --git a/paddle/operators/mean_op.cc b/paddle/operators/mean_op.cc
index 339c089e87..2332c9546b 100644
--- a/paddle/operators/mean_op.cc
+++ b/paddle/operators/mean_op.cc
@@ -71,7 +71,6 @@ class MeanGradMaker : public framework::SingleGradOpDescMaker {
 }  // namespace paddle
 
 namespace ops = paddle::operators;
-
 REGISTER_OPERATOR(mean, ops::MeanOp, ops::MeanOpMaker, ops::MeanGradMaker);
 REGISTER_OPERATOR(mean_grad, ops::MeanGradOp);
 REGISTER_OP_CPU_KERNEL(mean,
diff --git a/paddle/operators/softmax_with_cross_entropy_op.cc b/paddle/operators/softmax_with_cross_entropy_op.cc
index 70fe429f59..42c1ba6fdf 100644
--- a/paddle/operators/softmax_with_cross_entropy_op.cc
+++ b/paddle/operators/softmax_with_cross_entropy_op.cc
@@ -16,11 +16,6 @@
 #include <paddle/function/TensorType.h>
 #include <iostream>
 
-#define DBG_LINE()                                   \
-  do {                                               \
-    std::cerr << "Run at " << __LINE__ << std::endl; \
-  } while (false)
-
 namespace paddle {
 namespace operators {
 
-- 
GitLab