[CINN] Add InferSymbolicShapeInterface for (is_empty , det) op (#68547)

ooooo-create · web-flow · commit 21125debe55f · 2024-10-28T10:23:19.000+08:00
* add infer symbolic shape for op (is_empty, det)

* update

* fix infer_and_compare_symbol func

* refine logic
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.cc
@@ -858,6 +858,29 @@ bool DecodeJpegOpInferSymbolicShape(
   return true;
 }
 
+bool DetOpInferSymbolicShape(pir::Operation *op,
+                             pir::InferSymbolicShapeContext *infer_context) {
+  const auto &x_shape_or_data =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  const auto &x_shape = x_shape_or_data.shape();
+  int x_shape_size = x_shape.size();
+  PADDLE_ENFORCE_GE(
+      x_shape_size,
+      2,
+      common::errors::InvalidArgument("the input matrix dimension size should "
+                                      "greater than or equal to 2."));
+  infer_context->AddEqualCstr(x_shape[x_shape_size - 2],
+                              x_shape[x_shape_size - 1]);
+  std::vector<symbol::DimExpr> out_shape = x_shape;
+  out_shape.pop_back();
+  out_shape.pop_back();
+  infer_context->SetShapeOrDataForValue(
+      op->result(0),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(out_shape)});
+  return true;
+}
+
 bool DiagOpInferSymbolicShape(pir::Operation *op,
                               pir::InferSymbolicShapeContext *infer_context) {
   const auto x_shape_or_data =
@@ -1552,6 +1575,17 @@ bool IdentityLossOpInferSymbolicShape(
 
   return true;
 }
+
+bool IsEmptyOpInferSymbolicShape(
+    pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
+  const std::vector<symbol::DimExpr> out_shape = {};
+  infer_context->SetShapeOrDataForValue(
+      op->result(0),
+      symbol::ShapeOrDataDimExprs{
+          symbol::TensorShapeOrDataDimExprs(out_shape)});
+  return true;
+}
+
 bool GumbelSoftmaxOpInferSymbolicShape(
     pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
   const auto &x_shape_or_data =
@@ -3162,8 +3196,8 @@ bool SlogdetOpInferSymbolicShape(
   PADDLE_ENFORCE_GE(
       x_shape_size,
       2,
-      common::errors::InvalidArgument(
-          "the input matrix dimension size should greater than 2."));
+      common::errors::InvalidArgument("the input matrix dimension size should "
+                                      "greater than or equal to 2."));
   infer_context->AddEqualCstr(x_shape[x_shape_size - 1],
                               x_shape[x_shape_size - 2]);
   std::vector<symbol::DimExpr> out_shape = {2};
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/unary_infer_sym.h
@@ -49,6 +49,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(ChannelShuffle)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(CheckNumerics)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Crop)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(DecodeJpeg)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(Det)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Diag)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(DiagEmbed)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Diagonal)
@@ -79,6 +80,7 @@ OP_DECLARE_INFER_SYMBOLIC_SHAPE(Inverse)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(GumbelSoftmax)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(IdentityLoss)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(IdentityLoss_)
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(IsEmpty)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Kthvalue)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(L1Norm)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(L1Norm_)
diff --git a/paddle/phi/kernels/impl/slogdeterminant_kernel_impl.h b/paddle/phi/kernels/impl/slogdeterminant_kernel_impl.h
@@ -132,8 +132,8 @@ void SlogDeterminantKernel(const Context& dev_ctx,
   PADDLE_ENFORCE_GE(
       input_dim_size,
       2,
-      errors::InvalidArgument(
-          "the input matrix dimension size should greater than 2."));
+      errors::InvalidArgument("the input matrix dimension size should greater "
+                              "than or equal to 2."));
   PADDLE_ENFORCE_EQ(
       input_dim[input_dim_size - 1],
       input_dim[input_dim_size - 2],
diff --git a/paddle/phi/ops/yaml/ops.yaml b/paddle/phi/ops/yaml/ops.yaml
@@ -1394,6 +1394,7 @@
   kernel :
     func : determinant
   backward : det_grad
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : detection_map
   args: (Tensor detect_res, Tensor label, Tensor has_state, Tensor pos_count, Tensor
@@ -2727,6 +2728,7 @@
   kernel :
     func : is_empty
   traits : paddle::dialect::ForwardOnlyTrait
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
 
 - op : isclose
   args : (Tensor x, Tensor y, Scalar(double) rtol=1e-5, Scalar(double) atol=1e-8,  bool equal_nan=false)
