Skip to content

[Infer Symbolic Shape No.225] Add symbol_infer_interface for shuffle_batch #68978

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
merged 6 commits into from
Nov 12, 2024
Merged

[Infer Symbolic Shape No.225] Add symbol_infer_interface for shuffle_batch #68978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dba847e
Add symbol_infer_interface for shuffle_batch
ooooo-create Oct 27, 2024
1a84d7f
Fix
ooooo-create Oct 27, 2024
d215cda
Refine logic
ooooo-create Nov 3, 2024
988d1db
apply review
ooooo-create Nov 4, 2024
35c4422
revert irrelevant change
ooooo-create Nov 4, 2024
46184cf
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
ooooo-create Nov 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
30 changes: 24 additions & 6 deletions paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,12 +1908,30 @@ bool SequenceMaskOpInferSymbolicShape(
return true;
}

// bool ShuffleBatchOpInferSymbolicShape(pir::Operation *op,
// pir::InferSymbolicShapeContext
// *infer_context) {
// // pass
// return true;
// }
bool ShuffleBatchOpInferSymbolicShape(
pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
const auto &x_shape =
infer_context->GetShapeOrDataForValue(op->operand_source(0)).shape();
infer_context->SetShapeOrDataForValue(
op->result(0),
symbol::ShapeOrDataDimExprs{symbol::TensorShapeOrDataDimExprs(x_shape)});
infer_context->SetShapeOrDataForValue(
op->result(2),
symbol::ShapeOrDataDimExprs{symbol::TensorShapeOrDataDimExprs({1})});
const symbol::DimExpr shuffleidx = [&] {
symbol::DimExpr shuffleidx{1};
for (const auto &i : x_shape) {
shuffleidx = shuffleidx * i;
}
return shuffleidx;
}();

infer_context->SetShapeOrDataForValue(
op->result(1),
symbol::ShapeOrDataDimExprs{
symbol::TensorShapeOrDataDimExprs({shuffleidx})});
return true;
}

bool StftOpInferSymbolicShape(pir::Operation *op,
pir::InferSymbolicShapeContext *infer_context) {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(ReduceAs)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Searchsorted)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(SegmentPool)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(SequenceMask)
// OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShuffleBatch)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(ShuffleBatch)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Solve)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Stft)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Swiglu)
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/ops/yaml/ops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4506,7 +4506,7 @@
traits : pir::SideEffectTrait
data_transform :
skip_transform : seed
# interfaces : paddle::dialect::InferSymbolicShapeInterface
interfaces : paddle::dialect::InferSymbolicShapeInterface

- op : shuffle_channel
args : (Tensor x, int group = 1)
Expand Down