From a427855902326f43ff1fd9cefbfe1f9344098d85 Mon Sep 17 00:00:00 2001
From: fengjiayi <fengjiayi@baidu.com>
Date: Mon, 9 Oct 2017 20:10:32 -0700
Subject: [PATCH] Update

---
 python/paddle/v2/framework/graph.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/python/paddle/v2/framework/graph.py b/python/paddle/v2/framework/graph.py
index 296fab8fed..c752f5e7ed 100644
--- a/python/paddle/v2/framework/graph.py
+++ b/python/paddle/v2/framework/graph.py
@@ -71,20 +71,18 @@ class Variable(object):
 
 
 class Operator(object):
-    def __init__(self,
-                 block,
-                 proto,
-                 type=None,
-                 inputs=None,
-                 outputs=None,
+    def __init__(self, block, desc, type, inputs=None, outputs=None,
                  attrs=None):
         self.block = block
-        self.proto = proto
-        if type is not None:
-            self.proto.set_type(type)
+        self.desc = desc
+        self.proto = OpProtoHolder.instance().get_op_proto(type)
+        self.desc.set_type(type)
         if inputs is not None:
-            for k, v in inputs.iteritems():
-                self.proto.set_input(k, v)
+            for in_proto in self.proto.inputs:
+                in_argu = inputs[in_proto.name]
+                if is_str(in_argu):
+                    in_argu = [in_argu]
+
         if outputs is not None:
             for k, v in outputs.iteritems():
                 self.proto.set_output(k, v)
@@ -114,8 +112,8 @@ class Block(object):
         return Variable(self, *args, **kwargs)
 
     def append_op(self, *args, **kwargs):
-        op_proto = self.proto.append_op()
-        op = Operator(self, op_proto, *args, **kwargs)
+        op_desc = self.proto.append_op()
+        op = Operator(self, op_desc, *args, **kwargs)
         self.ops.append(op)
         return op
 
-- 
GitLab