[BUAA][Error Message]优化了5个文件的报错信息 (#67148)

Wizard-ZP · web-flow · commit e941ba625f36 · 2024-08-12T14:59:29.000+08:00
* 优化了5个文件的报错信息

* 加入了头文件

* debug

* debug

* codestyle

* 去除了一个文件，加入了一个文件

* 加入了一个文件 删去了一个文件

* codestyle

* code style
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/convert_dynamic_to_static_dim_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/convert_dynamic_to_static_dim_pass.cc
@@ -115,11 +115,18 @@ class DynamicToStaticConverter {
  private:
   DimExpr4SymbolName InitDimExpr4SymbolName() {
     const auto* map = GetGlobalDynamicToStaticDimMap();
-    CHECK(map->has_value());
+    PADDLE_ENFORCE_EQ(
+        map->has_value(),
+        true,
+        phi::errors::InvalidArgument("The map must have a value."));
     return
         [map](
             const std::string& symbol_name) -> std::optional<symbol::DimExpr> {
-          CHECK(map->value().find(symbol_name) != map->value().end());
+          PADDLE_ENFORCE_NE(map->value().find(symbol_name),
+                            map->value().end(),
+                            phi::errors::InvalidArgument(
+                                "The symbol '%s' must be present in the map.",
+                                symbol_name.c_str()));
           return map->value().at(symbol_name);
         };
   }
@@ -157,7 +164,10 @@ class DynamicToStaticConverter {
     VisitEachDimExpr(dynamic_shapes, [&](const symbol::DimExpr& dim_expr) {
       const auto& static_shape = symbol::SimplifyDimExpr(
           cinn::dialect::SubstituteDimExpr(dim_expr, DimExpr4SymbolName_));
-      CHECK(static_shape.Has<std::int64_t>());
+      PADDLE_ENFORCE_EQ(static_shape.Has<std::int64_t>(),
+                        true,
+                        phi::errors::InvalidArgument(
+                            "The static_shape must have an int64_t type."));
       static_shapes.push_back(static_shape.Get<std::int64_t>());
     });
     return static_shapes;
@@ -186,7 +196,18 @@ class DynamicToStaticConverter {
                               target_shape.at(i)));
         update = true;
       } else {
-        CHECK(origin_shape.at(i) == target_shape.at(i));
+        PADDLE_ENFORCE_EQ(
+            origin_shape.at(i),
+            target_shape.at(i),
+            phi::errors::InvalidArgument(
+                "The shape at index %d must be equal in both origin_shape and "
+                "target_shape, but got origin_shape[%d] = %d and "
+                "target_shape[%d] = %d.",
+                i,
+                i,
+                origin_shape.at(i),
+                i,
+                target_shape.at(i)));
       }
     }
     if (update) {
diff --git a/paddle/cinn/hlir/framework/pir/op_mapper.h b/paddle/cinn/hlir/framework/pir/op_mapper.h
@@ -55,8 +55,11 @@ class OpMapper {
 
   std::vector<::pir::Value> RealOperandSources(
       const ::pir::Operation& op) const {
-    CHECK(has(op, MapperType::OPERAND))
-        << "Not register OperandIndexsFunction for " << op.name();
+    PADDLE_ENFORCE_EQ(
+        has(op, MapperType::OPERAND),
+        true,
+        phi::errors::PreconditionNotMet(
+            "Not register OperandIndexsFunction for %s", op.name().c_str()));
     std::vector<::pir::Value> inputs;
     for (auto idx : operand_funcs_.at(op.name())()) {
       inputs.push_back(op.operand_source(idx));
@@ -66,8 +69,11 @@ class OpMapper {
 
   void AppendVariantAttrs(const ::pir::Operation& op,
                           utils::AttributeMap& attrs) const {  // NOLINT
-    CHECK(has(op, MapperType::ATTRIBUTE))
-        << "Not register AppendAttrFunction for " << op.name();
+    PADDLE_ENFORCE_EQ(
+        has(op, MapperType::ATTRIBUTE),
+        true,
+        phi::errors::PreconditionNotMet(
+            "Not register AppendAttrFunction for %s", op.name().c_str()));
     attr_funcs_.at(op.name())(op, attrs);
   }
 
diff --git a/paddle/fluid/operators/collective/c_allgather_op.cc b/paddle/fluid/operators/collective/c_allgather_op.cc
@@ -23,8 +23,14 @@ class CAllGatherOp : public framework::OperatorWithKernel {
  public:
   using framework::OperatorWithKernel::OperatorWithKernel;
   void InferShape(framework::InferShapeContext *ctx) const override {
-    OP_INOUT_CHECK(ctx->HasInput("X"), "Input", "X", "AllGather");
-    OP_INOUT_CHECK(ctx->HasOutput("Out"), "Input", "Out", "AllGather");
+    PADDLE_ENFORCE_EQ(ctx->HasInput("X"),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "Input 'X' of AllGather must be provided."));
+    PADDLE_ENFORCE_EQ(ctx->HasOutput("Out"),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "Output 'Out' of AllGather must be provided."));
     int nranks = ctx->Attrs().Get<int>("nranks");
     PADDLE_ENFORCE_GE(
         nranks,
diff --git a/paddle/fluid/operators/collective/c_concat_op.cc b/paddle/fluid/operators/collective/c_concat_op.cc
@@ -22,8 +22,14 @@ class CConcatOp : public framework::OperatorWithKernel {
   using framework::OperatorWithKernel::OperatorWithKernel;
 
   void InferShape(framework::InferShapeContext* ctx) const override {
-    OP_INOUT_CHECK(ctx->HasInput("X"), "Input", "X", "c_concat");
-    OP_INOUT_CHECK(ctx->HasOutput("Out"), "Output", "Out", "c_concat");
+    PADDLE_ENFORCE_EQ(ctx->HasInput("X"),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "Input 'X' of c_concat must be provided."));
+    PADDLE_ENFORCE_EQ(ctx->HasOutput("Out"),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "Output 'Out' of c_concat must be provided."));
     int nranks = ctx->Attrs().Get<int>("nranks");
     int rank = ctx->Attrs().Get<int>("rank");
     int ring_id = ctx->Attrs().Get<int>("ring_id");
diff --git a/test/cpp/inference/api/analyzer_rnn1_tester.cc b/test/cpp/inference/api/analyzer_rnn1_tester.cc
@@ -14,6 +14,8 @@
 
 #include "test/cpp/inference/api/tester_helper.h"
 
+#include "paddle/common/enforce.h"
+
 PD_DEFINE_bool(with_precision_check, true, "turn on test");
 
 namespace paddle {
@@ -52,9 +54,20 @@ struct DataRecord {
       data.lod1.push_back(0);
       data.lod2.push_back(0);
       data.lod3.push_back(0);
-      CHECK(!data.link_step_data_all.empty()) << "empty";
-      CHECK(!data.week_data_all.empty());
-      CHECK(!data.minute_data_all.empty());
+      PADDLE_ENFORCE_EQ(!data.link_step_data_all.empty(),
+                        true,
+                        phi::errors::InvalidArgument(
+                            "link_step_data_all should not be empty."));
+
+      PADDLE_ENFORCE_EQ(
+          !data.week_data_all.empty(),
+          true,
+          phi::errors::InvalidArgument("week_data_all should not be empty."));
+
+      PADDLE_ENFORCE_EQ(
+          !data.minute_data_all.empty(),
+          true,
+          phi::errors::InvalidArgument("minute_data_all should not be empty."));
       PADDLE_ENFORCE_EQ(
           data.link_step_data_all.size(),
           data.week_data_all.size(),
