[SOT] add simulation support for user-defined iterable objects #70620
+59
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
test case: class IterableWithList():
def __init__(self):
self._list = [1, 2, 3]
def __iter__(self):
return self._list.__iter__()
def list_within_class(x: paddle.Tensor):
my_iterable = IterableWithList()
for i in my_iterable:
x += i
return x |
SigureMo
reviewed
Jan 6, 2025
Comment on lines
+863
to
876
| def load_sequence(self, obj): | ||
| self.stack.push(obj.get_iter()) | ||
| # skip call | ||
| while self._instructions[self._lasti].opname != "RETURN_VALUE": | ||
| self._lasti += 1 | ||
|
|
||
| def load_method(self, method_name): | ||
| obj = self.stack.pop() | ||
| if isinstance(obj, ContainerVariable) and method_name == "__iter__": | ||
| self.load_sequence(obj) | ||
| return | ||
| method_name_var = ConstantVariable.wrap_literal( | ||
| method_name, self._graph | ||
| ) |
There was a problem hiding this comment.
这段逻辑对上下文有较大的修改，如何保证全场景的正确性？
每条字节码应该只做自己的事情，只看当前 instruction，不应该去访问 self._instructions
另外这里特判 ContainerVariable 和 __iter__ 的原因是？
| @@ -1049,6 +1049,35 @@ def main_info(self) -> dict[str, Any]: | |||
| def get_py_value(self, allow_tensor=False) -> Any: | |||
| return self.value | |||
|
|
|||
| def get_iter(self): | |||
| """ | |||
| To simplify the problem, we only support the case where the __iter__ method returns a list. | |||
There was a problem hiding this comment.
不止 list，应该是现在全部已经支持的 builtin types
另外这个实现在 VariableBase 上会有什么问题么
| self._list = [1, 2, 3] | ||
|
|
||
| def __iter__(self): | ||
| return self._list.__iter__() |
There was a problem hiding this comment.
建议使用 iter(self._list)，这是更加惯用的形式，不过当前写法也测一下吧
| @@ -375,6 +391,9 @@ def test_list_extend_range(self): | |||
| def test_list_extend_dict(self): | |||
| self.assert_results(list_extend_dict) | |||
|
|
|||
| def test_list_within_class(self): | |||
| self.assert_results(list_within_class, paddle.to_tensor(1)) | |||
There was a problem hiding this comment.
可以新建一个文件用来测 iter，比如 test_iter.py
SigureMo
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Category
User Experience
PR Types
New features
Description
如果用户自定义的
Iterable对象，其__iter()__方法返回的结果是list，dict，tuple，tensor，range，那么就能够模拟iterPCard-66972