Fix CI

PaddlePaddle · Aug 17, 2017 · cb7d39d · cb7d39d
1 parent 0379b1d
commit cb7d39d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/paddle/framework/operator.cc b/paddle/framework/operator.cc
@@ -125,6 +125,7 @@ OperatorBase::OperatorBase(const std::string& type,
 
   if (op_info_it != OpRegistry::op_info_map().end()) {
     auto* op_proto = op_info_it->second.proto_;
+    if (op_proto == nullptr) return;
     for (auto& output : op_proto->outputs()) {
       if (output.duplicable()) {  // If outputs is duplicable, do not set
                                   // default output

diff --git a/python/paddle/v2/framework/op.py b/python/paddle/v2/framework/op.py
@@ -9,9 +9,9 @@ def get_all_op_protos():
     Get all registered op proto from Paddle C++
     :return: list of OpProto
     """
+    global g_all_op_protos
     protostrs = core.get_all_op_protos()
     if g_all_op_protos is None:
-        global g_all_op_protos
         g_all_op_protos = dict()
         for pbstr in protostrs:
             op_proto = framework_pb2.OpProto.FromString(str(pbstr))