【Error Message No. 34、36、37 BUAA】modify error messages (#66550)

Guanhuachen2003 · web-flow · commit 83f07a25c6d5 · 2024-07-26T15:52:53.000+08:00
* Update dialect_convert_test.cc

* Update gloo_wrapper.h

* Update tensor_wrapper_test.cc
diff --git a/paddle/fluid/framework/fleet/gloo_wrapper.h b/paddle/fluid/framework/fleet/gloo_wrapper.h
@@ -183,7 +183,11 @@ class GlooWrapper {
   }
 
   void Barrier() {
-    CHECK_EQ(is_initialized_, true);
+    PADDLE_ENFORCE_EQ(
+        is_initialized_,
+        true,
+        phi::errors::PreconditionNotMet(
+            "GlooWrapper should be initialized before calling Barrier."));
 #ifdef PADDLE_WITH_GLOO
     gloo::BarrierOptions opts(context_);
     gloo::barrier(opts);
@@ -200,9 +204,20 @@ class GlooWrapper {
   template <typename T>
   std::vector<T> AllReduce(std::vector<T>& sendbuf,            // NOLINT
                            const std::string& mode = "sum") {  // NOLINT
-    CHECK_EQ(is_initialized_, true);
+    PADDLE_ENFORCE_EQ(
+        is_initialized_,
+        true,
+        phi::errors::PreconditionNotMet(
+            "GlooWrapper should be initialized before calling AllReduce."));
     std::vector<T> recvbuf(sendbuf.size(), T());
-    CHECK_EQ(sendbuf.size() == recvbuf.size(), true);
+    PADDLE_ENFORCE_EQ(
+        sendbuf.size(),
+        recvbuf.size(),
+        phi::errors::InvalidArgument(
+            "The size of send buffer and receive buffer should be equal, but "
+            "received send buffer size = %d and receive buffer size = %d.",
+            sendbuf.size(),
+            recvbuf.size()));
 #ifdef PADDLE_WITH_GLOO
     gloo::AllreduceOptions opts(context_);
     opts.setInput(sendbuf.data(), sendbuf.size());
@@ -234,7 +249,11 @@ class GlooWrapper {
 
   template <typename T>
   std::vector<T> AllGather(T& input) {  // NOLINT
-    CHECK_EQ(is_initialized_, true);
+    PADDLE_ENFORCE_EQ(
+        is_initialized_,
+        true,
+        phi::errors::PreconditionNotMet(
+            "GlooWrapper should be initialized before calling AllGather."));
     std::vector<T> ret(size_, T());
 #ifdef PADDLE_WITH_GLOO
     gloo::AllgatherOptions opts(context_);
@@ -256,7 +275,11 @@ class GlooWrapper {
   void AllGatherVector(T* input_ptr,
                        T* output_ptr,
                        std::vector<size_t>& element_nums) {  // NOLINT
-    CHECK_EQ(is_initialized_, true);
+    PADDLE_ENFORCE_EQ(
+        is_initialized_,
+        true,
+        phi::errors::PreconditionNotMet(
+            "GlooWrapper should be initialized before calling AllGather."));
 #ifdef PADDLE_WITH_GLOO
     gloo::AllgathervOptions opts(context_);
     opts.setInput(input_ptr, element_nums[rank_]);
@@ -271,7 +294,11 @@ class GlooWrapper {
   void AllGatherVector(T* input_ptr,
                        T* output_ptr,
                        size_t element_num) {  // NOLINT
-    CHECK_EQ(is_initialized_, true);
+    PADDLE_ENFORCE_EQ(
+        is_initialized_,
+        true,
+        phi::errors::PreconditionNotMet("GlooWrapper should be initialized "
+                                        "before calling AllGatherVector."));
 #ifdef PADDLE_WITH_GLOO
     gloo::AllgatherOptions opts(context_);
     opts.setInput(input_ptr, element_num);
diff --git a/test/cpp/eager/data_structure_tests/tensor_wrapper_test.cc b/test/cpp/eager/data_structure_tests/tensor_wrapper_test.cc
@@ -42,12 +42,23 @@ TEST(TensorWrapper, Basic) {
   auto tw0 = egr::TensorWrapper(et1);
   auto recover_et1 = tw0.recover();
   if (VLOG_IS_ON(7)) {
-    CHECK_EQ(recover_et1.name(), std::string("et1@saved"));
+    PADDLE_ENFORCE_EQ(
+        recover_et1.name(),
+        std::string("et1@saved"),
+        phi::errors::InvalidArgument(
+            "Recovered tensor name should be 'et1@saved', but received %s.",
+            recover_et1.name().c_str()));
   }
-  CHECK_EQ(egr::EagerUtils::OutRankInfo(recover_et1).first,
-           egr::EagerUtils::OutRankInfo(et1).first);
-  CHECK_EQ(egr::EagerUtils::OutRankInfo(recover_et1).second,
-           egr::EagerUtils::OutRankInfo(et1).second);
+  PADDLE_ENFORCE_EQ(egr::EagerUtils::OutRankInfo(recover_et1).first,
+                    egr::EagerUtils::OutRankInfo(et1).first,
+                    phi::errors::InvalidArgument(
+                        "The OutRankInfo first element of the recovered tensor "
+                        "does not match the original tensor."));
+  PADDLE_ENFORCE_EQ(egr::EagerUtils::OutRankInfo(recover_et1).second,
+                    egr::EagerUtils::OutRankInfo(et1).second,
+                    phi::errors::InvalidArgument(
+                        "The OutRankInfo second element of the recovered "
+                        "tensor does not match the original tensor."));
   VLOG(6) << "Test reconstruct";
   paddle::Tensor et2;
   phi::DenseTensorMeta meta2 =
@@ -69,12 +80,23 @@ TEST(TensorWrapper, Basic) {
   auto tw1 = egr::TensorWrapper(et2, false);
   auto recover_et2 = tw1.recover();
   if (VLOG_IS_ON(7)) {
-    CHECK_EQ(recover_et2.name(), std::string("et2@Saved"));
+    PADDLE_ENFORCE_EQ(
+        recover_et2.name(),
+        std::string("et2@Saved"),
+        phi::errors::InvalidArgument(
+            "Recovered tensor name should be 'et2@Saved', but received %s.",
+            recover_et2.name().c_str()));
   }
-  CHECK_EQ(egr::EagerUtils::OutRankInfo(recover_et2).first,
-           egr::EagerUtils::OutRankInfo(et2).first);
-  CHECK_EQ(egr::EagerUtils::OutRankInfo(recover_et2).second,
-           egr::EagerUtils::OutRankInfo(et2).second);
+  PADDLE_ENFORCE_EQ(egr::EagerUtils::OutRankInfo(recover_et2).first,
+                    egr::EagerUtils::OutRankInfo(et2).first,
+                    phi::errors::InvalidArgument(
+                        "The OutRankInfo first element of the recovered tensor "
+                        "does not match the original tensor."));
+  PADDLE_ENFORCE_EQ(egr::EagerUtils::OutRankInfo(recover_et2).second,
+                    egr::EagerUtils::OutRankInfo(et2).second,
+                    phi::errors::InvalidArgument(
+                        "The OutRankInfo second element of the recovered "
+                        "tensor does not match the original tensor."));
   // Test Raw recover
   paddle::Tensor et3;
   auto tw2 = egr::TensorWrapper(et3);
diff --git a/test/cpp/pir/cinn/dialect_convert_test.cc b/test/cpp/pir/cinn/dialect_convert_test.cc
@@ -71,13 +71,29 @@ TEST(DrrTest, reduce_sum) {
 
   auto it = program.block()->begin();
 
-  CHECK_EQ(it->isa<paddle::dialect::FullOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::FullOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::FullOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<cinn::dialect::ReduceSumOp>(), true);
+  PADDLE_ENFORCE_EQ(it->isa<cinn::dialect::ReduceSumOp>(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "The operation should be of type "
+                        "cinn::dialect::ReduceSumOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<paddle::dialect::ReluOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::ReluOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::ReluOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<paddle::dialect::ExpOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::ExpOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::ExpOp, but it is not."));
 }
 
 TEST(DrrTest, reduce_max) {
@@ -95,11 +111,27 @@ TEST(DrrTest, reduce_max) {
 
   auto it = program.block()->begin();
 
-  CHECK_EQ(it->isa<paddle::dialect::FullOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::FullOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::FullOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<cinn::dialect::ReduceMaxOp>(), true);
+  PADDLE_ENFORCE_EQ(it->isa<cinn::dialect::ReduceMaxOp>(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "The operation should be of type "
+                        "cinn::dialect::ReduceMaxOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<paddle::dialect::ReluOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::ReluOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::ReluOp, but it is not."));
   it++;
-  CHECK_EQ(it->isa<paddle::dialect::ExpOp>(), true);
+  PADDLE_ENFORCE_EQ(
+      it->isa<paddle::dialect::ExpOp>(),
+      true,
+      phi::errors::InvalidArgument("The operation should be of type "
+                                   "paddle::dialect::ExpOp, but it is not."));
 }
