【Error Message BUAA No. 14,15】 将报错信息修改为 PADDLE_ENFORCE_EQ 的形式 (#66668)

Marcusryz · web-flow · commit 4f045c32c0b3 · 2024-07-29T09:52:26.000+08:00
* Refine message.

* update
diff --git a/test/cpp/eager/data_structure_tests/grad_node_info_test.cc b/test/cpp/eager/data_structure_tests/grad_node_info_test.cc
@@ -20,6 +20,7 @@
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/hooks.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
+#include "paddle/phi/core/enforce.h"
 #include "test/cpp/eager/data_structure_tests/grad_node_test.h"
 
 TEST(GradNodeInfo, GradSlotMeta) {
@@ -48,9 +49,11 @@ void TestGradNodeBase(bool is_remove_gradient_hook) {
   grads = {{et1}};
   VLOG(6) << "Test Grad Node Call";
   auto res = (*grad_test_node0)(grads);
-  CHECK_EQ(std::dynamic_pointer_cast<phi::DenseTensor>(res[0][0].impl())
-               ->data<float>()[0],
-           6.0f);
+  PADDLE_ENFORCE_EQ(
+      std::dynamic_pointer_cast<phi::DenseTensor>(res[0][0].impl())
+          ->data<float>()[0],
+      6.0f,
+      phi::errors::InvalidArgument("Data of grads mismatch. Expected 6.0."));
   egr::Edge tmp_edge1(grad_test_node1, 3, 4);
   auto auto_grad1 = std::make_shared<egr::AutogradMeta>(tmp_edge1);
   et1.set_autograd_meta(auto_grad1);
@@ -61,26 +64,46 @@ void TestGradNodeBase(bool is_remove_gradient_hook) {
   grad_test_node0->SetGradInMeta({et1}, 1);
   grad_test_node0->SetGradOutMeta(et1, 0);
   grad_test_node0->SetGradOutMeta({et1}, 1);
-  CHECK_EQ(grad_test_node0->InputMeta()[0].size(), size_t(1));
-  CHECK_EQ(grad_test_node0->InputMeta()[1].size(), size_t(1));
-  CHECK_EQ(grad_test_node0->InputMeta()[0][0].GetTensorMeta().dtype,
-           meta.dtype);
-  CHECK_EQ(grad_test_node0->InputMeta()[1][0].GetTensorMeta().dtype,
-           meta.dtype);
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->InputMeta()[0].size(),
+      1UL,
+      phi::errors::InvalidArgument("Size of input mismatch. Expected 1."));
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->InputMeta()[1].size(),
+      1UL,
+      phi::errors::InvalidArgument("Size of input mismatch. Expected 1."));
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->InputMeta()[0][0].GetTensorMeta().dtype,
+      meta.dtype,
+      phi::errors::InvalidArgument("Dtype of input tensor mismatch."));
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->InputMeta()[1][0].GetTensorMeta().dtype,
+      meta.dtype,
+      phi::errors::InvalidArgument("Dtype of input tensor mismatch."));
   CHECK(grad_test_node0->OutputMeta()[0][0].IsStopGradient());
   CHECK(grad_test_node0->OutputMeta()[1][0].IsStopGradient());
-  CHECK_EQ(grad_test_node0->OutputMeta()[0][0].GetTensorMeta().dtype,
-           meta.dtype);
-  CHECK_EQ(grad_test_node0->OutputMeta()[1][0].GetTensorMeta().dtype,
-           meta.dtype);
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->OutputMeta()[0][0].GetTensorMeta().dtype,
+      meta.dtype,
+      phi::errors::InvalidArgument("Dtype of output tensor mismatch."));
+  PADDLE_ENFORCE_EQ(
+      grad_test_node0->OutputMeta()[1][0].GetTensorMeta().dtype,
+      meta.dtype,
+      phi::errors::InvalidArgument("Dtype of output tensor mismatch."));
 
   VLOG(6) << "Test Default Set Meta and Get Meta";
   auto grad_test_node2 = std::make_shared<eager_test::GradTestNode>(
       /* val */ 5.0, /* in_num */ 1, /* out_num */ 1);
   grad_test_node2->SetDefaultGradInOutMeta();
-  CHECK_GT(grad_test_node2->OutputMeta()[0].size(), size_t(0));
+  PADDLE_ENFORCE_GT(
+      grad_test_node2->OutputMeta()[0].size(),
+      0UL,
+      phi::errors::InvalidArgument("Size of output not greater than 0."));
   CHECK(grad_test_node2->OutputMeta()[0][0].IsStopGradient() == false);
