【BUAA】【Infer Symbolic Shape No.3,46,107】Add as_strided, fold and yolo_loss #67037

Fripping · 2024-08-05T07:51:01Z

PR Category

CINN

PR Types

Others

Description

添加 as_strided, yolo_loss 和 fold 算子符号推导接口实现。

as_strided两个遗留问题的解决PR：#67801

…pe/.ipynb_checkpoints directory

paddle-bot · 2024-08-05T07:51:05Z

你的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-08-12T08:46:32Z

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

@@ -1594,6 +1594,83 @@ bool Where_OpInferSymbolicShape(pir::Operation *op,
  return WhereOpInferSymbolicShape(op, infer_context);
 }

+bool YoloLossOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const auto &dim_x =


命名：x_shape

gongshaotian · 2024-08-12T08:54:05Z

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

+      infer_context->GetShapeOrDataForValue(op->operand_source(2)).shape();
+  std::vector<int> anchors_mask =
+      paddle::dialect::details::GetVectorAttr<int>(op, "anchor_mask");
+  int mask_num = static_cast<int>(anchors_mask.size());


非必要cast

gongshaotian · 2024-08-12T08:57:11Z

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

+      infer_context->GetShapeOrDataForValue(op->operand_source(1)).shape();
+  const auto &dim_gtlabel =
+      infer_context->GetShapeOrDataForValue(op->operand_source(2)).shape();
+  std::vector<int> anchors_mask =


const std::vector &

gongshaotian · 2024-08-12T08:58:28Z

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

