未验证 提交 30865110 编写于 作者: N Nyakku Shigure 提交者: GitHub

[Dy2St] allow write to container in control flow (#51248)

上级 d69bb1da
# Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import unittest
import paddle
def func_loop_write_dict(x):
res = {"a": 1}
t = paddle.shape(x)[0]
for i in range(t):
res["a"] = i
return res
def func_loop_write_list(x):
res = [1]
t = paddle.shape(x)[0]
for i in range(t):
res[0] = i
return res
def func_loop_write_nest_dict_list(x):
res = {"a": [1]}
t = paddle.shape(x)[0]
for i in range(t):
res["a"][0] = i
return res
def func_loop_write_nest_list_dict(x):
res = [{"a": 1}]
t = paddle.shape(x)[0]
for i in range(t):
res[0]["a"] = i
return res
def func_ifelse_write_dict(x):
res = {"a": 1}
t = paddle.shape(x)[0]
if t > 2:
res["a"] = 2
else:
res["a"] = 3
return res
def func_ifelse_write_list(x):
res = [1]
t = paddle.shape(x)[0]
if t > 2:
res[0] = 2
else:
res[0] = 3
return res
def func_ifelse_write_nest_dict_list(x):
res = {"a": [1]}
t = paddle.shape(x)[0]
if t > 2:
res["a"][0] = 2
else:
res["a"][0] = 3
return res
def func_ifelse_write_nest_list_dict(x):
res = [{"a": 1}]
t = paddle.shape(x)[0]
if t > 2:
res[0]["a"] = 2
else:
res[0]["a"] = 3
return res
class TestWriteContainer(unittest.TestCase):
def setUp(self):
self.set_func()
self.set_getitem_path()
def set_func(self):
self.func = func_loop_write_dict
def set_getitem_path(self):
self.getitem_path = ("a",)
def get_raw_value(self, container, getitem_path):
out = container
for path in getitem_path:
out = out[path]
return out
def test_write_container(self):
func_static = paddle.jit.to_static(self.func)
input = paddle.to_tensor([1, 2, 3])
out_static = self.get_raw_value(
func_static(input), self.getitem_path
).item()
out_dygraph = self.get_raw_value(self.func(input), self.getitem_path)
self.assertEqual(out_static, out_dygraph)
class TestLoopWriteContainerList(TestWriteContainer):
def set_func(self):
self.func = func_loop_write_list
def set_getitem_path(self):
self.getitem_path = (0,)
class TestLoopWriteContainerNestDictList(TestWriteContainer):
def set_func(self):
self.func = func_loop_write_nest_dict_list
def set_getitem_path(self):
self.getitem_path = ("a", 0)
class TestLoopWriteContainerNestListDict(TestWriteContainer):
def set_func(self):
self.func = func_loop_write_nest_list_dict
def set_getitem_path(self):
self.getitem_path = (0, "a")
class TestIfElseWriteContainerDict(TestWriteContainer):
def set_func(self):
self.func = func_ifelse_write_dict
def set_getitem_path(self):
self.getitem_path = ("a",)
class TestIfElseWriteContainerList(TestWriteContainer):
def set_func(self):
self.func = func_ifelse_write_list
def set_getitem_path(self):
self.getitem_path = (0,)
class TestIfElseWriteContainerNestDictList(TestWriteContainer):
def set_func(self):
self.func = func_ifelse_write_nest_dict_list
def set_getitem_path(self):
self.getitem_path = ("a", 0)
class TestIfElseWriteContainerNestListDict(TestWriteContainer):
def set_func(self):
self.func = func_ifelse_write_nest_list_dict
def set_getitem_path(self):
self.getitem_path = (0, "a")
if __name__ == '__main__':
unittest.main()
......@@ -1316,6 +1316,15 @@ class FunctionNameLivenessAnalysis(gast.NodeVisitor):
name = ast_to_source_code(node).strip()
self._current_name_scope().w_vars.add(name)
def visit_Subscript(self, node):
self.generic_visit(node)
write_context = (gast.Store, gast.AugStore, gast.Del)
if isinstance(node.ctx, write_context):
while isinstance(node.value, gast.Subscript):
node = node.value
if isinstance(node.value, gast.Name):
self._current_name_scope().w_vars.add(node.value.id)
def visit_Call(self, node):
self.generic_visit(node)
if not isinstance(node.func, gast.Attribute):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册