first try (#66958)

crazyxiaoxi · web-flow · commit f8f63fa1ff2c · 2024-08-05T10:12:20.000+08:00
diff --git a/paddle/fluid/inference/capi/c_api.cc b/paddle/fluid/inference/capi/c_api.cc
@@ -84,7 +84,10 @@ paddle::PaddleDType ConvertToPaddleDType(PD_DataType dtype) {
     case PD_UINT8:
       return PD_PaddleDType::UINT8;
     default:
-      CHECK(false) << "Unsupport dtype.";
+      PADDLE_ENFORCE_EQ(false,
+                        true,
+                        common::errors::Unimplemented(
+                            "Unsupport dtype in ConvertToPaddleDType."));
       return PD_PaddleDType::FLOAT32;
   }
 }
@@ -100,7 +103,10 @@ PD_DataType ConvertToPDDataType(PD_PaddleDType dtype) {
     case PD_PaddleDType::UINT8:
       return PD_DataType::PD_UINT8;
     default:
-      CHECK(false) << "Unsupport dtype.";
+      PADDLE_ENFORCE_EQ(false,
+                        true,
+                        common::errors::Unimplemented(
+                            "Unsupport dtype in ConvertToPDDataType."));
       return PD_DataType::PD_UNKDTYPE;
   }
 }
@@ -114,7 +120,10 @@ PD_ACPrecision ConvertToACPrecision(Precision dtype) {
     case Precision::kHalf:
       return PD_ACPrecision::kHalf;
     default:
-      CHECK(false) << "Unsupport precision.";
+      PADDLE_ENFORCE_EQ(false,
+                        true,
+                        common::errors::Unimplemented(
+                            "Unsupport precision in ConvertToACPrecision."));
       return PD_ACPrecision::kFloat32;
   }
 }
