Skip to content
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

Jump to bottom

【BUAA】【Infer Symbolic Shape】add histogram #67776

Merged
merged 1 commit into from
Aug 30, 2024
Merged

【BUAA】【Infer Symbolic Shape】add histogram #67776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 35 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 @@ -862,12 +862,41 @@ bool HuberLossOpInferSymbolicShape(
return true;
}

// bool HistogramOpInferSymbolicShape(pir::Operation *op,
// pir::InferSymbolicShapeContext
// *infer_context) {
// // pass
// return true;
// }
bool HistogramOpInferSymbolicShape(
pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
const symbol::ShapeOrDataDimExprs &input_shape_or_data =
infer_context->GetShapeOrDataForValue(op->operand_source(0));
int64_t bins = op->attribute<pir::Int64Attribute>("bins").data();
int min = op->attribute<pir::Int32Attribute>("min").data();
int max = op->attribute<pir::Int32Attribute>("max").data();
PADDLE_ENFORCE_GE(bins,
1,
common::errors::InvalidArgument(
"The bins should be greater than or equal to 1."
"But received nbins is %d",
bins));
PADDLE_ENFORCE_GE(
max,
min,
common::errors::InvalidArgument("max must be larger or equal to min."
"But received max is %d, min is %d",
max,
min));
if (op->operand_source(1)) {
const symbol::ShapeOrDataDimExprs &weight_shape_or_data =
infer_context->GetShapeOrDataForValue(op->operand_source(1));
size_t ndims_input = input_shape_or_data.shape().size();
for (size_t i = 0; i < ndims_input; ++i) {
infer_context->AddEqualCstr(weight_shape_or_data.shape()[i],
input_shape_or_data.shape()[i]);
}
}
std::vector<symbol::DimExpr> dim_out = {bins};
symbol::ShapeOrDataDimExprs shape_data{
symbol::TensorShapeOrDataDimExprs(dim_out)};
infer_context->SetShapeOrDataForValue(op->result(0), shape_data);
return true;
}

bool IndexSampleOpInferSymbolicShape(
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 @@ -51,7 +51,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Gather)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(GatherNd)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(GatherTree)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(HuberLoss)
// OP_DECLARE_INFER_SYMBOLIC_SHAPE(Histogram)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Histogram)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(Isclose)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexAdd)
OP_DECLARE_INFER_SYMBOLIC_SHAPE(IndexAdd_)
Expand Down
1 change: 1 addition & 0 deletions paddle/phi/ops/yaml/ops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2420,6 +2420,7 @@
optional : weight
kernel :
func : histogram
interfaces : paddle::dialect::InferSymbolicShapeInterface

- op : hsigmoid_loss
args : (Tensor x, Tensor label, Tensor w, Tensor bias, Tensor path, Tensor code, int num_classes, bool is_sparse)
Expand Down