+      phi::errors::InvalidArgument("Input(GTBox) should be a 3-D tensor, but "
+                                   "received gtbox dimension size(%s)",
+                                   dim_gtbox.size()));
+  /*PADDLE_ENFORCE_EQ(


删掉注释

gongshaotian · 2024-08-12T12:17:14Z

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

@@ -31,6 +31,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Asinh)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Asinh_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Assign)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Assign_)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(AsStrided)


这个op看接口描述应该不是same类型，我再确认一下

已确认AsStrided不是same类型，麻烦参考kernel实现编写符号推导接口。顺便把infermeta接口也修改一下

gongshaotian · 2024-08-12T12:37:47Z

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

@@ -994,6 +994,34 @@ bool Flatten_OpInferSymbolicShape(
  return FlattenOpInferSymbolicShape(op, infer_context);
 }

+bool FoldOpInferSymbolicShape(pir::Operation *op,
+                              pir::InferSymbolicShapeContext *infer_context) {
+  const auto &in_dims =


命名不规范，x_shape

gongshaotian · 2024-08-12T12:40:34Z

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

+  std::vector<int> kernel_sizes =
+      paddle::dialect::details::GetVectorAttr<int>(op, "kernel_sizes");
+  out_dims.push_back(in_dims[1] /
+                     (symbol::DimExpr(kernel_sizes[0] * kernel_sizes[1])));


这里不需要使用symbol::DimExpr() 构造 Dimexpr()，DimExpr是支持这些运算的

gongshaotian · 2024-08-12T12:41:10Z

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

+
+  std::vector<int> output_sizes =
+      paddle::dialect::details::GetVectorAttr<int>(op, "output_sizes");
+  infer_context->AddGreatThanOneCstr(symbol::DimExpr(output_sizes[0]));


删掉 symbol::DimExpr()

gongshaotian · 2024-08-12T12:41:35Z

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

+  std::vector<int> output_sizes =
+      paddle::dialect::details::GetVectorAttr<int>(op, "output_sizes");
+  infer_context->AddGreatThanOneCstr(symbol::DimExpr(output_sizes[0]));
+  infer_context->AddGreatThanOneCstr(symbol::DimExpr(output_sizes[1]));


gongshaotian · 2024-08-12T12:42:50Z

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

+
+  out_dims.push_back(symbol::DimExpr(output_sizes[0]));
+  out_dims.push_back(symbol::DimExpr(output_sizes[1]));
+


少了DimExpr的约束，参考infermeta再修改一下吧

Fripping · 2024-08-14T02:38:29Z

coverage exit-9:

AsStridedOP：
test/legacy_test/test_as_strided.py 单测文件存在，其中不包含"as_strided" op 单测

FoldOp:
test/legacy_test/test_fold_op.py 单测文件存在，其中包含"fold" op 单测，check_pir flag已打开

YoloLossOp:
test/legacy_test/test_yolov3_loss_op.py 单测文件存在，其中包含"yolov3_loss" op 单测，check_pir flag已打开

Hongqing-work · 2024-08-14T04:43:48Z

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

+  int rank = shape.size();
+  std::vector<symbol::DimExpr> out_shape;
+  for (int i = 0; i < rank; ++i) {
+    out_shape.push_back(symbol::DimExpr(shape[i]));
+  }


确认一下这个算子是否允许输入维度为-1吧，如果允许的话需要特判上新符号

…pe/.ipynb_checkpoints directory

Hongqing-work · 2024-08-15T02:34:43Z

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

+  for (int i = 0; i < rank; ++i) {
+    symbol::DimExpr out_unknown = infer_context->GetNextSymName();
+    if (shape[i] == -1) {
+      out_shape.push_back(out_unknown);
+    } else {
+      out_shape.push_back(symbol::DimExpr(shape[i]));
+    }
+  }


symbol::DimExpr out_unknown = infer_context->GetNextSymName();最好放在if分支里，虽然这些新符号都没用到但是每个循环里符号计数都会增加

gongshaotian · 2024-08-15T07:51:30Z

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

@@ -388,6 +388,30 @@ bool Assign_OpInferSymbolicShape(
  return AssignOpInferSymbolicShape(op, infer_context);
 }

+bool AsStridedOpInferSymbolicShape(


修改一下AsStride的InferMeta接口

gongshaotian · 2024-08-16T03:01:56Z

在这个pr下贴上上述两个遗留问题的PR

Fripping · 2024-08-29T01:31:30Z

上述两个遗留问题的解决PR：#67801

Fripping and others added 4 commits August 5, 2024 15:32

a

2fad015

update cinn api

7f66ddc

Delete paddle/phi/ops/yaml/.ipynb_checkpoints directory

243febb

Delete paddle/fluid/pir/dialect/operator/interface/infer_symbolic_sha…

31c0cd3

…pe/.ipynb_checkpoints directory

paddle-bot bot added the contributor External developers label Aug 5, 2024

luotao1 added the HappyOpenSource Pro 进阶版快乐开源活动，更具挑战性的任务 label Aug 6, 2024

luotao1 assigned luotao1 and gongshaotian Aug 6, 2024

Fripping force-pushed the cin7 branch 3 times, most recently from ab86a17 to d515eeb Compare August 12, 2024 10:05

gongshaotian reviewed Aug 12, 2024

View reviewed changes

update cinn api

84c12b8

Fripping force-pushed the cin7 branch from d22c5a2 to 84c12b8 Compare August 13, 2024 06:24

Hongqing-work reviewed Aug 14, 2024

View reviewed changes

update -1 sign

ca6bd5d

Fripping force-pushed the cin7 branch from d2d3d89 to ca6bd5d Compare August 14, 2024 05:10

Fripping added 3 commits August 14, 2024 13:10

Delete paddle/fluid/pir/dialect/operator/interface/infer_symbolic_sha…

5a28eea

…pe/.ipynb_checkpoints directory

Merge branch 'develop' into cin7

1718327

Update unary_infer_sym.cc

e3a61ec

Hongqing-work approved these changes Aug 15, 2024

View reviewed changes

luotao1 merged commit 015dfc6 into PaddlePaddle:develop Aug 15, 2024
28 checks passed

gongshaotian reviewed Aug 15, 2024

View reviewed changes

Fripping mentioned this pull request Aug 25, 2024

[WeeklyReports] 2024.08.10~2024.08.23 周报收集 PFCCLab/Starter#340

Closed

35 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【BUAA】【Infer Symbolic Shape No.3,46,107】Add as_strided, fold and yolo_loss #67037

【BUAA】【Infer Symbolic Shape No.3,46,107】Add as_strided, fold and yolo_loss #67037

Fripping commented Aug 5, 2024 •

edited

Loading

paddle-bot bot commented Aug 5, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 13, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

gongshaotian Aug 12, 2024

Fripping commented Aug 14, 2024

Hongqing-work Aug 14, 2024

Fripping Aug 14, 2024

Hongqing-work Aug 15, 2024

gongshaotian Aug 15, 2024

gongshaotian commented Aug 16, 2024

Fripping commented Aug 29, 2024


		out_dims.push_back(symbol::DimExpr(output_sizes[0]));
		out_dims.push_back(symbol::DimExpr(output_sizes[1]));

【BUAA】【Infer Symbolic Shape No.3,46,107】Add as_strided, fold and yolo_loss #67037

【BUAA】【Infer Symbolic Shape No.3,46,107】Add as_strided, fold and yolo_loss #67037

Conversation

Fripping commented Aug 5, 2024 • edited Loading

PR Category

PR Types

Description

paddle-bot bot commented Aug 5, 2024

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

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

Fripping commented Aug 14, 2024

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

gongshaotian commented Aug 16, 2024

Fripping commented Aug 29, 2024

Fripping commented Aug 5, 2024 •

edited

Loading