【Error Message No. 389-397】replace CHECK macro (#67695)

GoldenStain · web-flow · commit de1658a64d83 · 2024-09-03T15:11:33.000+08:00
* 【Error Message No. 389-397】replace CHECK macro * Revert "【Error Message No. 389-397】replace CHECK macro" This reverts commit a72a191. * 【Error Message No. 389-397】replace CHECK macro * 修复冲突 * Remove =0.15 and update .gitignore
diff --git a/paddle/fluid/pir/transforms/build_cinn_pass.cc b/paddle/fluid/pir/transforms/build_cinn_pass.cc
@@ -103,11 +103,14 @@ void VerifyOperationOrder(const pir::Block& block) {
           op->GetParentOp()->isa<cinn::dialect::GroupOp>()) {
         current_op = op->GetParentOp();
       }
-      CHECK(order_info.at(defining_op) < order_info.at(current_op))
-          << "The order of operations is not correct!"
-          << " Received defining_op(" << defining_op->id() << " "
-          << order_info.at(defining_op) << ") is behind current_op("
-          << current_op->id() << " " << order_info.at(current_op) << ")";
+      std::stringstream error_msg;
+      error_msg << "The order of operations is not correct! "
+                << "Received defining_op(" << defining_op->id() << " "
+                << order_info.at(defining_op) << ") is behind current_op("
+                << current_op->id() << " " << order_info.at(current_op) << ")";
+      PADDLE_ENFORCE_LT(order_info.at(defining_op),
+                        order_info.at(current_op),
+                        common::errors::Fatal(error_msg.str()));
     }
   };
 
diff --git a/paddle/phi/core/tensor_utils.cc b/paddle/phi/core/tensor_utils.cc
@@ -101,7 +101,10 @@ void Copy(const Context& dev_ctx,
     return;
   }
   VLOG(4) << "src:" << src_ptr << ", dst:" << dst_ptr;
-  CHECK(dst->layout() == src.layout());
+  PADDLE_ENFORCE_EQ(dst->layout(),
+                    src.layout(),
+                    common::errors::PreconditionNotMet(
+                        "dst's layout differs from src's layout"));
 
   if (src_place.GetType() == AllocationType::CPU &&
       dst_place.GetType() == AllocationType::CPU) {
