【Error Message No. 293 No.149】Update error massage of paddle\cinn\hlir\op\op_util.cc && paddle\cinn\adt\m_ir.cc (#67575)

MikhayEeer · web-flow · commit 48d37dbfd7c1 · 2024-08-21T15:58:00.000+08:00
* 表1No88，表2No149,op_util.cc优化

* 表2No293 m_ir.cc优化

* update vec_ast empty error more detailed

* update m_ir.cc
diff --git a/paddle/cinn/adt/m_ir.cc b/paddle/cinn/adt/m_ir.cc
@@ -175,8 +175,11 @@ std::unordered_map<Index, LoopIterators> GenerateAnchorIndex2LoopIterators(
     const auto& anchor_tensor = GetAnchorTensor(anchor_group);
     const auto& anchor_loop_iters = GetAnchorTensorLoopIterators(
         anchor_tensor, loop_iters, TensorIndexExpr4Tensor);
-    CHECK(anchor_index2loop_iters.emplace(anchor_index, anchor_loop_iters)
-              .second);
+    PADDLE_ENFORCE_EQ(
+        anchor_index2loop_iters.emplace(anchor_index, anchor_loop_iters).second,
+        true,
+        phi::errors::AlreadyExists("The anchor index has already "
+                                   "been associated with loop iters."));
   }
   return anchor_index2loop_iters;
 }
diff --git a/paddle/cinn/hlir/op/op_util.cc b/paddle/cinn/hlir/op/op_util.cc
@@ -29,8 +29,11 @@ CINNSchedule GetElementwiseScheduleFunc(
     const Target& target,
     bool vectorizable) {
   return CINNSchedule([=](lang::Args args, lang::RetValue* ret) {
-    CHECK(!args.empty()) << "The input argument of ElementwiseSchedule is "
-                            "empty! Please check.\n";
+    PADDLE_ENFORCE_NE(args.empty(),
+                      true,
+                      phi::errors::InvalidArgument(
+                          "The input argument of ElementwiseSchedule is "
+                          "invalid! Please check.\n"));
     cinn::common::CINNValuePack arg_pack = args[0];
     PADDLE_ENFORCE_GT(arg_pack.size(),
                       0U,
@@ -45,7 +48,12 @@ CINNSchedule GetElementwiseScheduleFunc(
         vec_ast.emplace_back(temp);
       }
     }
-    CHECK(!vec_ast.empty());
+    PADDLE_ENFORCE_NE(vec_ast.empty(),
+                      true,
+                      phi::errors::InvalidArgument(
+                          "The vector of AbstractSyntaxTree is empty!"
+                          "Please ensure that the argument pack "
+                          "contains at least one valid expression."));
     ir::ModuleExpr mod_expr(vec_ast);
     ir::IRSchedule ir_sch(mod_expr);
     ir_sch.MergeExprs();
@@ -61,8 +69,11 @@ CINNSchedule GetInjectiveScheduleFunc(
     const Target& target,
     bool vectorizable) {
   return CINNSchedule([=](lang::Args args, lang::RetValue* ret) {
-    CHECK(!args.empty()) << "The input argument of InjectiveSchedule is "
-                            "empty! Please check.\n";
+    PADDLE_ENFORCE_NE(args.empty(),
+                      true,
+                      phi::errors::InvalidArgument(
+                          "The input argument of InjectiveSchedule is "
+                          "invalid! Please check.\n"));
     cinn::common::CINNValuePack arg_pack = args[0];
     std::vector<Expr> vec_ast;
     for (int i = 0; i < arg_pack.size(); i++) {
@@ -71,7 +82,12 @@ CINNSchedule GetInjectiveScheduleFunc(
         vec_ast.emplace_back(temp);
       }
     }
-    CHECK(!vec_ast.empty());
+    PADDLE_ENFORCE_NE(vec_ast.empty(),
+                      true,
+                      phi::errors::InvalidArgument(
+                          "The vector of AbstractSyntaxTree is empty!"
+                          "Please ensure that the argument pack "
+                          "contains at least one valid expression."));
     ir::ModuleExpr mod_expr(vec_ast);
     ir::IRSchedule ir_sch(mod_expr);
     ir_sch.MergeExprs();

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,11 @@ std::unordered_map<Index, LoopIterators> GenerateAnchorIndex2LoopIterators(`
`175`	`175`	`const auto& anchor_tensor = GetAnchorTensor(anchor_group);`
`176`	`176`	`const auto& anchor_loop_iters = GetAnchorTensorLoopIterators(`
`177`	`177`	`anchor_tensor, loop_iters, TensorIndexExpr4Tensor);`
`178`		`- CHECK(anchor_index2loop_iters.emplace(anchor_index, anchor_loop_iters)`
`179`		`- .second);`
	`178`	`+ PADDLE_ENFORCE_EQ(`
	`179`	`+ anchor_index2loop_iters.emplace(anchor_index, anchor_loop_iters).second,`
	`180`	`+ true,`
	`181`	`+ phi::errors::AlreadyExists("The anchor index has already "`
	`182`	`+ "been associated with loop iters."));`
`180`	`183`	`}`
`181`	`184`	`return anchor_index2loop_iters;`
`182`	`185`	`}`