[SOT][dynamic shape] Support dynamic int input #64323
Merged
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
|
你的PR提交成功，感谢你对开源项目的贡献! |
SigureMo
reviewed
May 15, 2024
SigureMo
reviewed
May 15, 2024
python/paddle/jit/sot/opcode_translator/executor/function_graph.py
Outdated
Show resolved
Hide resolved
| @@ -566,6 +669,9 @@ def symbolic_call(self, infer_meta_fn, compute_fn, func, *args, **kwargs): | |||
| """ | |||
| self.collect_input_variables(list(args)) | |||
| self.collect_input_variables(list(kwargs.values())) | |||
| if ENV_SOT_ALLOW_DYNAMIC_SHAPE.get(): | |||
| self.analyze_dynamic_inputs() | |||
There was a problem hiding this comment.
symbolic_call 每次组网都会调用一次吧，这是不是分析次数太多了？按我理解在 input_variables 稳定后调用一次就可以了？
| str, DynamicShape | SymbolicInt | int | ||
| ] = self.dynamic_inputs | ||
| for variable in find_traceable_vars(self.input_variables): | ||
| if isinstance(variable.tracker, LocalTracker): |
There was a problem hiding this comment.
从代码风格上来看，推荐使用类似 early return 的形式来减少单分支 if 的缩进
def fn():
- if x:
- foo()
+ if not x:
+ return
+ foo()
for i in range(n):
- if x:
- foo()
+ if not x:
+ continue
+ foo()
python/paddle/jit/sot/opcode_translator/executor/variables/basic.py
Outdated
Show resolved
Hide resolved
| return f"{self.graph.OUT_VAR_PREFIX}{self.var_name}" | ||
|
|
||
| def _reconstruct(self, codegen: PyCodeGen): | ||
| codegen.gen_load_const(paddle.to_tensor(self.value)) |
There was a problem hiding this comment.
这里好像不太行？这样的话这个 value 是固定的吧，应该生成代码将其 load 到栈上，然后生成代码将其转化为 tensor，这些都是通过字节码实现的～
python/paddle/jit/sot/opcode_translator/executor/variables/basic.py
Outdated
Show resolved
Hide resolved
Comment on lines
1662
to
1666
| if ENV_SOT_ALLOW_DYNAMIC_SHAPE.get() and isinstance(value, int): | ||
| self._locals[name] = SymbolicIntVariable( | ||
| value, self._graph, tracker | ||
| ) | ||
| else: |
There was a problem hiding this comment.
诶？所有 locals 里的 int 都是 SymbolicIntVariable？之后通过 var.symbolic 来确定是否真的 symbolic？感觉有点奇怪
另外，是否 symbolic 是在什么时候变化的呢？按我理解，在同一次模拟过程中不应该有非 symbolic 向 symbolic 的转化，一个 var 是否是 symbolic 应该是模拟最开始就决定了的
zrr1999
force-pushed
the
dynamic_int_input
branch
from
96ab682
to
382aedf
Compare
29 tasks
SigureMo
reviewed
May 18, 2024
python/paddle/jit/sot/opcode_translator/executor/function_graph.py
Outdated
Show resolved
Hide resolved
python/paddle/jit/sot/opcode_translator/executor/variable_dispatch.py
Outdated
Show resolved
Hide resolved
Comment on lines
193
to
196
| if self.value in symbolic_input: | ||
| symbolic_input[self.value] += 1 | ||
| else: | ||
| symbolic_input[self.value] = 1 |
Comment on lines
687
to
690
| if value in symbolic_input: | ||
| symbolic_input[value] += 1 | ||
| else: | ||
| symbolic_input[value] = 1 |
python/paddle/jit/sot/opcode_translator/executor/variables/iter.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
可以再测下 symbolic int 在传入 paddle API 时候能否正常触发组网（如 paddle.reshape(x, [n, 1])、paddle.add(x, n)），感觉应该也是可以的～（但如果有比较麻烦的问题建议下一个 PR）
zrr1999
changed the title
SigureMo
reviewed
May 19, 2024
python/paddle/jit/sot/opcode_translator/executor/variable_dispatch.py
Outdated
Show resolved
Hide resolved
python/paddle/jit/sot/opcode_translator/executor/variable_dispatch.py
Outdated
Show resolved
Hide resolved
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
Others
PR Types
Others
Description
Support dynamic int input
TODO：
-n这种 unary 操作会被转为Tensor