[CINN] Add infer_symbol_shape for some ops #68166

GoldenStain · 2024-09-11T15:57:24Z

PR Category

CINN

PR Types

Improvements

Description

添加log_loss算子符号推导实现，按照字母序对原先的所有函数声明重新排序

paddle-bot · 2024-09-11T15:57:29Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

gongshaotian · 2024-09-14T03:18:03Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+  const symbol::ShapeOrDataDimExprs &input_shape =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  const symbol::ShapeOrDataDimExprs &label_shape =
+      infer_context->GetShapeOrDataForValue(op->operand_source(1));


推荐命名input_shape_or_data, 符号推导里有shape和data区的设计，一般在取shape时才使用 _shape 后缀

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

gongshaotian · 2024-09-14T03:19:14Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+  PADDLE_ENFORCE_EQ(
+      input_shape.shape()[0],
+      label_shape.shape()[0],
+      common::errors::InvalidArgument(
+          "ShapeError: The batch_size of input and label must be the same. "
+          "But received input batch_size = %d, label batch_size = %d",
+          input_shape.shape()[0],
+          label_shape.shape()[0]));


dim 之间的约束应该使用 Addequalcstr()

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h

gongshaotian · 2024-09-14T03:31:22Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+
+  // 二分类任务，label 通常是一维的（batch_size, 1），确保 input 的最后一维与
+  // label 的最后一维相同
+  if (input_shape.shape().size() == 2 && label_shape.shape().size() == 2) {


PADDLE_ENFORCE_EQ 强制约束 input 和 label 的shape区数据size() == 2。然后写个for循环把两个dim都加上equalcstr

GoldenStain · 2024-09-17T10:24:16Z

CI时身份信息验证失败，无法通过ci

GoldenStain · 2024-09-18T02:37:33Z

PR-CE-Framework单测的paddle-infer项目，日志显示
2024-09-17 21:25:38 + exit 0
2024-09-17 21:25:38 {build code state=0}
2024-09-17 21:25:38 build paddle success!
但最终结果显示未通过；
PR-CI-Mac-Python3如下测试未通过：
2024-09-17 20:33:03 the following tests failed:
2024-09-17 20:33:03 + echo '
2024-09-17 20:33:03 371 - test_high_order_derivative (failed)
2024-09-17 20:33:03 563 - test_distribution_continuous_bernoulli (failed)
2024-09-17 20:33:03 760 - test_callback_wandb (failed)
2024-09-17 20:33:03 1504 - test_transforms_static (failed)
2024-09-17 20:33:03 test project /home/paddle/build
2024-09-17 20:33:03 807 - test_callback_wandb (failed)
2024-09-17 20:33:03 807 - test_callback_wandb (failed)'
2024-09-17 20:33:03 + sort -u
2024-09-17 20:33:03 + grep -e test_callback_wandb
2024-09-17 20:33:03 760 - test_callback_wandb (failed)
2024-09-17 20:33:03 807 - test_callback_wandb (failed)
但是不涉及我修改的LogLoss

gongshaotian · 2024-09-18T03:14:49Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+    infer_context->AddEqualCstr(input_shape_or_data.shape()[i],
+                                label_shape_or_data.shape()[i]);
+  }
+


麻烦补充一个equalcstr(input_shape[1], dimexpr(1))；的约束，对于动态维度，能添加约束信息就尽量添加

gongshaotian · 2024-09-18T03:16:42Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+                                label_shape_or_data.shape()[i]);
+  }
+
+  std::vector<symbol::DimExpr> output_shape = {symbol::DimExpr{1}};


这里是不是应该是 {input_shape[0], symbol::DimExpr{1}}

gongshaotian · 2024-09-18T03:17:00Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h

CLAassistant · 2024-09-18T10:02:24Z

All committers have signed the CLA.

CLAassistant · 2024-09-18T10:02:24Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

gongshaotian · 2024-09-20T09:29:09Z

看起来是有语法错误？

GoldenStain · 2024-09-20T09:34:12Z

看起来是有语法错误？

不知道这个文件名是不是cmake或者make生成的，该目录下并没有这个文件；
我修改的函数返回值是bool值，我再检查一下

GoldenStain · 2024-09-20T20:54:56Z

通过本地单测

GoldenStain · 2024-09-21T07:21:37Z

PR-CI-Model-benchmark日志显示"fail; gpu_mem has increased, please contact RD for repair." 即便把paddle最新仓库原封不动提交跑PR也是这样；

gongshaotian · 2024-09-23T02:38:58Z

PR-CI-Model-benchmark日志显示"fail; gpu_mem has increased, please contact RD for repair." 即便把paddle最新仓库原封不动提交跑PR也是这样；

目前已经通过，之前导致挂掉的问题负责同学已经修复

gongshaotian · 2024-09-23T02:46:45Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+  symbol::DimExpr one_dim = symbol::DimExpr{1};
+
+  infer_context->AddEqualCstr(input_shape[1], one_dim);
+  infer_context->AddEqualCstr(label_shape[1], one_dim);


