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

Wizard-ZP · web-flow · commit 7f5eb4e1f27e · 2024-08-19T11:33:36.000+08:00
* 优化了5个文件的报错信息

* 加入了1个文件

* 去除了inference下的文件

* 去除了inference下的文件

* codestyle
diff --git a/paddle/cinn/hlir/pe/broadcast.cc b/paddle/cinn/hlir/pe/broadcast.cc
@@ -42,9 +42,15 @@ void GetBroadcastShape(const Tensor& a,
                        std::vector<bool>* broadcast_flag2,
                        int* axis_offset,
                        const Expr& axis) {
-  CHECK(common_shape);
-  CHECK(broadcast_flag1);
-  CHECK(broadcast_flag2);
+  PADDLE_ENFORCE_NOT_NULL(
+      common_shape,
+      phi::errors::PreconditionNotMet("common_shape should not be null."));
+  PADDLE_ENFORCE_NOT_NULL(
+      broadcast_flag1,
+      phi::errors::PreconditionNotMet("broadcast_flag1 should not be null."));
+  PADDLE_ENFORCE_NOT_NULL(
+      broadcast_flag2,
+      phi::errors::PreconditionNotMet("broadcast_flag2 should not be null."));
 
   const auto& shape1 = a->shape;
   const auto& shape2 = b->shape;
@@ -118,12 +124,20 @@ void GetBroadcastShape(const Tensor& a,
       broadcast_flag1->emplace_back(true);
       broadcast_flag2->emplace_back(true);
     } else if (MathEqual(one, shape1_new[size1 - i])) {
-      CHECK(!MathEqual(one, shape2_new[size2 - i]));
+      PADDLE_ENFORCE_EQ(
+          MathEqual(one, shape2_new[size2 - i]),
+          false,
+          phi::errors::PreconditionNotMet(
+              "MathEqual(one, shape2_new[size2 - i]) should be false."));
       common_shape->insert(common_shape->begin(), shape2_new[size2 - i]);
       broadcast_flag1->emplace_back(false);
       broadcast_flag2->emplace_back(true);
     } else if (MathEqual(one, shape2_new[size2 - i])) {
-      CHECK(!MathEqual(one, shape1_new[size1 - i]));
+      PADDLE_ENFORCE_EQ(
+          MathEqual(one, shape1_new[size1 - i]),
+          false,
+          phi::errors::PreconditionNotMet(
+              "MathEqual(one, shape1_new[size1 - i]) should be false."));
       common_shape->insert(common_shape->begin(), shape1_new[size1 - i]);
       broadcast_flag1->emplace_back(true);
       broadcast_flag2->emplace_back(false);
@@ -189,8 +203,12 @@ void GetBroadcastIndice(const std::vector<Expr>& indice,
                         std::vector<Expr>* broadcast_indice2,
                         const std::vector<bool>& broadcast_flags1,
                         const std::vector<bool>& broadcast_flags2) {
-  CHECK(broadcast_indice1);
-  CHECK(broadcast_indice2);
+  PADDLE_ENFORCE_NOT_NULL(
+      broadcast_indice1,
+      phi::errors::PreconditionNotMet("broadcast_indice1 should not be null."));
+  PADDLE_ENFORCE_NOT_NULL(
+      broadcast_indice2,
+      phi::errors::PreconditionNotMet("broadcast_indice2 should not be null."));
   if (broadcast_indice1->empty() && broadcast_indice2->empty()) {
     int flag_size = broadcast_flags1.size();
     int i;
diff --git a/paddle/fluid/distributed/ps/table/graph/graph_node.h b/paddle/fluid/distributed/ps/table/graph/graph_node.h
@@ -141,8 +141,10 @@ class FeatureNode : public Node {
     for (auto &feature_item : feature) {
       const uint64_t *feas = (const uint64_t *)(feature_item.c_str());
       size_t num = feature_item.length() / sizeof(uint64_t);
-      CHECK((feature_item.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << feature_item << "]";
+      PADDLE_ENFORCE_EQ((feature_item.length() % sizeof(uint64_t)),
+                        0,
+                        phi::errors::PreconditionNotMet(
+                            "bad feature_item: [%s]", feature_item.c_str()));
       size_t n = res->size();
       res->resize(n + num);
       for (size_t i = 0; i < num; ++i) {
@@ -168,8 +170,10 @@ class FeatureNode : public Node {
       const uint64_t *feas = (const uint64_t *)(s.c_str());
 
       size_t num = s.length() / sizeof(uint64_t);
-      CHECK((s.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << s << "]";
+      PADDLE_ENFORCE_EQ(
+          (s.length() % sizeof(uint64_t)),
+          0,
+          phi::errors::PreconditionNotMet("bad feature_item: [%s]", s.c_str()));
       res->resize(num);
       for (size_t i = 0; i < num; ++i) {
         (*res)[i] = feas[i];
@@ -192,8 +196,10 @@ class FeatureNode : public Node {
       const std::string &s = this->feature[slot_idx];
       const uint64_t *feas = (const uint64_t *)(s.c_str());
       num = s.length() / sizeof(uint64_t);
-      CHECK((s.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << s << "]";
+      PADDLE_ENFORCE_EQ(
+          (s.length() % sizeof(uint64_t)),
+          0,
+          phi::errors::PreconditionNotMet("bad feature_item: [%s]", s.c_str()));
       for (size_t i = 0; i < num; ++i) {
         feature_id.push_back(feas[i]);
         slot_id.push_back(slot_idx);
@@ -339,8 +345,10 @@ class FloatFeatureNode : public FeatureNode {
       // for (auto &feature_item : feature) {
       const uint64_t *feas = (const uint64_t *)(feature_item.c_str());
       size_t num = feature_item.length() / sizeof(uint64_t);
-      CHECK((feature_item.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << feature_item << "]";
+      PADDLE_ENFORCE_EQ((feature_item.length() % sizeof(uint64_t)),
+                        0,
+                        phi::errors::PreconditionNotMet(
+                            "bad feature_item: [%s]", feature_item.c_str()));
       size_t n = res->size();
       res->resize(n + num);
       for (size_t i = 0; i < num; ++i) {
@@ -366,8 +374,10 @@ class FloatFeatureNode : public FeatureNode {
       const uint64_t *feas = (const uint64_t *)(s.c_str());
 
       size_t num = s.length() / sizeof(uint64_t);
-      CHECK((s.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << s << "]";
+      PADDLE_ENFORCE_EQ(
+          (s.length() % sizeof(uint64_t)),
+          0,
+          phi::errors::PreconditionNotMet("bad feature_item: [%s]", s.c_str()));
       res->resize(num);
       for (size_t i = 0; i < num; ++i) {
         (*res)[i] = feas[i];
@@ -390,8 +400,10 @@ class FloatFeatureNode : public FeatureNode {
       const std::string &s = this->feature[slot_idx];
       const uint64_t *feas = (const uint64_t *)(s.c_str());
       num = s.length() / sizeof(uint64_t);
-      CHECK((s.length() % sizeof(uint64_t)) == 0)
-          << "bad feature_item: [" << s << "]";
+      PADDLE_ENFORCE_EQ(
+          (s.length() % sizeof(uint64_t)),
+          0,
+          phi::errors::PreconditionNotMet("bad feature_item: [%s]", s.c_str()));
       for (size_t i = 0; i < num; ++i) {
         feature_id.push_back(feas[i]);
         slot_id.push_back(slot_idx);
@@ -416,8 +428,10 @@ class FloatFeatureNode : public FeatureNode {
       const std::string &s = this->feature[float_feature_start_idx + slot_idx];
       const float *feas = (const float *)(s.c_str());
       num = s.length() / sizeof(float);
-      CHECK((s.length() % sizeof(float)) == 0)
-          << "bad feature_item: [" << s << "]";
+      PADDLE_ENFORCE_EQ(
+          (s.length() % sizeof(float)),
+          0,
+          phi::errors::PreconditionNotMet("bad feature_item: [%s]", s.c_str()));
       for (size_t i = 0; i < num; ++i) {
         float_feature.push_back(feas[i]);
         slot_id.push_back(slot_idx);
diff --git a/test/cpp/inference/api/analyzer_capi_xpu_tester.cc b/test/cpp/inference/api/analyzer_capi_xpu_tester.cc
@@ -19,6 +19,7 @@ limitations under the License. */
 #include <string>
 #include <vector>
 
+#include "paddle/common/enforce.h"
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
 #include "test/cpp/inference/api/tester_helper.h"
 
@@ -38,21 +39,23 @@ TEST(PD_AnalysisConfig, use_xpu) {
   LOG(INFO) << model_dir_;
   PD_EnableXpu(config, 0xfffc00);
   bool use_xpu = PD_UseXpu(config);
-  CHECK(use_xpu) << "NO";
+  PADDLE_ENFORCE_EQ(use_xpu, true, phi::errors::PreconditionNotMet("NO"));
   int device = PD_XpuDeviceId(config);
-  CHECK(0 == device) << "NO";
+  PADDLE_ENFORCE_EQ(device, 0, phi::errors::PreconditionNotMet("NO"));
   PD_SwitchIrOptim(config, true);
   bool ir_optim = PD_IrOptim(config);
-  CHECK(ir_optim) << "NO";
+  PADDLE_ENFORCE_EQ(ir_optim, true, phi::errors::PreconditionNotMet("NO"));
   PD_EnableMemoryOptim(config);
   bool memory_optim_enable = PD_MemoryOptimEnabled(config);
-  CHECK(memory_optim_enable) << "NO";
+  PADDLE_ENFORCE_EQ(
+      memory_optim_enable, true, phi::errors::PreconditionNotMet("NO"));
   PD_EnableProfile(config);
   bool profiler_enable = PD_ProfileEnabled(config);
-  CHECK(profiler_enable) << "NO";
+  PADDLE_ENFORCE_EQ(
+      profiler_enable, true, phi::errors::PreconditionNotMet("NO"));
   PD_SetInValid(config);
   bool is_valid = PD_IsValid(config);
-  CHECK(!is_valid) << "NO";
+  PADDLE_ENFORCE_EQ(is_valid, false, phi::errors::PreconditionNotMet("NO"));
   PD_DeleteAnalysisConfig(config);
 }
 #endif
diff --git a/test/cpp/inference/api/paddle_infer_api_errors_tester.cc b/test/cpp/inference/api/paddle_infer_api_errors_tester.cc
@@ -40,9 +40,18 @@ struct FakeException {
 TEST(Status, pd_exception) {
   FakeException e;
   Status status = get_status([&]() { e.pd_exception(1); });
-  CHECK(!status.ok());
-  CHECK(status == status);
-  CHECK(!(status != status));
+  PADDLE_ENFORCE_EQ(
+      status.ok(),
+      false,
+      phi::errors::PreconditionNotMet("Status should not be OK."));
+  PADDLE_ENFORCE_EQ(
+      status == status,
+      true,
+      phi::errors::PreconditionNotMet("Status should be equal to itself."));
+  PADDLE_ENFORCE_EQ(status != status,
+                    false,
+                    phi::errors::PreconditionNotMet(
+                        "Status should not be different from itself."));
   PADDLE_ENFORCE_EQ(
       status.code(),
       common::ErrorCode::INVALID_ARGUMENT + 1,
@@ -55,15 +64,20 @@ TEST(Status, basic_exception) {
   FakeException e;
   Status status;
   status = get_status([&]() { e.base_exception(); });
-  CHECK(!status.ok());
+  PADDLE_ENFORCE_EQ(
+      status.ok(),
+      false,
+      phi::errors::PreconditionNotMet("Status should not be OK."));
   LOG(INFO) << status.error_message();
 }
 
 TEST(Status, no_exception) {
   FakeException e;
   Status status;
   status = get_status([&]() { e.no_exception(); });
-  CHECK(status.ok());
+  PADDLE_ENFORCE_EQ(status.ok(),
+                    true,
+                    phi::errors::PreconditionNotMet("Status should be OK."));
 }
 
 TEST(Status, copy) {
