add some loss api by LokeZhou · Pull Request #109 · PaddlePaddle/PaConvert

LokeZhou · 2023-06-19T12:29:38Z

PR Docs

PR APIs

torch.nn.MSELoss
torch.nn.functional.binary_cross_entropy
torch.nn.BCELoss
torch.nn.L1Loss
torch.nn.Unfold
torch.nn.functional.unfold

zhwesky2010 · 2023-06-20T10:07:05Z

paconvert/api_matcher.py



+class MseLossMatcher(BaseMatcher):
+    def generate_code(self, kwargs):


感觉这一块的重复度很高，是否可以统一成一个Matcher

zhwesky2010 · 2023-06-20T10:09:13Z

PaddlePaddle/docs#5928

PR Docs

PaddlePaddle/docs#5928

PR APIs

torch.nn.MSELoss
torch.nn.functional.binary_cross_entropy
torch.nn.BCELoss
torch.nn.L1Loss
torch.nn.Unfold
torch.nn.functional.unfold

这个文档的链接不对，不是loss的

zhwesky2010 · 2023-06-26T13:58:45Z

PR描述里，docs直接放PR链接，不要写成软连接形式

zhwesky2010 · 2023-06-26T14:05:17Z

paconvert/api_mapping.json

+      "reduction"
+    ]
+  },
+  "torch.nn.Unfold": {


这个可以用genericmatcher吧，改成那个吧

kernel_size 参数 pytorch支持tuple，paddle不支持，改为genericmatcher遇到tuple会报错

zhwesky2010 · 2023-06-26T14:05:25Z

paconvert/api_mapping.json

+      "stride": "strides"
+    }
+  },
+  "torch.nn.functional.unfold": {


这个可以用genericmatcher吧，改成那个吧

同torch.nn.Unfold

zhwesky2010 · 2023-07-04T03:28:55Z

paconvert/api_matcher.py

+            for key in list(kwargs_change.keys()):
+                if key in kwargs:
+                    if "input" not in key:
+                        if "(" in kwargs[key]:


直接判断 if isinstance(kwargs[key] , ast.Tuple): 吧

这个在generate_code直接这样判断似乎不起作用

zhwesky2010 · 2023-07-04T03:30:31Z

paconvert/api_matcher.py

+                    kwargs[kwargs_change[key]] = kwargs[key]
+                    kwargs.pop(key)
+
+        if "paddings" not in kwargs:


这个是默认值就不用单独设置了

zhwesky2010 · 2023-07-04T03:31:01Z

paconvert/api_matcher.py

+            kwargs_change = self.api_mapping["kwargs_change"]
+            for key in list(kwargs_change.keys()):
+                if key in kwargs:
+                    if "input" not in key:


这个由于不可能是tuple，也不用单独判断

zhwesky2010 · 2023-07-04T03:33:09Z

paconvert/api_matcher.py

        return GenericMatcher.generate_code(self, kwargs)


+class UnfoldMatcher(BaseMatcher):


这个可以起一个通用的名字，这个主要功能是把tuple转成list：
可以叫Tuple2ListMatcher

zhwesky2010 · 2023-07-04T03:44:10Z

paconvert/api_matcher.py



+class UnfoldMatcher(BaseMatcher):
+    def generate_code(self, kwargs):


逻辑可以写成对每个kwargs遍历，判断是否kwargs，每个分支里再判断是否list，一共4个分支。用new_kwargs来接收kwargs，不然参数顺序会改变，导致代码风格不太好

for k in list(kwargs.keys()): if kwargs_change: if tuple: else: else: if tuple: else:

zhwesky2010 · 2023-07-04T09:42:09Z

paconvert/api_mapping.json

-      "device",
-      "requires_grad",
-      "memory_format"
+      "index"


这个改错了吧

zhwesky2010 · 2023-07-04T09:43:20Z

paconvert/api_matcher.py

+        for k in list(kwargs.keys()):
+            if k in kwargs_change:
+                if "(" in kwargs[k] and isinstance(ast.literal_eval(kwargs[k]), tuple):
+                    new_kwargs[kwargs_change[k]] = list(ast.literal_eval(kwargs[k]))


判断前面这个就可以，直接 'list({})'.format(kwargs[k]) 吧，尽量不要用eval执行这些逻辑，容易存在隐患

已更新判断逻辑

zhwesky2010 · 2023-07-04T09:43:29Z

paconvert/api_matcher.py

+                    new_kwargs[kwargs_change[k]] = kwargs[k]
+            else:
+                if "(" in kwargs[k] and isinstance(ast.literal_eval(kwargs[k]), tuple):
+                    new_kwargs[k] = list(ast.literal_eval(kwargs[k]))


zhwesky2010 · 2023-07-04T09:44:29Z

tests/test_nn_Unfold.py

+    obj.run(pytorch_code, ["result"])
+
+
+def _test_case_7():


这个什么原因不支持，需要写明白

zhwesky2010 · 2023-07-04T09:44:32Z

tests/test_nn_functional_unfold.py

+    obj.run(pytorch_code, ["result"])
+
+
+def _test_case_7():


这个什么原因不支持，需要写明白

zhwesky2010

LGTM

LokeZhou added 2 commits June 14, 2023 12:58

add some loss api

a6ff8c9

Merge branch 'master' into loss

7321408

zhwesky2010 reviewed Jun 20, 2023

View reviewed changes

LokeZhou added 5 commits June 20, 2023 12:26

unify LossMatcher

a2d50df

Merge branch 'loss' of github.com:LokeZhou/PaConvert into loss

f9099b9

fix mseloss

77485fd

use SizeAverageMatcher

5bf245b

fix unfold bug

f95a8f0

LokeZhou requested a review from zhwesky2010 June 21, 2023 06:12

zhwesky2010 reviewed Jun 26, 2023

View reviewed changes

zhwesky2010 reviewed Jul 4, 2023

View reviewed changes

LokeZhou added 3 commits July 4, 2023 03:47

merge master

ae26cd1

fix Tuple2ListMatcher

e560dd6

Merge branch 'master' of github.com:PaddlePaddle/PaConvert into loss

7d0bc25

LokeZhou force-pushed the loss branch from c74000c to 7d0bc25 Compare July 4, 2023 09:02

zhwesky2010 reviewed Jul 4, 2023

View reviewed changes

fix some comments

6035745

zhwesky2010 previously approved these changes Jul 5, 2023

View reviewed changes

LokeZhou dismissed zhwesky2010’s stale review via 9fee8e9 July 5, 2023 08:28

fix conficts

0bd2a86

LokeZhou force-pushed the loss branch from 9fee8e9 to 0bd2a86 Compare July 5, 2023 08:32

zhwesky2010 approved these changes Jul 5, 2023

View reviewed changes

zhwesky2010 merged commit 182bd89 into PaddlePaddle:master Jul 5, 2023

LokeZhou deleted the loss branch July 5, 2023 08:43



		class MseLossMatcher(BaseMatcher):
		def generate_code(self, kwargs):

		return GenericMatcher.generate_code(self, kwargs)


		class UnfoldMatcher(BaseMatcher):

Conversation

LokeZhou commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Docs

PR APIs

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 commented Jun 20, 2023

PR Docs

PR APIs

Uh oh!

zhwesky2010 commented Jun 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhwesky2010 Jun 26, 2023 • 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!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jun 26, 2023 • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Jul 4, 2023 • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

LokeZhou commented Jun 19, 2023 •

edited

Loading

zhwesky2010 commented Jun 26, 2023 •

edited

Loading

zhwesky2010 Jun 26, 2023 •

edited

Loading

zhwesky2010 Jun 26, 2023 •

edited

Loading

zhwesky2010 Jul 4, 2023 •

edited

Loading