From 649342c879f7da8b432fb94b7013e22ca3516fd9 Mon Sep 17 00:00:00 2001
From: sneaxiy <sneaxiy@126.com>
Date: Thu, 5 Mar 2020 07:32:13 +0000
Subject: [PATCH] merge develop to solve conflict third times, test=develop

---
 paddle/fluid/imperative/layer.h   | 2 +-
 paddle/fluid/imperative/tracer.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/imperative/layer.h b/paddle/fluid/imperative/layer.h
index 0db292992a2..855e3e81995 100644
--- a/paddle/fluid/imperative/layer.h
+++ b/paddle/fluid/imperative/layer.h
@@ -568,7 +568,7 @@ class OpBase {
   void CheckAttrs() {
     auto& info = op_->Info();
     if (info.Checker() != nullptr) {
-      info.Checker()->Check(&attrs_);
+      info.Checker()->Check(&attrs_, true);
     }
   }
 
diff --git a/paddle/fluid/imperative/tracer.cc b/paddle/fluid/imperative/tracer.cc
index 0c8a4983ef4..e99bd6700a1 100644
--- a/paddle/fluid/imperative/tracer.cc
+++ b/paddle/fluid/imperative/tracer.cc
@@ -92,7 +92,7 @@ void Tracer::TraceOp(const std::string& type, const NameVarBaseMap& ins,
   const auto& op_info = op->Info();
   auto* attr_checker = op_info.Checker();
   if (attr_checker) {
-    attr_checker->Check(&attrs);
+    attr_checker->Check(&attrs, true);
   }
 
   OpBase::Run(*op, ins, outs, attrs, place);
-- 
GitLab