diff --git a/paddle/fluid/inference/tensorrt/plugin/generic_plugin.cu b/paddle/fluid/inference/tensorrt/plugin/generic_plugin.cu
@@ -547,7 +547,11 @@ nvinfer1::DimsExprs GenericPlugin::getOutputDimensions(
     const nvinfer1::DimsExprs* inputs,
     int nb_inputs,
     nvinfer1::IExprBuilder& expr_builder) TRT_NOEXCEPT {
-  CHECK(output_index < getNbOutputs());
+  PADDLE_ENFORCE_EQ(
+      output_index < getNbOutputs(),
+      true,
+      common::errors::InvalidArgument(
+          "The output_index should be less than getNbOutputs()."));
   auto& dynamic_infermeta_factory = tensorrt::DynamicMetaFnFactory::Instance();
   PADDLE_ENFORCE_EQ(dynamic_infermeta_factory.Contains(op_desc_.Type()),
                     true,
@@ -565,10 +569,18 @@ void GenericPlugin::configurePlugin(
     int nb_inputs,
     const nvinfer1::DynamicPluginTensorDesc* out,
     int nb_outputs) TRT_NOEXCEPT {
-  CHECK(phi_kernels_[nvinfer1::DataType::kFLOAT]->IsValid() ||
-        phi_kernels_[nvinfer1::DataType::kHALF]->IsValid());
-  CHECK(nb_inputs == getNbInputs());
-  CHECK(nb_outputs == getNbOutputs());
+  PADDLE_ENFORCE_EQ(phi_kernels_[nvinfer1::DataType::kFLOAT]->IsValid() ||
+                        phi_kernels_[nvinfer1::DataType::kHALF]->IsValid(),
+                    true,
+                    common::errors::Fatal("Sorry, phi kernel is invalid!"));
+  PADDLE_ENFORCE_EQ(nb_inputs == getNbInputs(),
+                    true,
+                    common::errors::InvalidArgument(
+                        "The nb_inputs should be equal to getNbInputs()."));
+  PADDLE_ENFORCE_EQ(nb_outputs == getNbOutputs(),
+                    true,
+                    common::errors::InvalidArgument(
+                        "The nb_outputs should be equal to getNbOutputs()."));
 }
 
 // Shutdown the layer. This is called when the engine is destroyed
@@ -594,8 +606,11 @@ int GenericPlugin::enqueue(const nvinfer1::PluginTensorDesc* input_desc,
         {nvinfer1::DataType::kINT32, {phi::DataType::INT32, sizeof(int32_t)}},
         {nvinfer1::DataType::kBOOL, {phi::DataType::BOOL, sizeof(bool)}},
     };
-    CHECK(_map.count(nv_dtype))
-        << "dtype [" << static_cast<int>(nv_dtype) << "] is not supported.";
+    PADDLE_ENFORCE_EQ(
+        _map.count(nv_dtype),
+        true,
+        common::errors::InvalidArgument("Sorry, dtyp [ %d ] is not supported.",
+                                        static_cast<int>(nv_dtype)));
     return _map.at(nv_dtype);
   };
 
@@ -606,9 +621,11 @@ int GenericPlugin::enqueue(const nvinfer1::PluginTensorDesc* input_desc,
   } else {
     data_type = input_desc[0].type;
   }
-  CHECK((data_type == nvinfer1::DataType::kFLOAT) ||
-        (data_type == nvinfer1::DataType::kHALF));
-
+  PADDLE_ENFORCE_EQ((data_type == nvinfer1::DataType::kFLOAT) ||
+                        (data_type == nvinfer1::DataType::kHALF),
+                    true,
+                    common::errors::InvalidArgument(
+                        "The data_type should be kFLOAT or kHALF."));
   phi_kernel_contexts_[data_type]->ClearInputOutput();
 
   auto* dev_ctx = static_cast<phi::GPUContext*>(pool.Get(place));
diff --git a/paddle/fluid/pir/transforms/sub_graph_detector.cc b/paddle/fluid/pir/transforms/sub_graph_detector.cc
@@ -506,7 +506,10 @@ void SubgraphDetector::DoOpFusion() {
 void SubgraphDetector::BuildSubGraph() {
   std::unordered_set<SubGraph*> subgraph_set;
   for (auto* op : sort_ops_) {
-    CHECK(subgraph_map_.count(op));
+    PADDLE_ENFORCE_EQ(
+        subgraph_map_.count(op),
+        true,
+        common::errors::InvalidArgument("subgraph_map_ MUST contain op"));
     auto& subgraph = subgraph_map_[op];
     if (subgraph_set.count(subgraph.get())) {
       continue;
@@ -518,7 +521,10 @@ void SubgraphDetector::BuildSubGraph() {
 
   for (auto& subgraph : subgraph_list_) {
     for (auto& input_op : subgraph->input_ops) {
-      CHECK(subgraph_map_.count(input_op));
+      PADDLE_ENFORCE_EQ(
+          subgraph_map_.count(input_op),
+          true,
+          common::errors::InvalidArgument("subgraph_map_ MUST contain op"));
       auto& producer = subgraph_map_[input_op];
       subgraph->producers.insert(producer);
       producer->consumers.insert(subgraph);
@@ -731,8 +737,10 @@ namespace {
 
 struct IncrementalOrder {
   bool operator()(const pir::Operation* lhs, const pir::Operation* rhs) const {
-    CHECK(lhs->GetParent() == rhs->GetParent())
-        << "lhs and rhs should have same parent block.";
+    PADDLE_ENFORCE_EQ(lhs->GetParent() == rhs->GetParent(),
+                      true,
+                      common::errors::PreconditionNotMet(
+                          "lhs and rhs should have same parent block."));
     auto lhs_iter = lhs->operator Block::ConstIterator();
     auto rhs_iter = rhs->operator Block::ConstIterator();
     auto end_iter = lhs->GetParent()->end();
@@ -741,8 +749,10 @@ struct IncrementalOrder {
       if (lhs_iter == rhs_iter) return true;
       if (lhs_iter == end_iter) return false;
     }
-    CHECK(false) << "rhs " << rhs->id() << " is not reachable from lhs "
-                 << lhs->id();
+    PADDLE_ENFORCE_EQ(
+        false,
+        true,
+        common::errors::InvalidArgument("rhs is not reachable from lhs."));
     return false;
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,10 @@ paddle::PaddleDType ConvertToPaddleDType(PD_DataType dtype) {`
`84`	`84`	`case PD_UINT8:`
`85`	`85`	`return PD_PaddleDType::UINT8;`
`86`	`86`	`default:`
`87`		`- CHECK(false) << "Unsupport dtype.";`
	`87`	`+ PADDLE_ENFORCE_EQ(false,`
	`88`	`+ true,`
	`89`	`+ common::errors::Unimplemented(`
	`90`	`+ "Unsupport dtype in ConvertToPaddleDType."));`
`88`	`91`	`return PD_PaddleDType::FLOAT32;`
`89`	`92`	`}`
`90`	`93`	`}`
`@@ -100,7 +103,10 @@ PD_DataType ConvertToPDDataType(PD_PaddleDType dtype) {`
`100`	`103`	`case PD_PaddleDType::UINT8:`
`101`	`104`	`return PD_DataType::PD_UINT8;`
`102`	`105`	`default:`
`103`		`- CHECK(false) << "Unsupport dtype.";`
	`106`	`+ PADDLE_ENFORCE_EQ(false,`
	`107`	`+ true,`
	`108`	`+ common::errors::Unimplemented(`
	`109`	`+ "Unsupport dtype in ConvertToPDDataType."));`
`104`	`110`	`return PD_DataType::PD_UNKDTYPE;`
`105`	`111`	`}`
`106`	`112`	`}`
`@@ -114,7 +120,10 @@ PD_ACPrecision ConvertToACPrecision(Precision dtype) {`
`114`	`120`	`case Precision::kHalf:`
`115`	`121`	`return PD_ACPrecision::kHalf;`
`116`	`122`	`default:`
`117`		`- CHECK(false) << "Unsupport precision.";`
	`123`	`+ PADDLE_ENFORCE_EQ(false,`
	`124`	`+ true,`
	`125`	`+ common::errors::Unimplemented(`
	`126`	`+ "Unsupport precision in ConvertToACPrecision."));`
`118`	`127`	`return PD_ACPrecision::kFloat32;`
`119`	`128`	`}`
`120`	`129`	`}`