-  CHECK_EQ(grad_test_node2->OutputMeta()[0].size(), size_t(1));
+  PADDLE_ENFORCE_EQ(
+      grad_test_node2->OutputMeta()[0].size(),
+      1UL,
+      phi::errors::InvalidArgument("Size of output mismatch. Expected 1."));
 
   VLOG(6) << "Test Gradient Hook";
   auto gradient_hook = [](const paddle::Tensor& et) -> paddle::Tensor {
@@ -111,10 +134,12 @@ void TestGradNodeBase(bool is_remove_gradient_hook) {
 
   // Check results
   auto grad_hook_res = grad_test_node0->ApplyGradientHooks(grads);
-  CHECK_EQ(
+  PADDLE_ENFORCE_EQ(
       std::dynamic_pointer_cast<phi::DenseTensor>(grad_hook_res[0][0].impl())
           ->data<float>()[0],
-      is_remove_gradient_hook ? 5.0 : 11.0);
+      is_remove_gradient_hook ? 5.0 : 11.0,
+      phi::errors::InvalidArgument(
+          "Data of grad hook res mismatch. Expected 5.0 or 11.0."));
 }
 
 TEST(GradNodeInfo, GradNodeBase) {
@@ -145,16 +170,37 @@ TEST(GradNodeInfo, Edge) {
   et1.set_autograd_meta(auto_grad1);
   grad_node->SetGradInMeta(et1, 0);
 
-  CHECK_EQ(grad_node->InputMeta().size(), size_t(2));
+  PADDLE_ENFORCE_EQ(
+      grad_node->InputMeta().size(),
+      2UL,
+      phi::errors::InvalidArgument("Size of input mismatch. Expected 2."));
   std::vector<egr::AutogradMeta*> metas = {auto_grad1.get()};
   CHECK(grad_node->InputMeta()[0][0].IsStopGradient() == true);
   VLOG(6) << "Test Get/Set Edge Rank Info";
-  CHECK_EQ(edge2.GetEdgeRankInfo().first, size_t(1));
-  CHECK_EQ(edge2.GetEdgeRankInfo().second, size_t(0));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().first,
+      1UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 1."));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().second,
+      0UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 0."));
   edge2.SetEdgeRankInfo(2, 3);
-  CHECK_EQ(edge2.GetEdgeRankInfo().first, size_t(2));
-  CHECK_EQ(edge2.GetEdgeRankInfo().second, size_t(3));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().first,
+      2UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 2."));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().second,
+      3UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 3."));
   edge2.SetEdgeRankInfo(std::make_pair(size_t(4), size_t(5)));
-  CHECK_EQ(edge2.GetEdgeRankInfo().first, size_t(4));
-  CHECK_EQ(edge2.GetEdgeRankInfo().second, size_t(5));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().first,
+      4UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 4."));
+  PADDLE_ENFORCE_EQ(
+      edge2.GetEdgeRankInfo().second,
+      5UL,
+      phi::errors::InvalidArgument("Edge rank info mismatch. Expected 5."));
 }
diff --git a/test/cpp/pir/pass/pass_manager_test.cc b/test/cpp/pir/pass/pass_manager_test.cc
@@ -47,21 +47,51 @@ IR_DEFINE_EXPLICIT_TYPE_ID(TestAnalysis2)
 
 TEST(pass_manager, PreservedAnalyses) {
   pir::detail::PreservedAnalyses pa;
-  CHECK_EQ(pa.IsNone(), true);
-
-  CHECK_EQ(pa.IsPreserved<TestAnalysis1>(), false);
+  PADDLE_ENFORCE_EQ(pa.IsNone(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "Preserved analyses not exist. Expected exist."));
+
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis1>(),
+                    false,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis is preserved. Expected not."));
   pa.Preserve<TestAnalysis1>();
-  CHECK_EQ(pa.IsPreserved<TestAnalysis1>(), true);
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis1>(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis not preserved. Expected preserved."));
   pa.Unpreserve<TestAnalysis1>();
-  CHECK_EQ(pa.IsPreserved<TestAnalysis1>(), false);
-  CHECK_EQ(pa.IsPreserved<TestAnalysis2>(), false);
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis1>(),
+                    false,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis is preserved. Expected not."));
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis2>(),
+                    false,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis is preserved. Expected not."));
   pa.Preserve<TestAnalysis1, TestAnalysis2>();
-  CHECK_EQ(pa.IsPreserved<TestAnalysis1>(), true);
-  CHECK_EQ(pa.IsPreserved<TestAnalysis2>(), true);
-  CHECK_EQ(pa.IsAll(), false);
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis1>(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis not preserved. Expected preserved."));
+  PADDLE_ENFORCE_EQ(pa.IsPreserved<TestAnalysis2>(),
+                    true,
+                    phi::errors::InvalidArgument(
+                        "Test Analysis not preserved. Expected preserved."));
+  PADDLE_ENFORCE_EQ(
+      pa.IsAll(),
+      false,
+      phi::errors::InvalidArgument("Test Analysis is all. Expected not."));
   pa.PreserveAll();
-  CHECK_EQ(pa.IsAll(), true);
-  CHECK_EQ(pa.IsNone(), false);
+  PADDLE_ENFORCE_EQ(
+      pa.IsAll(),
+      true,
+      phi::errors::InvalidArgument("Test Analysis not all. Expected all."));
+  PADDLE_ENFORCE_EQ(
+      pa.IsNone(),
+      false,
+      phi::errors::InvalidArgument("Test Analysis is none. Expected not."));
 }
 #endif
 
@@ -136,31 +166,53 @@ class TestPass : public pir::Pass {
   void Run(pir::Operation *op) override {
     auto count_op_analysis = analysis_manager().GetAnalysis<CountOpAnalysis>();
     pass_state()->preserved_analyses.Preserve<CountOpAnalysis>();
-    CHECK_EQ(pass_state()->preserved_analyses.IsPreserved<CountOpAnalysis>(),
-             true);
+    PADDLE_ENFORCE_EQ(
+        pass_state()->preserved_analyses.IsPreserved<CountOpAnalysis>(),
+        true,
+        phi::errors::InvalidArgument(
+            "Count op analysis not preserved. Expected preserved."));
     auto no_operation_analysis =
         analysis_manager().GetAnalysis<NoOperationAnalysis>();
     pass_state()->preserved_analyses.Preserve<NoOperationAnalysis>();
-    CHECK_EQ(
+    PADDLE_ENFORCE_EQ(
         pass_state()->preserved_analyses.IsPreserved<NoOperationAnalysis>(),
-        true);
-    CHECK_EQ(count_op_analysis.count, 11);
+        true,
+        phi::errors::InvalidArgument(
+            "No operation analysis not preserved. Expected preserved."));
+    PADDLE_ENFORCE_EQ(count_op_analysis.count,
+                      11UL,
+                      phi::errors::InvalidArgument(
+                          "Count op analysis mismatch. Expected 11."));
     no_operation_analysis.scale = 8;
-    CHECK_EQ(no_operation_analysis.scale, 8);
+    PADDLE_ENFORCE_EQ(
+        no_operation_analysis.scale,
+        8UL,
+        phi::errors::InvalidArgument(
+            "Scale of no operation analysis mismatch. Expected 8."));
 
     auto module_op = op->dyn_cast<pir::ModuleOp>();
-    CHECK_EQ(module_op.operation(), op);
-    CHECK_EQ(module_op.name(), module_op->name());
+    PADDLE_ENFORCE_EQ(
+        module_op.operation(),
+        op,
+        phi::errors::InvalidArgument("module op operation mismatch."));
+    PADDLE_ENFORCE_EQ(module_op.name(),
+                      module_op->name(),
+                      phi::errors::InvalidArgument("module op name mismatch."));
     LOG(INFO) << "In " << pass_info().name << ": " << module_op->name()
               << std::endl;
 
     pass_state()->preserved_analyses.Unpreserve<CountOpAnalysis>();
-    CHECK_EQ(pass_state()->preserved_analyses.IsPreserved<CountOpAnalysis>(),
-             false);
+    PADDLE_ENFORCE_EQ(
+        pass_state()->preserved_analyses.IsPreserved<CountOpAnalysis>(),
+        false,
+        phi::errors::InvalidArgument(
+            "Count op analysis is preserved. Expected not."));
     pass_state()->preserved_analyses.Unpreserve<NoOperationAnalysis>();
-    CHECK_EQ(
+    PADDLE_ENFORCE_EQ(
         pass_state()->preserved_analyses.IsPreserved<NoOperationAnalysis>(),
-        false);
+        false,
+        phi::errors::InvalidArgument(
+            "No operation analysis is preserved. Expected not."));
   }
 
   bool CanApplyOn(pir::Operation *op) const override {
@@ -252,5 +304,8 @@ TEST(pass_manager, PassManager) {
 
   // pm.EnablePassTiming(true);
 
-  CHECK_EQ(pm.Run(&program), true);
+  PADDLE_ENFORCE_EQ(
+      pm.Run(&program),
+      true,
+      phi::errors::InvalidArgument("Program not run. Expected run."));
 }
