[API Compatibility] Change compatibility apis to ChangePrefixMatcher, inject paddle.enable_compat() -part by Manfredss · Pull Request #895 · PaddlePaddle/PaConvert

Manfredss · 2026-06-29T04:02:56Z

PR Docs

For the 23 torch.* APIs that are aligned through paddle.compat.*, switch the
converter to the "prefix-only + enable_compat" strategy instead of mapping each to
paddle.compat.X explicitly:

api_mapping.json — change those 23 entries from
ChangeAPIMatcher → paddle.compat.X to {"Matcher": "ChangePrefixMatcher"}, so
torch.X(...) converts to paddle.X(...) with arguments untouched
(e.g. torch.sort(a, dim=-1) → paddle.sort(a, dim=-1)).
transformer/import_transformer.py — inject import paddle +
paddle.enable_compat() right after the imports of any converted file, so the
prefix-only paddle.X calls resolve to the torch-aligned paddle.compat.X
implementations at runtime. (Included explicitly + deduped so it is valid even
when torch was imported as a submodule alias, e.g. import torch.nn as nn.)
tests/apibase.py — paddle.enable_compat() flips global state (an
import torch → Paddle proxy + paddle.* aliases). Disable it before each
PyTorch reference run (_ensure_paddle_compat_disabled()), so the reference
always executes against real PyTorch, including across multiple run() calls in
one test. (No-op until Paddle is first imported, so it does not change torch/paddle
import ordering.)

PR APIs

torch.allclose
torch.equal
torch.max
torch.median
torch.min
torch.nanmedian
torch.nn.AvgPool1d
torch.nn.AvgPool2d
torch.nn.AvgPool3d
torch.nn.Linear
torch.nn.MultiheadAttention
torch.nn.softmax
torch.nn.Unfold
torch.nn.functional.linear
torch.nn.functional.log_softmax
torch.nn.functional.pad
torch.nn.functional.scaled_dot_product_attention
torch.nn.functional.softmax
torch.nn.functional.unfold
torch.seed
torch.sort
torch.split
torch.unique

related Paddle PR:

[API Compatibility] enhance paddle.enable_compat -part Paddle#79391

Co-authored by Claude.

…to patch_compat

… calls hit the alias The default enable_compat() (level=1) does not alias paddle.*, so prefix-converted calls (torch.X -> paddle.X) would run native and reject torch-style kwargs. level=2 turns on the paddle.* alias; caller-aware dispatch keeps paddle internals native. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…to patch_compat

…eset import_transformer.py: - Inject paddle.enable_compat(level=2) via a transform() post-pass so it lands after the docstring, __future__ imports and the import block (fixes a pre-existing SyntaxError where injected imports preceded `from __future__`). - Gate on real torch imports (torch_packages), not paddle_package_list, so a torch-free file importing only os/einops/setuptools no longer gains a needless paddle import or the process-global compat switch. tests: - Rename confest.py -> conftest.py so the autouse compat-reset fixture is loaded by pytest (was dead due to the typo). - Dedupe the disable logic into conftest.disable_paddle_compat(), imported by apibase and called before each torch reference exec. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

…into patch_compat

…evel=2) now.

…ompat Switch Tensor.allclose and Tensor.sort to ChangePrefixMatcher and keep softmin's softmax call using torch arg names (input/dim), since compat paddle APIs now accept torch-style args and reject paddle-native ones. Update tests to inject enable_compat(level=2); fix torchvision model_apibase proxy leak around the torch reference forward.

zhwesky2010 · 2026-07-10T05:07:55Z

+        # enable_compat is injected in transform() (needs all imports in the body).
+        # Gate on real torch imports, not paddle_package_list: the latter also holds
+        # MAY_TORCH packages (os/einops/setuptools) that need no compat switch.
+        if self.imports_map[self.file]["torch_packages"]:


简化下代码，看有无更简单的写法，是否只需要修改visit_Module就可以？

zhwesky2010 · 2026-07-10T05:08:11Z

PR冲突了

zhwesky2010

这些插入操作能不能复用已有的函数record_scope

