【Infer Symbolic Shape No.139,140,141,142】[BUAA] Add generate_proposals,grid_sample,gru,gru_unit op #67413

Luohongzhige · 2024-08-14T03:32:19Z

PR Category

CINN

PR Types

Improvements

Description

#66444
添加generate_proposals,grid_sample,gru,gru_unit算子符号推导接口
gru,gru_unit有op_test但未开启check_pir
generate_proposals关闭check_symbol_infer

paddle-bot · 2024-08-14T03:32:23Z

你的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-22T07:48:08Z

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

-// }
+bool GenerateProposalsOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  return GenerateProposalsV2OpInferSymbolicShape(op, infer_context);


yaml定义里没有GenerateProposalsV2这个op，直接用op名就行

Hongqing-work · 2024-08-22T08:45:44Z

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

+  // If bias is used, check its dimensions
+  if (op->num_operands() > 3) {


改为判断是否为null value

Hongqing-work · 2024-08-22T08:46:24Z

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

+  auto input_shape =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0)).shape();


const auto &，下同

Hongqing-work · 2024-08-22T08:55:25Z

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

+  std::vector<symbol::DimExpr> rpn_rois_shape = {out_unknown_1,
+                                                 symbol::DimExpr(4)};


应该是batch_size能确定吧

是的， @gongshaotian 说的kernel代码之后还对变量进行了一次resize，使用的参数就是运行时确定的了

kernel实现是可能做了点特殊处理，但至少两个out_unknown应该是同一个值

Hongqing-work · 2024-08-22T09:19:09Z

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

+  if (!is_test) {
+    symbol::TensorShapeOrDataDimExprs batch_gate_shape(input_shape);
+    infer_context->SetShapeOrDataForValue(op->result(0), batch_gate_shape);
+
+    symbol::TensorShapeOrDataDimExprs batch_reset_hidden_prev_shape(
+        {input_shape[0], frame_size});
+    infer_context->SetShapeOrDataForValue(op->result(1),
+                                          batch_reset_hidden_prev_shape);
+
+    symbol::TensorShapeOrDataDimExprs batch_hidden_shape(
+        {input_shape[0], frame_size});
+    infer_context->SetShapeOrDataForValue(op->result(2), batch_hidden_shape);
+  }


非is_test直接用静态shape赋值接口上新符号吧

不太明白此处需要如何修改，是不创建临时变量直接写进SetShapeOrDataForValue函数参数里边吗

每个输出都需要设置symbolic shape，非is_test模式也需要，用infer_context->SetSymbolForValueByStaticShape(xxx)吧

zyfncg · 2024-08-26T08:15:58Z

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

+  } else {
+    infer_context->SetSymbolForValueByStaticShape(op->result(0));
+    infer_context->SetSymbolForValueByStaticShape(op->result(1));
+    infer_context->SetSymbolForValueByStaticShape(op->result(2));
+  }


test为true时，这几个输出看起来维度分别为 input 和 hidden 的维度

…cinn_2

gongshaotian

恭喜解决了第一个Kernel复用Meta推导结果的算子🎉

gongshaotian · 2024-08-22T08:04:01Z

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

+bool GenerateProposalsV2OpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  symbol::DimExpr out_unknown_1 = infer_context->GetNextSymName();
+  symbol::DimExpr out_unknown_2 = infer_context->GetNextSymName();


从kernel看这两个符号表示的维度是相等的，使用一个即可

gongshaotian · 2024-08-22T08:08:23Z

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

