diff --git a/paddle/pybind/protobuf.cc b/paddle/pybind/protobuf.cc index ee29b61eec6eed2f95013bd5a9bdf03a8493826e..b4512dae9090a977c7241cdb7b23a30745c52562 100644 --- a/paddle/pybind/protobuf.cc +++ b/paddle/pybind/protobuf.cc @@ -151,10 +151,10 @@ void BindBlockDesc(py::module &m) { return self.Var(name); }, py::return_value_policy::reference) - .def("var", + .def("find_var", [](BlockDescBind &self, py::bytes byte_name) { std::string name = byte_name; - return self.Var(name); + return self.FindVar(name); }, py::return_value_policy::reference) .def("all_vars", &BlockDescBind::AllVars, diff --git a/python/paddle/v2/framework/framework.py b/python/paddle/v2/framework/framework.py index 3cfc5bbccf6cad0d2e16329a93c2f3c225738f96..0909da5378d3b314d525958dc7c5e5bf4f662c5d 100644 --- a/python/paddle/v2/framework/framework.py +++ b/python/paddle/v2/framework/framework.py @@ -21,7 +21,7 @@ class Variable(object): if name is None: name = Variable._unique_var_name_() try: - self.desc = self.block.desc.var(name) + self.desc = self.block.desc.find_var(name) is_new_var = False except core.EnforceNotMet: self.desc = self.block.desc.var(name) diff --git a/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py b/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py index b4629a3adb9a84470843214c7c6d80acde7228cc..2b01e43454e70c12b423db9925837cf336f79935 100644 --- a/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py +++ b/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py @@ -6,7 +6,7 @@ import numpy as np def create_tensor(scope, name, shape, np_data): - tensor = scope.new_var(name).get_tensor() + tensor = scope.var(name).get_tensor() tensor.set_dims(shape) tensor.set(np_data, core.CPUPlace()) return tensor @@ -72,8 +72,8 @@ class DynamicRecurrentOpTest(unittest.TestCase): create_tensor(self.scope, "U", [self.input_dim, self.input_dim], U) create_tensor(self.scope, "h_boot", [self.num_sents, self.input_dim], h_boot) - self.scope.new_var("step_scopes") - self.scope.new_var("h@mem") + self.scope.var("step_scopes") + self.scope.var("h@mem") def create_rnn_op(self): # create RNNOp diff --git a/python/paddle/v2/framework/tests/test_protobuf_descs.py b/python/paddle/v2/framework/tests/test_protobuf_descs.py index 0ccb2e7eb191378dad40830647fe545cda27640e..c775b1a398dabb096845b4a8730152c682b2f0dd 100644 --- a/python/paddle/v2/framework/tests/test_protobuf_descs.py +++ b/python/paddle/v2/framework/tests/test_protobuf_descs.py @@ -122,7 +122,7 @@ class TestBlockDesc(unittest.TestCase): var3 = block.var("var3") all_vars = block.all_vars() self.assertEqual(set(all_vars), set([var1, var2, var3])) - var2_re = block.var("var2") + var2_re = block.find_var("var2") self.assertEqual(var2_re, var2) def test_add_op(self):