【BUAA】【Infer Symbolic Shape】Add moe, multiclass_nms3, shadow_feed_tensor operator for CINN compiler #67337
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1460,19 +1460,72 @@ bool RoiAlignOpInferSymbolicShape( | |
| // return MergedMomentumOpInferSymbolicShape(op, infer_context); | ||
| // } | ||
|
|
||
| bool MulticlassNms3OpInferSymbolicShape( | ||
| pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) { | ||
| const auto &bboxes_shape_or_data = | ||
| infer_context->GetShapeOrDataForValue(op->operand_source(0)); | ||
| const auto &scores_shape_or_data = | ||
| infer_context->GetShapeOrDataForValue(op->operand_source(1)); | ||
|
|
||
| const std::vector<symbol::DimExpr> &box_dims = bboxes_shape_or_data.shape(); | ||
| const std::vector<symbol::DimExpr> &score_dims = scores_shape_or_data.shape(); | ||
| const size_t score_size = score_dims.size(); | ||
|
|
||
| PADDLE_ENFORCE_EQ( | ||
| score_size == 2 || score_size == 3, | ||
| true, | ||
| common::errors::InvalidArgument( | ||
| "The rank of Input(Scores) must be 2 or 3. But received rank = %d", | ||
| score_size)); | ||
| PADDLE_ENFORCE_EQ( | ||
| box_dims.size(), | ||
| 3, | ||
| common::errors::InvalidArgument( | ||
| "The rank of Input(BBoxes) must be 3. But received rank = %d", | ||
| box_dims.size())); | ||
|
|
||
| if (score_size == 3) { | ||
| PADDLE_ENFORCE_EQ( | ||
| box_dims[2] == 4 || box_dims[2] == 8 || box_dims[2] == 16 || | ||
| box_dims[2] == 24 || box_dims[2] == 32, | ||
| true, | ||
| common::errors::InvalidArgument("The last dimension of Input(BBoxes) " | ||
| "must be 4 or 8 or 16 or 24 or 32")); | ||
| infer_context->AddEqualCstr(box_dims[1], score_dims[2]); | ||
| } else { | ||
| infer_context->AddEqualCstr(box_dims[2], symbol::DimExpr(4)); | ||
| infer_context->AddEqualCstr(box_dims[1], score_dims[1]); | ||
| } | ||
|
|
||
| const auto &next_symbol_out_and_index = infer_context->GetNextSymName(); | ||
| const auto &next_symbol_nms_rois_num = infer_context->GetNextSymName(); | ||
|
|
||
| std::vector<symbol::DimExpr> out_shape; | ||
| out_shape.emplace_back(next_symbol_out_and_index); | ||
| out_shape.emplace_back(box_dims[2] + 2); | ||
|
|
||
| std::vector<symbol::DimExpr> index_shape; | ||
| index_shape.emplace_back(next_symbol_out_and_index); | ||
|
There was a problem hiding this comment. 怎么确定的out_shape 与 index_shape的第一维是相同的动态维度 There was a problem hiding this comment. MultiClassNMSKernel out和index第一维总是相同的 |
||
| index_shape.emplace_back(1); | ||
|
|
||
| std::vector<symbol::DimExpr> nms_rois_num_shape; | ||
| nms_rois_num_shape.emplace_back(next_symbol_nms_rois_num); | ||
|
There was a problem hiding this comment. 如果能确定这个动态维度与上面两个无关，这里就可以不再使用中间变量了，直接emplace_back(infer_context->GetNextSymName()); |
||
|
|
||
| infer_context->SetShapeOrDataForValue( | ||
| op->result(0), | ||
| symbol::ShapeOrDataDimExprs{ | ||
| symbol::TensorShapeOrDataDimExprs(out_shape)}); | ||
| infer_context->SetShapeOrDataForValue( | ||
| op->result(1), | ||
| symbol::ShapeOrDataDimExprs{ | ||
| symbol::TensorShapeOrDataDimExprs(index_shape)}); | ||
| infer_context->SetShapeOrDataForValue( | ||
| op->result(2), | ||
| symbol::ShapeOrDataDimExprs{ | ||
| symbol::TensorShapeOrDataDimExprs(nms_rois_num_shape)}); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool MeshgridOpInferSymbolicShape( | ||
| pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) { | ||
|
|
@@ -1532,8 +1585,7 @@ bool MovingAverageAbsMaxScale_OpInferSymbolicShape( | |
| } | ||
|
|
||
| // bool NceOpInferSymbolicShape(pir::Operation *op, | ||
| // pir::InferSymbolicShapeContext *infer_context){ | ||
| // // pass | ||
| // return true; | ||
| // } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个5个dim的约束需要修改为使用Addequalcstr()添加
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不包含
||的约束已进行修改There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
score_size和box_dims.size()均为int类型
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
剩下的约束目前shape dialect无法表示了，直接删掉或者写成TODO，不能直接使用静态值判断
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
已完成修改