zhwesky2010 · 2026-07-13T08:12:38Z

注意代码风格简化并贴合已有架构来写，不要让AI随意发挥：

贴合已有架构、功能和风格来开发，不要从0开始（AI不懂代码库架构喜欢重起炉灶）
非代码复用的情况下，不需要封各种类函数（只会增加代码复杂度并无意义）
移除冗余注释

zhwesky2010 · 2026-07-13T08:16:19Z

+                    return True
+        return False
+
+    def _inject_enable_compat(self):


这个使用record_scope不能插入吗？插入这个不需要从0开始重写吧

Bring the latest API compatibility coverage into the branch while preserving the record_scope-based compat injection and test state isolation fixes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

paddle-bot · 2026-07-14T05:58:28Z

Thanks for your contribution!

Align expected diffs with compat injection and intentional ChangePrefixMatcher behavior. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Deduplicate paddle_package_list in ImportTransformer.visit_Module: since imports are now batched into one record_scope call, its cross-call dedup no longer removes duplicates, producing two 'import paddle' lines when a file imports multiple torch-family packages (e.g. torchvision + datasets). Regenerate default-mode goldens for the paddle.enable_compat(level=2) injection and the intentional compat-prefix removals (equal, BatchNorm1d/2d), matching the min-mode baseline update in f7e1c04. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

zhwesky2010

简单问题不用复杂化：这里的node进来时已经是一个处理干净的node，所有torch相关的import都清除干净了，只用在这个基础上插入好paddle相关import即可

zhwesky2010 · 2026-07-14T11:38:53Z

-            line_NO += 1
+        import_nodes = []
+        for paddle_package in dict.fromkeys(paddle_package_list):
+            import_nodes.extend(ast.parse(f"import {paddle_package}").body)


直接在这里判断是否为 paddle_package=='paddle'

如果是，则import_nodes.extend(ast.parse(f"import paddle;paddle.enable_compat(2)").body)

并且该操作仅执行一次（当然执行多次问题也不大，后续会被isort校正）

zhwesky2010 · 2026-07-14T11:39:48Z

