From ff8766e910a4d9ba1e208458de2719708d6663d3 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 2 Oct 2017 15:50:00 -0700
Subject: [PATCH] Stash

---
 paddle/framework/backward_test.cc      | 2 ++
 paddle/framework/details/op_registry.h | 1 +
 paddle/framework/op_desc.h             | 2 +-
 paddle/framework/op_info.h             | 8 --------
 paddle/framework/op_proto_maker.h      | 5 -----
 paddle/framework/op_registry.cc        | 4 +++-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/paddle/framework/backward_test.cc b/paddle/framework/backward_test.cc
index 28fc6f9ced0..85f1dd91ed1 100644
--- a/paddle/framework/backward_test.cc
+++ b/paddle/framework/backward_test.cc
@@ -378,6 +378,8 @@ TEST(Backward, linear_net_intermediate_variable_has_no_grad) {
                 + 1UL /* external output number*/
                 + 1UL /* number of gradient of external output*/
                 + 2U /* internal variable number*/);
+  std::cerr << grad_fc.DebugString() << std::endl;
+
   EXPECT_EQ(grad_fc.Outputs(all).size(),
             2UL       /* input number of mul*/
                 + 2UL /* input number of rowwise_add
diff --git a/paddle/framework/details/op_registry.h b/paddle/framework/details/op_registry.h
index daa474e8c5a..c805dae7d7d 100644
--- a/paddle/framework/details/op_registry.h
+++ b/paddle/framework/details/op_registry.h
@@ -85,6 +85,7 @@ struct OpInfoFiller<T, kOpProtoAndCheckerMaker> {
     info->proto_ = new OpProto;
     info->checker_ = new OpAttrChecker();
     auto maker = T(info->proto_, info->checker_);
+    std::cerr << "Assign Maker " << op_type << std::endl;
     maker.Validate();
     info->proto_->set_type(op_type);
     PADDLE_ENFORCE(
diff --git a/paddle/framework/op_desc.h b/paddle/framework/op_desc.h
index 72d7a0379b9..4c1ada05f0a 100644
--- a/paddle/framework/op_desc.h
+++ b/paddle/framework/op_desc.h
@@ -98,7 +98,7 @@ class OpDescBind {
     std::vector<typename MapType::key_type> ret_val;
     ret_val.reserve(map.size());
     std::transform(
-        map.begin(), map.end(), ret_val.begin(),
+        map.begin(), map.end(), std::back_inserter(ret_val),
         [](const typename MapType::value_type &pair) { return pair.first; });
     return ret_val;
   }
diff --git a/paddle/framework/op_info.h b/paddle/framework/op_info.h
index 683476dfd47..ab13dad962c 100644
--- a/paddle/framework/op_info.h
+++ b/paddle/framework/op_info.h
@@ -42,19 +42,11 @@ struct OpInfo {
     return *proto_;
   }
 
-  const OpAttrChecker& Checker() const {
-    PADDLE_ENFORCE_NOT_NULL(checker_,
-                            "Operator Checker has not been registered");
-    return *checker_;
-  }
-
   const OpCreator& Creator() const {
     PADDLE_ENFORCE_NOT_NULL(creator_,
                             "Operator Creator has not been registered");
     return creator_;
   }
-
-  bool HasGradientOp() const { return !grad_op_type_.empty(); }
 };
 
 class OpInfoMap {
diff --git a/paddle/framework/op_proto_maker.h b/paddle/framework/op_proto_maker.h
index 4d55a37db9f..a134befd90a 100644
--- a/paddle/framework/op_proto_maker.h
+++ b/paddle/framework/op_proto_maker.h
@@ -44,11 +44,6 @@ class OpProtoAndCheckerMaker {
       var_->set_intermediate(true);
       return *this;
     }
-
-    VariableBuilder& NotInGradient() {
-      var_->set_not_in_gradient(true);
-      return *this;
-    }
   };
 
   VariableBuilder AddInput(const std::string& name, const std::string& comment);
diff --git a/paddle/framework/op_registry.cc b/paddle/framework/op_registry.cc
index 35f280981ba..ac6aa8d28ec 100644
--- a/paddle/framework/op_registry.cc
+++ b/paddle/framework/op_registry.cc
@@ -23,7 +23,9 @@ std::unique_ptr<OperatorBase> OpRegistry::CreateOp(
     const std::string& type, const VariableNameMap& inputs,
     const VariableNameMap& outputs, AttributeMap attrs) {
   auto& info = OpInfoMap::Instance().Get(type);
-  info.Checker().Check(attrs);
+  if (info.checker_ != nullptr) {
+    info.checker_->Check(attrs);
+  }
   auto op = info.Creator()(type, inputs, outputs, attrs);
   return std::unique_ptr<OperatorBase>(op);
 }
-- 
GitLab