Use DimExpr and change InferSymbolicShapeInterface #60371
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,141 +13,192 @@ | |
| // limitations under the License. | ||
|
|
||
| #include "paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape.h" | ||
| #include "paddle/pir/core/builtin_attribute.h" | ||
| #include "paddle/pir/core/builtin_type.h" | ||
| #include "paddle/pir/dialect/shape/ir/shape_op.h" | ||
|
|
||
| namespace paddle::dialect { | ||
|
|
||
| bool InferSymbolicShapeInterface::InferSymbolicShape( | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return impl_->infer_symbolic_shapes(operation(), shape_analysis); | ||
| } | ||
| } // namespace paddle::dialect | ||
|
|
||
| namespace paddle::dialect { | ||
|
|
||
| namespace { | ||
|
|
||
| bool InferSymbolicShapeAllEqualUnary( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source = op->operand_source(0); | ||
| std::string operand_source_id = pir::GetValueId(&operand_source); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = | ||
| shape_analysis->value_id_to_shapeordata_[operand_source_id]; | ||
| return true; | ||
| } | ||
|
|
||
| bool InferSymbolicShapeAllEqualBinary( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source = op->operand_source(0); | ||
| std::string operand_source_id = pir::GetValueId(&operand_source); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = | ||
| shape_analysis->value_id_to_shapeordata_[operand_source_id]; | ||
|
Comment on lines
+46
to
+50
There was a problem hiding this comment. value可以直接用作map的key吗？看着用value id会多一些处理 |
||
| return true; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| bool AbsOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool Abs_OpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool CastOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool Cast_OpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool ExpOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool Exp_OpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualUnary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool SubtractOpInferSymbolicShape( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualBinary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool Subtract_OpInferSymbolicShape( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return InferSymbolicShapeAllEqualBinary(op, shape_analysis); | ||
| } | ||
|
|
||
| bool ShapeOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source = op->operand_source(0); | ||
| std::string operand_source_id = pir::GetValueId(&operand_source); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
|
|
||
| std::vector<int64_t> dims = | ||
| common::vectorize(res.type().dyn_cast<pir::DenseTensorType>().dims()); | ||
|
|
||
| std::vector<symbol::DimExpr> shapes; | ||
| for (int64_t dim : dims) { | ||
| symbol::DimExpr dim_expr; | ||
| if (dim == -1) { | ||
| symbol::DimExpr res_dim_expr(shape_analysis->GetNextSymName()); | ||
| dim_expr = res_dim_expr; | ||
| } else { | ||
| symbol::DimExpr res_dim_expr(dim); | ||
| dim_expr = res_dim_expr; | ||
| } | ||
| shapes.push_back(dim_expr); | ||
| } | ||
|
|
||
| symbol::ShapeOrDataDimExprs shape_data{shapes}; | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = shape_data; | ||
| return true; | ||
| } | ||
|
|
||
| bool ShapeSrOpInferSymbolicShape( | ||
|
There was a problem hiding this comment. Shape"Sr"Op 中间的Sr是什么含义？ There was a problem hiding this comment. selected_rows 版本的算子，ShapeSrOp 和 ShapeSrOp 共用了一个 yaml 配置 |
||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return ShapeOpInferSymbolicShape(op, shape_analysis); | ||
| } | ||
|
|
||
| bool StackOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source = op->operand_source(0); | ||
| std::string operand_source_id = pir::GetValueId(&operand_source); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
|
|
||
| symbol::ShapeOrDataDimExprs shape_data; | ||
| shape_data = shape_analysis->value_id_to_shapeordata_[operand_source_id]; | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = shape_data; | ||
|
There was a problem hiding this comment. #60146 这个PR合入之后，可以增加一些调试信息输出，便于以后调试使用 There was a problem hiding this comment. 好的，这个PR里 重写了 DebugPrintOpInfo，目前也支持 符号和 int_64 两种类型的 Dim_Expr 打印，后续会改用新的接口 |
||
| return true; | ||
| } | ||
|
|
||
| bool ReshapeOpInferSymbolicShape( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source_1 = op->operand_source(1); | ||
| std::string operand_source_1_id = pir::GetValueId(&operand_source_1); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
|
|
||
| symbol::ShapeOrDataDimExprs shape_data; | ||
|
|
||
| shape_data = shape_analysis->value_id_to_shapeordata_[operand_source_1_id]; | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = shape_data; | ||
|
There was a problem hiding this comment. 这里应该后面要用到宏宇PR的一个接口，下个PR改，这里data应该还是空的 |
||
| return true; | ||
| } | ||
|
|
||
| bool Reshape_OpInferSymbolicShape( | ||
| pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| return ReshapeOpInferSymbolicShape(op, shape_analysis); | ||
| } | ||
|
|
||
| } // namespace paddle::dialect | ||
| namespace cinn::dialect { | ||
|
|
||
| bool SliceOpInferSymbolicShape(pir::Operation *op, | ||
| pir::ShapeConstraintIRAnalysis *shape_analysis) { | ||
| pir::Value operand_source = op->operand_source(0); | ||
| std::string operand_source_id = pir::GetValueId(&operand_source); | ||
| pir::OpResult res = op->result(0); | ||
| std::string res_id = pir::GetValueId(&res); | ||
|
|
||
| std::vector<int64_t> dims = | ||
| common::vectorize(res.type().dyn_cast<pir::DenseTensorType>().dims()); | ||
|
|
||
| std::vector<symbol::DimExpr> shapes; | ||
| for (int64_t dim : dims) { | ||
| symbol::DimExpr dim_expr; | ||
| if (dim == -1) { | ||
| symbol::DimExpr res_dim_expr(shape_analysis->GetNextSymName()); | ||
| dim_expr = res_dim_expr; | ||
| } else { | ||
| symbol::DimExpr res_dim_expr(dim); | ||
| dim_expr = res_dim_expr; | ||
| } | ||
| shapes.push_back(dim_expr); | ||
| } | ||
|
|
||
| // pir::AttributeMap attributes = op->attributes(); | ||
|
|
||
| // auto attr_starts = | ||
| // attributes["starts"].dyn_cast<pir::ArrayAttribute>().AsVector(); | ||
| // auto start = attr_starts[0].dyn_cast<pir::Int64Attribute>().data(); | ||
|
|
||
| // auto attr_ends = | ||
| // attributes["ends"].dyn_cast<pir::ArrayAttribute>().AsVector(); | ||
| // auto end = attr_ends[0].dyn_cast<pir::Int64Attribute>().data(); | ||
|
|
||
| symbol::ShapeOrDataDimExprs shape_data{shapes}; | ||
| shape_analysis->value_id_to_shapeordata_[res_id] = shape_data; | ||
| return true; | ||
| } | ||
|
|
||
| } // namespace cinn::dialect | ||
|
|
||
| IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::InferSymbolicShapeInterface) | ||
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.
正式代码里最好不要直接操作成员变量了，需要使用封装接口操作
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.
收到