-//   // pass
-//   return true;
-// }
+bool GridSampleOpInferSymbolicShape(


LGTM for GridSampleOpInferSymbolicShape

gongshaotian · 2024-08-22T08:39:45Z

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

+  return true;
+}
+
+bool GruUnitOpInferSymbolicShape(


LGTM for GruUnitOpInferSymbolicShape

gongshaotian · 2024-08-26T07:12:05Z

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

-//   // pass
-//   return true;
-// }
+bool GenerateProposalsOpInferSymbolicShape(


LGTM for GenerateProposalsOp

gongshaotian · 2024-08-26T09:00:50Z

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

+    infer_context->AddEqualCstr(bias_shape[1], frame_size * 3);
+  }
+
+  if (!is_test) {


这部分逻辑修改为：
if(is_test){
// 参考kernel的 is_test 分支实现

}esle{
// 参考meta的 !is_test 实现

}

原因为Meta在kernel执行前推导了!is_test分支下部分输出的shape，GruKernel直接使用了Meta的推导结果

luotao1 · 2024-08-28T06:24:13Z

冲突了

fixed

15e133c

luotao1 added contributor External developers HappyOpenSource Pro 进阶版快乐开源活动，更具挑战性的任务 labels Aug 14, 2024

luotao1 assigned luotao1 and gongshaotian Aug 14, 2024

Luohongzhige and others added 10 commits August 15, 2024 14:17

generate

2a78f90

generate

a398e38

generate

0457aef

generate

7a3289c

generate

b1396ba

generate

b404fd5

close check_symbol_infer for TestGenerateProposalsV2Op

2ba9a9d

Merge branch 'develop' into cinn_2

11f4e7d

Merge branch 'develop' into cinn_2

193623e

Merge branch 'develop' into cinn_2

52182e0

gongshaotian reviewed Aug 22, 2024

View reviewed changes

Hongqing-work reviewed Aug 22, 2024

View reviewed changes

Luohongzhige added 2 commits August 22, 2024 18:50

fixed

b0249d4

fixed

c9c2244

zyfncg reviewed Aug 26, 2024

View reviewed changes

Luohongzhige and others added 4 commits August 26, 2024 21:43

fixed Gru

7835adc

Merge branch 'develop' into cinn_2

cc500fc

fixed Gru

c4dd4b1

Merge branch 'cinn_2' of https://github.com/Luohongzhige/Paddle into …

1b50638

…cinn_2

Luohongzhige force-pushed the cinn_2 branch from 64e2c42 to 1b50638 Compare August 27, 2024 08:51

gongshaotian approved these changes Aug 28, 2024

View reviewed changes

luotao1 previously approved these changes Aug 28, 2024

View reviewed changes

Merge branch 'develop' into cinn_2

4e54190

Luohongzhige dismissed luotao1’s stale review via 4e54190 August 28, 2024 06:55

Hongqing-work approved these changes Aug 28, 2024

View reviewed changes

zyfncg approved these changes Aug 28, 2024

View reviewed changes

luotao1 merged commit 3a95bcc into PaddlePaddle:develop Aug 30, 2024
29 checks passed

gongshaotian mentioned this pull request Sep 3, 2024

[CINN]Fix bug caused by Fake Value in symbolic shape interface #67949

Merged

		// If bias is used, check its dimensions
		if (op->num_operands() > 3) {

		auto input_shape =
		infer_context->GetShapeOrDataForValue(op->operand_source(0)).shape();

		std::vector<symbol::DimExpr> rpn_rois_shape = {out_unknown_1,
		symbol::DimExpr(4)};

【Infer Symbolic Shape No.139,140,141,142】[BUAA] Add generate_proposals,grid_sample,gru,gru_unit op #67413

【Infer Symbolic Shape No.139,140,141,142】[BUAA] Add generate_proposals,grid_sample,gru,gru_unit op #67413

Uh oh!

Conversation

Luohongzhige commented Aug 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Category

PR Types

Description

Uh oh!

paddle-bot bot commented Aug 14, 2024

Uh oh!

gongshaotian Aug 22, 2024 • 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!

gongshaotian left a comment

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!

luotao1 commented Aug 28, 2024

Uh oh!

Uh oh!

Uh oh!

Luohongzhige commented Aug 14, 2024 •

edited

Loading

gongshaotian Aug 22, 2024 •

edited

Loading