【Infer Symbolic Shape BUAA No.52-54】Add hardtanh, hsigmoid_loss and huber_loss (#66896)

Fripping · web-flow · commit 71caf082d466 · 2024-08-09T16:22:00.000+08:00
* update cinn api

* update cinn api

* update cinn api

* Delete paddle/phi/ops/yaml/.ipynb_checkpoints directory

* Delete paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/.ipynb_checkpoints directory

* Update multiary_infer_sym.cc

* Update multiary_infer_sym.h

* update

* update

* Delete paddle/cinn/hlir/framework/.ipynb_checkpoints directory

* Delete paddle/cinn/hlir/op/contrib/.ipynb_checkpoints directory

* Delete paddle/cinn/hlir/dialect/operator/transforms/group_merge/.ipynb_checkpoints directory

* Delete paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/.ipynb_checkpoints directory

* Update ops.yaml

* Update same_operands_result.cc

* Update same_operands_result.h

* Update ops.yaml

* update cinn api

* update cinn api

* Delete paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/.ipynb_checkpoints directory
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc
@@ -568,6 +568,39 @@ bool GatherNdOpInferSymbolicShape(
   return true;
 }
 
+bool HuberLossOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const auto &input =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  const auto &label =
+      infer_context->GetShapeOrDataForValue(op->operand_source(1));
+  const std::vector<symbol::DimExpr> &input_dims = input.shape();
+  const std::vector<symbol::DimExpr> &label_dims = label.shape();
+  PADDLE_ENFORCE_EQ(input_dims.size(),
+                    label_dims.size(),
+                    phi::errors::InvalidArgument(
+                        "Input(input) rank and Input(label) rank should be "
+                        "same, but received input rank(%d) != label rank(%d)",
+                        input_dims.size(),
+                        label_dims.size()));
+
+  int rank = input_dims.size();
+  for (int i = 0; i < rank; ++i) {
+    infer_context->AddEqualCstr(input_dims[i], label_dims[i]);
+  }
+
+  infer_context->SetShapeOrDataForValue(
+      op->result(1),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(label_dims)});
+  infer_context->SetShapeOrDataForValue(
+      op->result(0),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(label_dims)});
+
+  return true;
+}
+
 // bool HistogramOpInferSymbolicShape(pir::Operation *op,
 //                                    pir::InferSymbolicShapeContext
 //                                    *infer_context) {
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.h
@@ -43,6 +43,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(FillDiagonalTensor_)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Gammaincc)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Gather)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(GatherNd)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(HuberLoss)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Histogram)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(Heaviside)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Isclose)
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.cc
@@ -1478,6 +1478,35 @@ bool TrilinearInterpOpInferSymbolicShape(
   return BicubicInterpOpInferSymbolicShape(op, infer_context);
 }
 
+bool HsigmoidLossOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const auto &input =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  const auto &label =
+      infer_context->GetShapeOrDataForValue(op->operand_source(1));
+  const std::vector<symbol::DimExpr> &input_dims = input.shape();
+  const std::vector<symbol::DimExpr> &label_dims = label.shape();
+
+  infer_context->AddEqualCstr(input_dims[0], label_dims[0]);
+
+  std::vector<symbol::DimExpr> out_shape = {input_dims[0], 1};
+
+  infer_context->SetShapeOrDataForValue(
+      op->result(0),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(out_shape)});
+  infer_context->SetShapeOrDataForValue(
+      op->result(1),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(out_shape)});
+  infer_context->SetShapeOrDataForValue(
+      op->result(2),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(out_shape)});
+
+  return true;
+}
+
 bool WhereOpInferSymbolicShape(pir::Operation *op,
                                pir::InferSymbolicShapeContext *infer_context) {
   infer_context->SetShapeOrDataForValue(
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.h
@@ -83,6 +83,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Stack)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(SyncBatchNorm_)
 // OP_DECLARE_INFER_SYMBOLIC_SHAPE(SaveCombine)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(TrilinearInterp)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(HsigmoidLoss)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Where)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Where_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(FakeChannelWiseDequantizeMaxAbs)
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/same_operands_result.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/same_operands_result.cc
@@ -43,6 +43,8 @@ OP_SAME_OPERANDS_AND_RESULT(Atan)
 OP_SAME_OPERANDS_AND_RESULT(Atan_)
 OP_SAME_OPERANDS_AND_RESULT(Atanh)
 OP_SAME_OPERANDS_AND_RESULT(Atanh_)
+OP_SAME_OPERANDS_AND_RESULT(Hardtanh)
+OP_SAME_OPERANDS_AND_RESULT(Hardtanh_)
 OP_SAME_OPERANDS_AND_RESULT(Bernoulli)
 OP_SAME_OPERANDS_AND_RESULT(BitwiseNot)
 OP_SAME_OPERANDS_AND_RESULT(BitwiseNot_)
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/same_operands_result.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/same_operands_result.h
@@ -35,6 +35,8 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Atan)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Atan_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Atanh)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Atanh_)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(Hardtanh)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(Hardtanh_)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Bernoulli)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(BitwiseNot)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(BitwiseNot_)
diff --git a/paddle/phi/ops/yaml/ops.yaml b/paddle/phi/ops/yaml/ops.yaml
@@ -2344,6 +2344,7 @@
     func : hardtanh
   inplace: (x -> out)
   backward : hardtanh_grad
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : heaviside
   args : (Tensor x, Tensor y)
@@ -2383,6 +2384,7 @@
     func : hsigmoid_loss
     data_type : x
   backward : hsigmoid_loss_grad
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : huber_loss
   args : (Tensor input, Tensor label, float delta)
@@ -2393,6 +2395,7 @@
     func : huber_loss
   intermediate : residual
   backward : huber_loss_grad
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : i0
   args : (Tensor x)
