upgrade `torch.median` and 3 apis #382

RedContritio · 2024-04-02T09:16:19Z

PR Docs

PR APIs

torch.median
torch.nanmedian
torch.nn.functional.group_norm
torch.nn.TransformerEncoderLayer

paddle-bot · 2024-04-02T09:16:23Z

Thanks for your contribution!

paconvert/api_mapping.json

zhwesky2010

这一次PaConvert升级，尽可能要彻底解决某些API的遗留问题

zhwesky2010 · 2024-04-03T04:19:58Z

paconvert/api_matcher.py

@@ -4328,3 +4328,46 @@ def generate_code(self, kwargs):
        else:
            code = "misidentify"
        return code
+
+
+class MedianMatcher(BaseMatcher):


这里目前的API差异还有在哪里？如果还有这么大的差异就不太符合 API升级这个项目的意义了。

预期的API修改效果是 mode='min' 之后完全对齐，如果还有对不齐的地方可以反馈给负责API升级的同学来返工修复，直到满足要求为止。

这个差异的原因是，median 有两个重载，如果只有 input 参数，则只返回值；如果有其他参数，则返回值和 indice。
所以需要针对两种重载来处理 out 参数（赋值单个或者两个）

如果没有out，就视作完全一致

如果有out，就必然有dim，也就是返回值和indice，因此赋值两个

只需要这样写就可以了，只有这两种情况，不用写得那么复杂。

整个reduce系列都与这种类似（torch.min还额外有一种torch.minimum的用法与之不同），可以在TupleAssignMatcher的基础上优化一个通用Matcher。

zhwesky2010 · 2024-04-03T04:21:18Z

tests/test_nanmedian.py

    )


-def test_case_5():
+# 会引发段错误，先屏蔽
+def _test_case_5():


这里的Bug反馈过去了吗

已经反馈

zhwesky2010 · 2024-04-03T07:34:31Z

paconvert/api_mapping.json

@@ -8495,7 +8495,7 @@
    }
  },
  "torch.median": {
-    "Matcher": "GenericMatcher",
+    "Matcher": "MedianMatcher",


这里是不是直接用doubleassignmatcher就可以了

zhwesky2010 · 2024-04-03T07:34:34Z

paconvert/api_mapping.json

@@ -8715,7 +8715,7 @@
    }
  },
  "torch.nanmedian": {
-    "Matcher": "GenericMatcher",
+    "Matcher": "MedianMatcher",


这里是不是直接用doubleassignmatcher就可以了

zhwesky2010 · 2024-04-03T07:39:29Z

tests/test_nanmedian.py

    )


-def test_case_3():
+# 频繁测试会引发段错误，先屏蔽
+def _test_case_3():


这个问题需要nanmedian看下

zhwesky2010

目前nanmedian已经修复了，CI应该可以通过了

zhwesky2010 · 2024-04-08T05:02:36Z

paconvert/api_matcher.py

@@ -3336,6 +3342,12 @@ def generate_code(self, kwargs):
                else:
                    kwargs.pop(k)

+        paddle_default_kwargs = self.api_mapping.get("paddle_default_kwargs", {})


基类已经封装了设置默认参数的功能，TripleAssignMatcher 已经用了，见代码： https://github.com/PaddlePaddle/PaConvert/blob/master/paconvert/api_matcher.py#L3327 ，

DoubleAssignMatcher 也换成这种封装好的写法

zhwesky2010 · 2024-04-09T11:24:02Z

@RedContritio TransformerDecoderLayer 这个API也支持了layernorm_eps

zhwesky2010

TransformDecodeLayer这个单测没有改，也移除了layer_norm_eps，需要把单测升级一下

zhwesky2010 · 2024-04-10T03:48:53Z

tests/test_nn_TransformerEncoderLayer.py

-        pytorch_code,
-        ["result"],
-        unsupport=True,
-        reason="paddle unsupport layer_norm_eps args",


TransformDecodeLayer这个的单测是不是没改？

好的，下个 pr 改

paddle-bot bot added the contributor External developers label Apr 2, 2024

zhwesky2010 reviewed Apr 2, 2024

View reviewed changes

paconvert/api_mapping.json Show resolved Hide resolved

zhwesky2010 reviewed Apr 3, 2024

View reviewed changes

RedContritio added 5 commits April 3, 2024 17:49

update torch.median

02bfbca

update test_nanmedian

2ec8c55

update torch.nn.functional.group_norm

5213896

update torch.nn.TransformerEncoderLayer

c7887ca

update median

0c58f78

RedContritio force-pushed the update_median_etc_matcher branch from d2463af to 0c58f78 Compare April 3, 2024 09:49

NKNaN mentioned this pull request Apr 3, 2024

fix nanmedian cpu kernel crash 易用性提升 PaddlePaddle/Paddle#63221

Merged

zhwesky2010 reviewed Apr 8, 2024

View reviewed changes

RedContritio mentioned this pull request Apr 8, 2024

[WeeklyReports] 2024.03.23~2024.04.05 周报汇总 PFCCLab/Camp#193

Closed

28 tasks

update

00b65ec

zhwesky2010 approved these changes Apr 10, 2024

View reviewed changes

zhwesky2010 merged commit b6cda71 into PaddlePaddle:master Apr 10, 2024
8 checks passed

RedContritio deleted the update_median_etc_matcher branch April 10, 2024 08:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upgrade `torch.median` and 3 apis #382

upgrade `torch.median` and 3 apis #382

RedContritio commented Apr 2, 2024

paddle-bot bot commented Apr 2, 2024

zhwesky2010 left a comment •

edited

Loading

zhwesky2010 Apr 3, 2024

RedContritio Apr 3, 2024

zhwesky2010 Apr 3, 2024 •

edited

Loading

RedContritio Apr 3, 2024

zhwesky2010 Apr 3, 2024

RedContritio Apr 3, 2024

zhwesky2010 Apr 3, 2024

zhwesky2010 Apr 3, 2024

zhwesky2010 Apr 3, 2024

zhwesky2010 left a comment

zhwesky2010 Apr 8, 2024 •

edited

Loading

RedContritio Apr 9, 2024

zhwesky2010 commented Apr 9, 2024

zhwesky2010 left a comment

zhwesky2010 Apr 10, 2024

RedContritio Apr 10, 2024

upgrade torch.median and 3 apis #382

upgrade torch.median and 3 apis #382

Conversation

RedContritio commented Apr 2, 2024

PR Docs

PR APIs

paddle-bot bot commented Apr 2, 2024

zhwesky2010 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhwesky2010 Apr 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhwesky2010 left a comment

Choose a reason for hiding this comment

zhwesky2010 Apr 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhwesky2010 commented Apr 9, 2024

zhwesky2010 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

upgrade `torch.median` and 3 apis #382

upgrade `torch.median` and 3 apis #382

zhwesky2010 left a comment •

edited

Loading

zhwesky2010 Apr 3, 2024 •

edited

Loading

zhwesky2010 Apr 8, 2024 •

edited

Loading