Fix

PaddlePaddle · Apr 6, 2024 · 5c47556 · 5c47556
1 parent 91e4455
commit 5c47556
Show file tree

Hide file tree

Showing 20 changed files with 839 additions and 441 deletions.
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
@@ -880,10 +880,13 @@ bool Transpose_OpInferSymbolicShape(
 
 bool SqueezeOpInferSymbolicShape(
     pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) {
-  IR_ENFORCE(op->num_operands() == 2,
-             "SqueezeOpInferSymbolicShape ONLY support num_operands() == 2 "
-             "now, but got %d operands",
-             op->num_operands());
+  PADDLE_ENFORCE_EQ(
+      op->num_operands(),
+      2,
+      phi::errors::InvalidArgument(
+          "SqueezeOpInferSymbolicShape ONLY support num_operands() == 2 "
+          "now, but got %d operands",
+          op->num_operands()));
 
   auto x_shape_or_data =
       shape_analysis->GetShapeOrDataForValue(op->operand_source(0));
@@ -993,10 +996,13 @@ bool UniqueConsecutiveOpInferSymbolicShape(
 
 bool UnsqueezeOpInferSymbolicShape(
     pir::Operation *op, pir::ShapeConstraintIRAnalysis *shape_analysis) {
-  IR_ENFORCE(op->num_operands() == 2,
-             "UnsqueezeOp InferSymbolicShape ONLY support num_operands() == 2 "
-             "now, but got %d operands",
-             op->num_operands());
+  PADDLE_ENFORCE_EQ(
+      op->num_operands(),
+      2,
+      phi::errors::InvalidArgument(
+          "UnsqueezeOp InferSymbolicShape ONLY support num_operands() == 2 "
+          "now, but got %d operands",
+          op->num_operands()));
 
   auto x_shape_or_data =
       shape_analysis->GetShapeOrDataForValue(op->operand_source(0));

diff --git a/paddle/fluid/pir/dialect/operator/ir/api_builder.cc b/paddle/fluid/pir/dialect/operator/ir/api_builder.cc
@@ -22,11 +22,17 @@ namespace dialect {
 ApiBuilder::ApiBuilder()
     : ctx_(pir::IrContext::Instance()),
       builder_(std::make_shared<pir::Builder>(ctx_)) {
-  IR_ENFORCE(builder_ != nullptr, "api builder construct error!");
+  PADDLE_ENFORCE_NE(
+      builder_,
+      nullptr,
+      phi::errors::InvalidArgument("api builder construct error!"));
 }
 
 void ApiBuilder::SetProgram(pir::Program* program) {
-  IR_ENFORCE(program != nullptr, "argument of program is nullptr");
+  PADDLE_ENFORCE_NE(
+      program,
+      nullptr,
+      phi::errors::InvalidArgument("argument of program is nullptr"));
   builder_->SetInsertionPointToBlockEnd(program->block());
 }
 
@@ -50,8 +56,10 @@ void ApiBuilder::SetParameter(const std::string& name,
 }
 
 void ApiBuilder::LoadInsertionPoint() {
-  IR_ENFORCE(!insertion_point_stack_.empty(),
-             "insertion_point_stack_ is empty.");
+  PADDLE_ENFORCE_EQ(
+      !insertion_point_stack_.empty(),
+      true,
+      phi::errors::InvalidArgument("insertion_point_stack_ is empty."));
   builder_->set_insertion_point(insertion_point_stack_.top());
   insertion_point_stack_.pop();
 }