Skip to content

[PIR][DynamicShape] More logic on shape or data selection in InferSymbolicShape #62569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lanxianghit merged 4 commits into from
Mar 11, 2024
Merged

[PIR][DynamicShape] More logic on shape or data selection in InferSymbolicShape #62569

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78777bb
More logic on shape or data selection in InferSymbolicShape
lanxianghit Mar 8, 2024
8d8cabf
bug fix
lanxianghit Mar 10, 2024
f0d6c50
fix bug
lanxianghit Mar 10, 2024
2bfab3a
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
lanxianghit Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions ...luid/pir/dialect/operator/interface/infer_symbolic_shape/infer_sym_element_wise_binary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,23 @@
#include "paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/infer_sym_element_wise_binary.h"
#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"

bool ShouldUseData(pir::Value val) {
if (!val.defining_op()) return false;
if (val.defining_op()->isa<paddle::dialect::ShapeOp>()) {
return true;
}
return false;
}

bool InferSymbolicShapeElementWiseBinary(
pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) {
const auto &x_shapeordata =
shape_analysis->GetShapeOrDataForValue(op->operand_source(0));
std::vector<symbol::DimExpr> shape_0;
// For ElementWiseBinary ops, if the input tensor is from full op, the value
// of fullop is useless, only the shape need doing broadcast
bool x_from_fullop =
op->operand_source(0).defining_op()
? op->operand_source(0).defining_op()->isa<paddle::dialect::FullOp>()
: false;
if (!x_from_fullop && x_shapeordata.data().has_value()) {
if (ShouldUseData(op->operand_source(0)) &&
x_shapeordata.data().has_value()) {
shape_0 = x_shapeordata.data().value();
} else {
shape_0 = x_shapeordata.shape();
Expand All @@ -35,11 +40,8 @@ bool InferSymbolicShapeElementWiseBinary(
const auto &y_shapeordata =
shape_analysis->GetShapeOrDataForValue(op->operand_source(1));
std::vector<symbol::DimExpr> shape_1;
bool y_from_fullop =
op->operand_source(1).defining_op()
? op->operand_source(1).defining_op()->isa<paddle::dialect::FullOp>()
: false;
if (!y_from_fullop && y_shapeordata.data().has_value()) {
if (ShouldUseData(op->operand_source(1)) &&
y_shapeordata.data().has_value()) {
shape_1 = y_shapeordata.data().value();
} else {
shape_1 = y_shapeordata.shape();
Expand Down