[BUAA][Error Message No.71/73/74/266/285]优化了5个文件的报错信息 (#67073)

Wizard-ZP · web-flow · commit 68086fb493d3 · 2024-08-09T14:15:01.000+08:00
* 优化了五个文件的报错信息

* 加入了头文件

* retry

* 加入头文件
diff --git a/paddle/cinn/common/type.cc b/paddle/cinn/common/type.cc
@@ -141,18 +141,26 @@ void Type::CheckTypeValid() const {
       GetStorage().type_,
       type_t::Unk,
       ::common::errors::InvalidArgument("The type is not initialized."));
+
   if (GetStorage().type_ == type_t::Float && GetStorage().bits_ == 16) {
-    CHECK(GetStorage().specific_type_ == specific_type_t::FP16 ||
-          GetStorage().specific_type_ == specific_type_t::BF16)
-        << "When creating a 16 bits Float, the specific_type_t must be FP16 or "
-           "BF16.";
+    PADDLE_ENFORCE_EQ((GetStorage().specific_type_ == specific_type_t::FP16 ||
+                       GetStorage().specific_type_ == specific_type_t::BF16),
+                      true,
+                      phi::errors::InvalidArgument(
+                          "When creating a 16-bit Float, the 'specific_type_t' "
+                          "must be FP16 or BF16. "
+                          "Received: specific_type_t = %d.",
+                          static_cast<int>(GetStorage().specific_type_)));
   }
 }
 
 Type Type::PointerOf() const {
   CheckTypeValid();
   auto x = *this;
-  CHECK(!x.is_cpp_handle2()) << "Not support three level of PointerOf";
+  PADDLE_ENFORCE_EQ(
+      x.is_cpp_handle2(),
+      false,
+      phi::errors::InvalidArgument("Not support three levels of PointerOf."));
   if (x.is_cpp_handle())
     x.set_cpp_handle2();
   else
@@ -183,7 +191,11 @@ Type Type::IgnoreConst() const {
 }
 
 Type Type::with_bits(int x) const {
-  CHECK(is_primitive());
+  PADDLE_ENFORCE_EQ(
+      is_primitive(),
+      true,
+      phi::errors::InvalidArgument(
+          "The type must be primitive to set the number of bits."));
   Type type = *this;
   type.GetStorage().bits_ = x;
   return type;
@@ -196,7 +208,10 @@ Type Type::with_type(Type::type_t x) const {
 }
 
 Type Type::with_lanes(int x) const {
-  CHECK(valid());
+  PADDLE_ENFORCE_EQ(valid(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "The type must be valid to set the number of lanes."));
   Type type = *this;
   type.GetStorage().lanes_ = x;
   return type;
@@ -244,9 +259,13 @@ bool Type::valid() const {
 Type::Type(Type::type_t t, int b, int w, specific_type_t st)
     : storage_(new Storage(t, b, w, st)) {
   if (t == Type::type_t::Float && b == 16) {
-    CHECK(st == specific_type_t::FP16 || st == specific_type_t::BF16)
-        << "When creating a 16 bits Float, the specific_type_t must be FP16 or "
-           "BF16.";
+    PADDLE_ENFORCE_EQ(
+        (st == specific_type_t::FP16 || st == specific_type_t::BF16),
+        true,
+        phi::errors::InvalidArgument("When creating a 16-bit Float, the "
+                                     "'specific_type_t' must be FP16 or BF16. "
+                                     "Received: specific_type_t = %d.",
+                                     static_cast<int>(st)));
   }
 }
 bool Type::is_primitive() const {
@@ -264,9 +283,13 @@ bool Type::is_scalar() const { return lanes() == 1; }
 // distinguish FP16/BF16, or use is_float16()/is_bfloat16() for short
 bool Type::is_float(int bits, specific_type_t st) const {
   if (type() == type_t::Float && bits == 16) {
-    CHECK(st != specific_type_t::None)
-        << "when calling is_float(16), 'st' can't be specific_type_t::None to "
-           "distinguish FP16/BF16, or use is_float16()/is_bfloat16() for short";
+    PADDLE_ENFORCE_NE(
+        st,
+        specific_type_t::None,
+        phi::errors::InvalidArgument(
+            "When calling is_float(16), 'st' can't be specific_type_t::None to "
+            "distinguish FP16/BF16. Use is_float16() or is_bfloat16() for "
+            "short."));
     return st == this->specific_type();
   } else {
     return type() == type_t::Float && (bits < 0 || bits == this->bits());
@@ -333,11 +356,16 @@ Type &Type::operator=(const Type &other) {
 }
 
 Type::Storage &Type::GetStorage() {
-  CHECK(storage_) << "The type not initialized! Please check.";
+  PADDLE_ENFORCE_NOT_NULL(storage_,
+                          phi::errors::InvalidArgument(
+                              "The type is not initialized! Please check."));
   return *storage_;
 }
+
 const Type::Storage &Type::GetStorage() const {
-  CHECK(storage_) << "The type not initialized! Please check.";
+  PADDLE_ENFORCE_NOT_NULL(storage_,
+                          phi::errors::InvalidArgument(
+                              "The type is not initialized! Please check."));
   return *storage_;
 }
 
@@ -560,9 +588,11 @@ Type Str2Type(const std::string &type) {
       {"cinn_pod_value*", type_of<cinn_pod_value_t *>()},
       {"cinn_pod_value_p", type_of<cinn_pod_value_t *>()},
   };
-
-  CHECK(str2type_map.find(type) != str2type_map.end())
-      << "Not support type [" << type << "] ! Please Check.\n";
+  PADDLE_ENFORCE_NE(
+      str2type_map.find(type),
+      str2type_map.end(),
+      phi::errors::InvalidArgument("Not supported type [%s]! Please check.",
+                                   type.c_str()));
   return str2type_map.at(type);
 }
 
diff --git a/paddle/cinn/hlir/pe/load_x86_params.cc b/paddle/cinn/hlir/pe/load_x86_params.cc
@@ -16,6 +16,8 @@
 
 #include <glog/logging.h>
 
+#include "paddle/common/enforce.h"
+
 namespace cinn {
 namespace hlir {
 namespace pe {
@@ -26,15 +28,19 @@ void InputX86Param(
         *model_data,
     const std::string &key,
     const absl::flat_hash_map<std::string, std::vector<int>> &schedule_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   (*model_data)[key] = schedule_data;
 }
 
 void LoadX86DefaultParams(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   // resnet 1
   InputX86Param(model_data,
                 "X86ScheduleConv input 1 3 224 224 weight 64 3 7 7 stride 2 2 "
@@ -304,7 +310,9 @@ void LoadResNet18Params(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "resnet18 index 0 X86ScheduleConv input 1 3 224 224 weight 64 "
                 "3 7 7 stride 2 2 padding 3 3 dilation 1 1",
@@ -458,7 +466,9 @@ void LoadResNet50Params(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "resnet50 index 0 X86ScheduleConv input 1 3 224 224 weight 64 "
                 "3 7 7 stride 2 2 padding 3 3 dilation 1 1",
@@ -836,7 +846,9 @@ void LoadMobileNetV1Params(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "mobilenetv1 index 0 X86ScheduleConv input 1 3 224 224 weight "
                 "32 3 3 3 stride 2 2 padding 1 1 dilation 1 1",
@@ -1032,7 +1044,9 @@ void LoadMobileNetV2Params(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "mobilenetv2 index 0 X86ScheduleConv input 1 3 224 224 weight "
                 "32 3 3 3 stride 2 2 padding 1 1 dilation 1 1",
@@ -1416,7 +1430,9 @@ void LoadSqueezeNetParams(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "squeezenet index 0 X86ScheduleConv input 1 3 227 227 weight "
                 "64 3 3 3 stride 2 2 padding 0 0 dilation 1 1",
@@ -1605,7 +1621,9 @@ void LoadFaceDetParams(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "facedet index 0 X86ScheduleConv input 1 3 240 320 weight 16 3 "
                 "3 3 stride 2 2 padding 1 1 dilation 1 1",
@@ -1976,7 +1994,9 @@ void LoadEfficientNetParams(
     absl::flat_hash_map<std::string,
                         absl::flat_hash_map<std::string, std::vector<int>>>
         *model_data) {
-  CHECK(model_data);
+  PADDLE_ENFORCE_NOT_NULL(
+      model_data,
+      phi::errors::PreconditionNotMet("model_data should not be null."));
   InputX86Param(model_data,
                 "efficientnet index 0 X86ScheduleConv input 1 3 224 224 weight "
                 "32 3 3 3 stride 2 2 padding 2 2 dilation 1 1",
diff --git a/paddle/cinn/ir/ir.h b/paddle/cinn/ir/ir.h
@@ -247,8 +247,14 @@ struct GE : public BinaryOpNode<GE> {
  */
 struct And : public BinaryOpNode<And> {
   And(Expr a, Expr b) : BinaryOpNode<And>(a.type(), a, b) {
-    CHECK(a->type().is_bool());
-    CHECK(b->type().is_bool());
+    PADDLE_ENFORCE_EQ(
+        a->type().is_bool(),
+        true,
+        phi::errors::PreconditionNotMet("The type of 'a' must be bool."));
+    PADDLE_ENFORCE_EQ(
+        b->type().is_bool(),
+        true,
+        phi::errors::PreconditionNotMet("The type of 'b' must be bool."));
   }
 
   Type type() const { return Bool(a()->type().lanes()); }
@@ -274,8 +280,14 @@ struct Minus : public UnaryOpNode<Minus> {
  */
 struct Or : public BinaryOpNode<Or> {
   Or(Expr a, Expr b) : BinaryOpNode<Or>(Bool(), a, b) {
-    CHECK(a->type().is_bool());
-    CHECK(b->type().is_bool());
+    PADDLE_ENFORCE_EQ(
+        a->type().is_bool(),
+        true,
+        phi::errors::PreconditionNotMet("The type of 'a' must be bool."));
+    PADDLE_ENFORCE_EQ(
+        b->type().is_bool(),
+        true,
+        phi::errors::PreconditionNotMet("The type of 'b' must be bool."));
   }
 
   static Expr Make(Expr a, Expr b);
@@ -510,7 +522,10 @@ struct Select : public ExprNode<Select> {
         false_value.type(),
         ::common::errors::InvalidArgument(
             "The type of true_value and false_value should be the same."));
-    CHECK(condition.type().is_bool());
+    PADDLE_ENFORCE_EQ(condition.type().is_bool(),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "The condition must be of boolean type."));
     type_ = true_value.type();
   }
 
@@ -650,8 +665,14 @@ struct IfThenElse : public ExprNode<IfThenElse> {
   static Expr Make(Expr condition, Expr true_case, Expr false_case = Expr());
 
   void Verify() const override {
-    CHECK(condition.defined());
-    CHECK(true_case.defined());
+    PADDLE_ENFORCE_EQ(
+        condition.defined(),
+        true,
+        phi::errors::PreconditionNotMet("The condition must be defined."));
+    PADDLE_ENFORCE_EQ(
+        true_case.defined(),
+        true,
+        phi::errors::PreconditionNotMet("The true_case must be defined."));
     PADDLE_ENFORCE_EQ(
         condition.type(),
         type_of<bool>(),
@@ -712,7 +733,10 @@ struct BindInfo {
   }
 
   friend std::ostream& operator<<(std::ostream& os, const BindInfo& bind_info) {
-    CHECK(bind_info.valid()) << "Make invalid BindInfo to stream";
+    PADDLE_ENFORCE_EQ(
+        bind_info.valid(),
+        true,
+        phi::errors::PreconditionNotMet("Make invalid BindInfo to stream"));
     char axis_name = 'x' + bind_info.offset;
     std::string prefix =
         bind_info.for_type == ForType::GPUBlock ? "blockIdx." : "threadIdx.";
@@ -931,7 +955,10 @@ struct FracOp : public BinaryOpNode<FracOp> {
   bool is_constant() const { return a().is_constant() && b().is_constant(); }
 
   double get_constant() const {
-    CHECK(is_constant());
+    PADDLE_ENFORCE_EQ(
+        is_constant(),
+        true,
+        phi::errors::PreconditionNotMet("The expression must be constant."));
     PADDLE_ENFORCE_NE(b().get_constant(),
                       0.f,
                       ::common::errors::InvalidArgument(
diff --git a/paddle/fluid/operators/collective/partial_allgather_op.cc b/paddle/fluid/operators/collective/partial_allgather_op.cc
@@ -23,8 +23,15 @@ class PartialAllGatherOp : public framework::OperatorWithKernel {
  public:
   using framework::OperatorWithKernel::OperatorWithKernel;
   void InferShape(framework::InferShapeContext *ctx) const override {
-    OP_INOUT_CHECK(ctx->HasInput("X"), "Input", "X", "PartialAllGather");
-    OP_INOUT_CHECK(ctx->HasOutput("Out"), "Input", "Out", "PartialAllGather");
+    PADDLE_ENFORCE_EQ(ctx->HasInput("X"),
+                      true,
+                      phi::errors::PreconditionNotMet(
+                          "Input 'X' of PartialAllGather must be provided."));
+    PADDLE_ENFORCE_EQ(
+        ctx->HasOutput("Out"),
+        true,
+        phi::errors::PreconditionNotMet(
+            "Output 'Out' of PartialAllGather must be provided."));
     int nranks = ctx->Attrs().Get<int>("nranks");
     int rank = ctx->Attrs().Get<int>("rank");
 
diff --git a/test/cpp/inference/api/analyzer_capi_int_tester.cc b/test/cpp/inference/api/analyzer_capi_int_tester.cc
@@ -35,10 +35,11 @@ void zero_copy_run() {
   PD_SwitchIrDebug(config, true);
   PD_SetModel(config, model_dir.c_str(), nullptr);
   bool use_feed_fetch = PD_UseFeedFetchOpsEnabled(config);
-  CHECK(!use_feed_fetch) << "NO";
+  PADDLE_ENFORCE_EQ(
+      use_feed_fetch, false, phi::errors::PreconditionNotMet("NO"));
   bool specify_input_names = PD_SpecifyInputName(config);
-  CHECK(specify_input_names) << "NO";
-
+  PADDLE_ENFORCE_EQ(
+      specify_input_names, true, phi::errors::PreconditionNotMet("NO"));
   const int batch_size = 1;
   const int channels = 3;
   const int height = 224;