这里其实添加一个就可以，上面已经添加了input_shape[1]和label_shape[1]的约束。可以放到下个pr修改

gongshaotian · 2024-09-23T02:49:07Z

存在Optest 单测，check_pir flag已打开，test/legacy_test/test_log_loss_op.py

gongshaotian · 2024-09-23T02:59:44Z

麻烦PR Title 中补充上log_loss op 信息

zyfncg · 2024-09-23T03:18:00Z

paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc

+                                        infer_context->GetShapeOrDataForValue(
+                                            op->operand_source(1));
+
+  const auto &input_shape = input_shape_or_data.shape();


这里可以直接写成
const auto &input_shape = infer_context->GetShapeOrDataForValue(op->operand_source(0)).shape();

这里可以直接写成
const auto &input_shape = infer_context->GetShapeOrDataForValue(op->operand_source(0)).shape();

@GoldenStain 下一个PR改一下哈

paddle-bot bot added the contributor External developers label Sep 11, 2024

GoldenStain mentioned this pull request Sep 11, 2024

[WeeklyReports] 2024.08.24~2024.09.06 周报收集 PFCCLab/Starter#381

Open

33 tasks

luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Sep 12, 2024

luotao1 assigned luotao1 and gongshaotian Sep 12, 2024

gongshaotian reviewed Sep 14, 2024

View reviewed changes

GoldenStain force-pushed the develop branch from 84a7d74 to 030b47a Compare September 16, 2024 16:54

GoldenStain requested a review from gongshaotian September 16, 2024 16:59

GoldenStain force-pushed the develop branch from 030b47a to 0185022 Compare September 16, 2024 18:51

GoldenStain closed this Sep 17, 2024

GoldenStain reopened this Sep 17, 2024

gongshaotian reviewed Sep 18, 2024

View reviewed changes

GoldenStain force-pushed the develop branch from 1cc9eee to 2ec05ac Compare September 19, 2024 08:41

trying to fix bug

a496cae

GoldenStain force-pushed the develop branch from 97b1076 to a496cae Compare September 20, 2024 19:19

GoldenStain added 2 commits September 21, 2024 03:48

fix syntax error

4df5222

fix bug, pass local test

eb9eff6

gongshaotian reviewed Sep 23, 2024

View reviewed changes

Hongqing-work approved these changes Sep 23, 2024

View reviewed changes

zyfncg approved these changes Sep 23, 2024

View reviewed changes

luotao1 merged commit f683edd into PaddlePaddle:develop Sep 23, 2024
28 of 30 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CINN] Add infer_symbol_shape for some ops #68166

[CINN] Add infer_symbol_shape for some ops #68166

GoldenStain commented Sep 11, 2024 •

edited

Loading

paddle-bot bot commented Sep 11, 2024

gongshaotian Sep 14, 2024

gongshaotian Sep 14, 2024

gongshaotian Sep 14, 2024

GoldenStain commented Sep 17, 2024

GoldenStain commented Sep 18, 2024

gongshaotian Sep 18, 2024 •

edited

Loading

gongshaotian Sep 18, 2024

gongshaotian Sep 18, 2024

CLAassistant commented Sep 18, 2024 •

edited

Loading

CLAassistant commented Sep 18, 2024

gongshaotian commented Sep 20, 2024

GoldenStain commented Sep 20, 2024

GoldenStain commented Sep 20, 2024

GoldenStain commented Sep 21, 2024 •

edited

Loading

gongshaotian commented Sep 23, 2024

gongshaotian Sep 23, 2024

gongshaotian commented Sep 23, 2024

gongshaotian commented Sep 23, 2024

zyfncg Sep 23, 2024

luotao1 Sep 23, 2024

[CINN] Add infer_symbol_shape for some ops #68166

[CINN] Add infer_symbol_shape for some ops #68166

Conversation

GoldenStain commented Sep 11, 2024 • edited Loading

PR Category

PR Types

Description

paddle-bot bot commented Sep 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GoldenStain commented Sep 17, 2024

GoldenStain commented Sep 18, 2024

gongshaotian Sep 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CLAassistant commented Sep 18, 2024 • edited Loading

CLAassistant commented Sep 18, 2024

gongshaotian commented Sep 20, 2024

GoldenStain commented Sep 20, 2024

GoldenStain commented Sep 20, 2024

GoldenStain commented Sep 21, 2024 • edited Loading

gongshaotian commented Sep 23, 2024

Choose a reason for hiding this comment

gongshaotian commented Sep 23, 2024

gongshaotian commented Sep 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GoldenStain commented Sep 11, 2024 •

edited

Loading

gongshaotian Sep 18, 2024 •

edited

Loading

CLAassistant commented Sep 18, 2024 •

edited

Loading

GoldenStain commented Sep 21, 2024 •

edited

Loading