From 5eed0134e6c1c245eaccc6242fbbc3a59fe146fe Mon Sep 17 00:00:00 2001 From: Dong Zhihong Date: Sat, 14 Oct 2017 17:37:57 -0700 Subject: [PATCH] "refix the python logic" --- python/paddle/v2/framework/framework.py | 8 ++++---- python/paddle/v2/framework/tests/test_program.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/paddle/v2/framework/framework.py b/python/paddle/v2/framework/framework.py index 7f5da571ba..acc61e66da 100644 --- a/python/paddle/v2/framework/framework.py +++ b/python/paddle/v2/framework/framework.py @@ -20,10 +20,10 @@ class Variable(object): if name is None: name = Variable._unique_var_name_() - try: - self.desc = self.block.desc.find_var(name) - is_new_var = False - except core.EnforceNotMet: + is_new_var = False + self.desc = self.block.desc.find_var(name) + + if self.desc is None: self.desc = self.block.desc.var(name) is_new_var = True diff --git a/python/paddle/v2/framework/tests/test_program.py b/python/paddle/v2/framework/tests/test_program.py index c5674382a4..07473d17f7 100644 --- a/python/paddle/v2/framework/tests/test_program.py +++ b/python/paddle/v2/framework/tests/test_program.py @@ -51,7 +51,7 @@ class TestProgram(unittest.TestCase): sum_op_desc.set_input("Y", ["b1"]) sum_op_desc.set_output("Out", ["out2"]) - target = block.new_var("out2") + target = block.var("out2") expect_ops = [ "mul", "elementwise_add", "fill_constant", "elementwise_add_grad", -- GitLab