+
+        has_torch_package = bool(self.imports_map[self.file]["torch_packages"])
+
+        has_enable_compat = any(


这些判断都需要吗？后面也会经过isort、black的格式化处理，移除多余import，这里不要想的太复杂了

zhwesky2010 · 2026-07-14T11:41:10Z

+        if has_torch_package and not has_enable_compat:
+            import_nodes.extend(ast.parse("paddle.enable_compat(level=2)").body)
+
+        import_end = 1 if node.body and ast.get_docstring(node, clean=False) else 0


for循环，self.record_scope((self.root, "body", line_NO), import_nodes) 就行了吧。

原始的node在visit_Import、visit_ImportFrom时就已经被清除，原始node的import内容应该已经被清理掉了。

另外加上log_info，这个是比较重要的调试信息

…a single paddle.enable_compat(level=2) on top of the already-cleaned node, dropping redundant enable_compat/torch-package scans and adding log_info

…into patch_compat

zhwesky2010 · 2026-07-16T03:43:26Z

+        # Under `paddle.enable_compat(level=2)` the prefix-converted calls
+        # (torch.X -> paddle.X) resolve to the torch-aligned paddle.compat.* impls,
+        # so inject it once when `import paddle` is added. isort/black dedupe repeats.
+        if "paddle" in paddle_package_list:


这个应该得 == "paddle" ，然后做个一次性判断 "enable_compat" not in import_code

我看一下

Manfredss added 2 commits June 29, 2026 03:50

change for enable_compat

321f32b

add two left api

9bf7bfb

Manfredss closed this Jun 29, 2026

Manfredss reopened this Jun 29, 2026

Manfredss marked this pull request as draft June 29, 2026 12:59

Manfredss marked this pull request as ready for review June 29, 2026 13:00

paddle-bot Bot added the contributor External developers label Jun 29, 2026

Manfredss and others added 6 commits July 2, 2026 20:37

Merge branch 'master' of https://github.com/paddlepaddle/paconvert in…

204c7a1

…to patch_compat

Merge branch 'master' of https://github.com/paddlepaddle/paconvert in…

1ff4284

…to patch_compat

Merge branch 'master' of https://github.com/paddlepaddle/paconvert in…

020ce44

…to patch_compat

Merge branch 'patch_compat' of https://github.com/manfredss/paconvert …

bfff52a

…into patch_compat

Manfredss force-pushed the patch_compat branch from 74ba7ca to bfff52a Compare July 7, 2026 12:53

Manfredss added 4 commits July 8, 2026 08:22

update ChangePrefixMatcher for those can passed under enable_compat(l…

3dcd2a1

…evel=2) now.

ChangePrefixMatcher for BatchNorm1d/2d/3d

81a3c07

fix code conversion mis-alignment

f04bbf3

zhwesky2010 reviewed Jul 10, 2026

View reviewed changes

zhwesky2010 reviewed Jul 13, 2026

View reviewed changes

Manfredss and others added 2 commits July 14, 2026 02:53

Merge upstream master into patch_compat

9bef7f9

Bring the latest API compatibility coverage into the branch while preserving the record_scope-based compat injection and test state isolation fixes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

restore test script

838a8a5

Manfredss and others added 2 commits July 14, 2026 06:40

update min-mode consistency baselines

f7e1c04

Align expected diffs with compat injection and intentional ChangePrefixMatcher behavior. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

zhwesky2010 reviewed Jul 14, 2026

View reviewed changes

Simplify ImportTransformer.visit_Module to insert paddle imports and …

14d8aeb

…a single paddle.enable_compat(level=2) on top of the already-cleaned node, dropping redundant enable_compat/torch-package scans and adding log_info

Merge branch 'patch_compat' of https://github.com/manfredss/paconvert …

e0808c4

…into patch_compat

zhwesky2010 reviewed Jul 16, 2026

View reviewed changes

paddle_package == paddle and add once

6bd002d

risemeup1111 mentioned this pull request Jul 16, 2026

[API Compatibility] enhance paddle.enable_compat -part PaddlePaddle/Paddle#79391

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[API Compatibility] Change compatibility apis to ChangePrefixMatcher, inject paddle.enable_compat() -part#895

[API Compatibility] Change compatibility apis to ChangePrefixMatcher, inject paddle.enable_compat() -part#895
Manfredss wants to merge 19 commits into
PaddlePaddle:masterfrom
Manfredss:patch_compat

Manfredss commented Jun 29, 2026

Uh oh!

zhwesky2010 Jul 10, 2026

Uh oh!

zhwesky2010 commented Jul 10, 2026

Uh oh!

zhwesky2010 left a comment •

edited

Loading

Uh oh!

zhwesky2010 commented Jul 13, 2026 •

edited

Loading

Uh oh!

zhwesky2010 Jul 13, 2026

Uh oh!

paddle-bot Bot commented Jul 14, 2026

Uh oh!

zhwesky2010 left a comment •

edited

Loading

Uh oh!

zhwesky2010 Jul 14, 2026 •

edited

Loading

Uh oh!

zhwesky2010 Jul 14, 2026

Uh oh!

zhwesky2010 Jul 14, 2026 •

edited

Loading

Uh oh!

zhwesky2010 Jul 16, 2026

Uh oh!

Manfredss Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		has_torch_package = bool(self.imports_map[self.file]["torch_packages"])

		has_enable_compat = any(

Uh oh!

Conversation

Manfredss commented Jun 29, 2026

PR Docs

PR APIs

Uh oh!

zhwesky2010 Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 commented Jul 10, 2026

Uh oh!

zhwesky2010 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhwesky2010 Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

paddle-bot Bot commented Jul 14, 2026

Uh oh!

zhwesky2010 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

Manfredss Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

zhwesky2010 left a comment •

edited

Loading

zhwesky2010 commented Jul 13, 2026 •

edited

Loading

zhwesky2010 left a comment •

edited

Loading

zhwesky2010 Jul 14, 2026 •

edited

Loading

zhwesky2010 Jul 14, 2026 •

edited

Loading