Replace phi::ErrorSummary [fluid_ops] (#67217)

co63oc · web-flow · commit cfd8c609d9e9 · 2024-08-09T10:28:50.000+08:00
diff --git a/paddle/fluid/distributed/ps/wrapper/fleet.h b/paddle/fluid/distributed/ps/wrapper/fleet.h
@@ -289,7 +289,7 @@ class FleetWrapper {
   std::string GetDistDesc() const {
     PADDLE_ENFORCE_EQ(is_initialized_,
                       true,
-                      phi::errors::PermissionDenied(
+                      common::errors::PermissionDenied(
                           "FleetWrapper should be initialized first!!!"));
     return dist_desc_;
   }
diff --git a/paddle/fluid/inference/capi/pd_predictor.cc b/paddle/fluid/inference/capi/pd_predictor.cc
@@ -171,7 +171,7 @@ bool PD_PredictorZeroCopyRun(const PD_AnalysisConfig* config,
   PADDLE_ENFORCE_EQ(
       predictor->ZeroCopyRun(),
       true,
-      phi::errors::PermissionDenied("Predictor is not in Zero Copy Run!!!"));
+      common::errors::PermissionDenied("Predictor is not in Zero Copy Run!!!"));
   auto output_names = predictor->GetOutputNames();
   int osize = output_names.size();
   *out_size = osize;
diff --git a/paddle/fluid/inference/tensorrt/convert/leaky_relu_op.cc b/paddle/fluid/inference/tensorrt/convert/leaky_relu_op.cc
@@ -41,7 +41,7 @@ class LeakyReluOpConverter : public OpConverter {
       PADDLE_ENFORCE_EQ(
           op_desc.HasAttr("Input_scale"),
           true,
-          phi::errors::InvalidArgument(
+          common::errors::InvalidArgument(
               "Operator description does not has attribute Input_scale!!!"));
       float in_scale = PADDLE_GET_CONST(float, op_desc.GetAttr("Input_scale"));
       engine_->SetTensorDynamicRange(input, in_scale);
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/binary_infer_sym.cc
@@ -754,14 +754,14 @@ bool MvOpInferSymbolicShape(pir::Operation *op,
       infer_context->GetShapeOrDataForValue(op->operand_source(0));
   const auto &vec_shape_or_data =
       infer_context->GetShapeOrDataForValue(op->operand_source(1));
-  PADDLE_ENFORCE_EQ(
-      x_shape_or_data.shape().size(),
-      2,
-      phi::errors::InvalidArgument("The rank of input X should be 2, but is %d",
-                                   x_shape_or_data.shape().size()));
+  PADDLE_ENFORCE_EQ(x_shape_or_data.shape().size(),
+                    2,
+                    common::errors::InvalidArgument(
+                        "The rank of input X should be 2, but is %d",
+                        x_shape_or_data.shape().size()));
   PADDLE_ENFORCE_EQ(vec_shape_or_data.shape().size(),
                     1,
-                    phi::errors::InvalidArgument(
+                    common::errors::InvalidArgument(
                         "The rank of input Vec should be 1, but is %d",
                         vec_shape_or_data.shape().size()));
   infer_context->AddEqualCstr(x_shape_or_data.shape()[1],
diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
@@ -158,12 +158,12 @@ struct EOFException : public std::exception {
     END_HANDLE_THE_ERROR                               \
   } while (0)
 
-#define PADDLE_THROW_BAD_ALLOC(...)                                      \
-  do {                                                                   \
-    HANDLE_THE_ERROR                                                     \
-    throw ::paddle::memory::allocation::BadAlloc(                        \
-        phi::ErrorSummary(__VA_ARGS__).to_string(), __FILE__, __LINE__); \
-    END_HANDLE_THE_ERROR                                                 \
+#define PADDLE_THROW_BAD_ALLOC(...)                                           \
+  do {                                                                        \
+    HANDLE_THE_ERROR                                                          \
+    throw ::paddle::memory::allocation::BadAlloc(                             \
+        ::common::ErrorSummary(__VA_ARGS__).to_string(), __FILE__, __LINE__); \
+    END_HANDLE_THE_ERROR                                                      \
   } while (0)
 
 }  // namespace platform
diff --git a/paddle/fluid/pybind/exception.cc b/paddle/fluid/pybind/exception.cc
@@ -46,33 +46,33 @@ void BindException(pybind11::module* m) {
       PyErr_SetString(PyExc_MemoryError, e.what());
     } catch (const platform::EnforceNotMet& e) {
       switch (e.code()) {
-        case phi::ErrorCode::INVALID_ARGUMENT:
+        case common::ErrorCode::INVALID_ARGUMENT:
           PyErr_SetString(PyExc_ValueError, e.what());
           break;
-        case phi::ErrorCode::NOT_FOUND:
-        case phi::ErrorCode::ALREADY_EXISTS:
-        case phi::ErrorCode::PRECONDITION_NOT_MET:
-        case phi::ErrorCode::PERMISSION_DENIED:
-        case phi::ErrorCode::EXECUTION_TIMEOUT:
-        case phi::ErrorCode::UNAVAILABLE:
+        case common::ErrorCode::NOT_FOUND:
+        case common::ErrorCode::ALREADY_EXISTS:
+        case common::ErrorCode::PRECONDITION_NOT_MET:
+        case common::ErrorCode::PERMISSION_DENIED:
+        case common::ErrorCode::EXECUTION_TIMEOUT:
+        case common::ErrorCode::UNAVAILABLE:
           PyErr_SetString(PyExc_RuntimeError, e.what());
           break;
-        case phi::ErrorCode::OUT_OF_RANGE:
+        case common::ErrorCode::OUT_OF_RANGE:
           PyErr_SetString(PyExc_IndexError, e.what());
           break;
-        case phi::ErrorCode::RESOURCE_EXHAUSTED:
+        case common::ErrorCode::RESOURCE_EXHAUSTED:
           PyErr_SetString(PyExc_MemoryError, e.what());
           break;
-        case phi::ErrorCode::UNIMPLEMENTED:
+        case common::ErrorCode::UNIMPLEMENTED:
           PyErr_SetString(PyExc_NotImplementedError, e.what());
           break;
-        case phi::ErrorCode::FATAL:
+        case common::ErrorCode::FATAL:
           PyErr_SetString(PyExc_SystemError, e.what());
           break;
-        case phi::ErrorCode::EXTERNAL:
+        case common::ErrorCode::EXTERNAL:
           PyErr_SetString(PyExc_OSError, e.what());
           break;
-        case phi::ErrorCode::INVALID_TYPE:
+        case common::ErrorCode::INVALID_TYPE:
           PyErr_SetString(PyExc_TypeError, e.what());
           break;
         default:
@@ -101,33 +101,33 @@ void ThrowExceptionToPython(std::exception_ptr p) {
     PyErr_SetString(PyExc_MemoryError, e.what());
   } catch (const platform::EnforceNotMet& e) {
     switch (e.code()) {
-      case phi::ErrorCode::INVALID_ARGUMENT:
+      case common::ErrorCode::INVALID_ARGUMENT:
         PyErr_SetString(PyExc_ValueError, e.what());
         break;
-      case phi::ErrorCode::NOT_FOUND:
-      case phi::ErrorCode::ALREADY_EXISTS:
-      case phi::ErrorCode::PRECONDITION_NOT_MET:
-      case phi::ErrorCode::PERMISSION_DENIED:
-      case phi::ErrorCode::EXECUTION_TIMEOUT:
-      case phi::ErrorCode::UNAVAILABLE:
+      case common::ErrorCode::NOT_FOUND:
+      case common::ErrorCode::ALREADY_EXISTS:
+      case common::ErrorCode::PRECONDITION_NOT_MET:
+      case common::ErrorCode::PERMISSION_DENIED:
+      case common::ErrorCode::EXECUTION_TIMEOUT:
+      case common::ErrorCode::UNAVAILABLE:
         PyErr_SetString(PyExc_RuntimeError, e.what());
         break;
-      case phi::ErrorCode::OUT_OF_RANGE:
+      case common::ErrorCode::OUT_OF_RANGE:
         PyErr_SetString(PyExc_IndexError, e.what());
         break;
-      case phi::ErrorCode::RESOURCE_EXHAUSTED:
+      case common::ErrorCode::RESOURCE_EXHAUSTED:
         PyErr_SetString(PyExc_MemoryError, e.what());
         break;
-      case phi::ErrorCode::UNIMPLEMENTED:
+      case common::ErrorCode::UNIMPLEMENTED:
         PyErr_SetString(PyExc_NotImplementedError, e.what());
         break;
-      case phi::ErrorCode::FATAL:
+      case common::ErrorCode::FATAL:
         PyErr_SetString(PyExc_SystemError, e.what());
         break;
-      case phi::ErrorCode::EXTERNAL:
+      case common::ErrorCode::EXTERNAL:
         PyErr_SetString(PyExc_OSError, e.what());
         break;
-      case phi::ErrorCode::INVALID_TYPE:
+      case common::ErrorCode::INVALID_TYPE:
         PyErr_SetString(PyExc_TypeError, e.what());
         break;
       default:
diff --git a/paddle/phi/api/ext/spmd_infer.h b/paddle/phi/api/ext/spmd_infer.h
@@ -29,7 +29,7 @@ struct SpmdInferHelperTypeEnd {};
 #define PD_INFER_SPMD_CHECK_INPUTS_SIZE_GT(inputs, size_bound)                 \
   PADDLE_ENFORCE_GT(inputs.size(),                                             \
                     size_bound,                                                \
-                    phi::errors::PreconditionNotMet(                           \
+                    common::errors::PreconditionNotMet(                        \
                         "The size of %s must be greater than %d, but got %d.", \
                         #inputs,                                               \
                         size_bound,                                            \
@@ -38,7 +38,7 @@ struct SpmdInferHelperTypeEnd {};
 #define PD_INFER_SPMD_CHECK_INPUTS_SIZE_EQ(inputs, size_bound)             \
   PADDLE_ENFORCE_EQ(inputs.size(),                                         \
                     size_bound,                                            \
-                    phi::errors::PreconditionNotMet(                       \
+                    common::errors::PreconditionNotMet(                    \
                         "The size of %s must be equal to %d, but got %d.", \
                         #inputs,                                           \
                         size_bound,                                        \
diff --git a/paddle/phi/core/enforce.h b/paddle/phi/core/enforce.h
@@ -124,12 +124,12 @@ void ThrowWarnInternal(const std::string& message);
     }                                                              \
   } while (0)
 #else
-#define PADDLE_ENFORCE(COND, ...)                               \
-  do {                                                          \
-    auto __cond__ = (COND);                                     \
-    if (UNLIKELY(::phi::is_error(__cond__))) {                  \
-      __THROW_ERROR_INTERNAL__(phi::ErrorSummary(__VA_ARGS__)); \
-    }                                                           \
+#define PADDLE_ENFORCE(COND, ...)                                    \
+  do {                                                               \
+    auto __cond__ = (COND);                                          \
+    if (UNLIKELY(::phi::is_error(__cond__))) {                       \
+      __THROW_ERROR_INTERNAL__(::common::ErrorSummary(__VA_ARGS__)); \
+    }                                                                \
   } while (0)
 #endif
 
@@ -150,7 +150,7 @@ void ThrowWarnInternal(const std::string& message);
 #define PADDLE_WARN_NOT_NULL(__VAL, ...)                         \
   do {                                                           \
     if (UNLIKELY(nullptr == (__VAL))) {                          \
-      auto __summary__ = phi::ErrorSummary(__VA_ARGS__);         \
+      auto __summary__ = ::common::ErrorSummary(__VA_ARGS__);    \
       auto __message__ = ::paddle::string::Sprintf(              \
           "%s\n  [Hint: " #__VAL " should not be null.]",        \
           __summary__.error_message());                          \
@@ -208,7 +208,7 @@ void ThrowWarnInternal(const std::string& message);
           "%s\n  [Hint: pointer " #__PTR " should not be null.]",       \
           __summary__.error_message());                                 \
       __THROW_ERROR_INTERNAL__(                                         \
-          phi::ErrorSummary(__summary__.code(), __message__));          \
+          ::common::ErrorSummary(__summary__.code(), __message__));     \
     }                                                                   \
     return *__ptr;                                                      \
   })())
diff --git a/paddle/phi/kernels/impl/sync_calc_stream_kernel_impl.h b/paddle/phi/kernels/impl/sync_calc_stream_kernel_impl.h
@@ -31,12 +31,12 @@ void SyncCalcStreamKernel(const Context &dev_ctx,
   auto place = dev_ctx.GetPlace();
   PADDLE_ENFORCE_EQ(place.GetType() == phi::AllocationType::XPU,
                     true,
-                    phi::errors::PreconditionNotMet(
+                    common::errors::PreconditionNotMet(
                         "Sync stream op can run on xpu place only for now."));
   dev_ctx.Wait();
 #else
-  PADDLE_THROW(
-      phi::errors::PreconditionNotMet("PaddlePaddle should compile with GPU."));
+  PADDLE_THROW(common::errors::PreconditionNotMet(
+      "PaddlePaddle should compile with GPU."));
 #endif
 }
 }  // namespace phi
diff --git a/test/cpp/eager/data_structure_tests/autograd_meta_test.cc b/test/cpp/eager/data_structure_tests/autograd_meta_test.cc
@@ -49,7 +49,7 @@ TEST(AutogradMeta, MemberFunction) {
   VLOG(6) << "Test Grad";
   PADDLE_ENFORCE_EQ(tmp_auto->Grad().defined(),
                     false,
-                    phi::errors::Fatal("grad shoule not be defined now"));
+                    common::errors::Fatal("grad shoule not be defined now"));
   auto* grad_t = tmp_auto->MutableGrad();
   phi::DenseTensorMeta meta =
       phi::DenseTensorMeta(phi::DataType::FLOAT32, common::make_ddim({1, 2}));
diff --git a/test/cpp/inference/api/paddle_infer_api_errors_tester.cc b/test/cpp/inference/api/paddle_infer_api_errors_tester.cc
@@ -45,7 +45,7 @@ TEST(Status, pd_exception) {
   CHECK(!(status != status));
   PADDLE_ENFORCE_EQ(
       status.code(),
-      phi::ErrorCode::INVALID_ARGUMENT + 1,
+      common::ErrorCode::INVALID_ARGUMENT + 1,
       common::errors::InvalidArgument(
           "Required status.code() should be equal to INVALID_ARGUMENT + 1. "));
   LOG(INFO) << status.error_message();
diff --git a/test/cpp/phi/core/test_intrusive_ptr.cc b/test/cpp/phi/core/test_intrusive_ptr.cc
@@ -50,8 +50,9 @@ TEST(intrusive_ref_counter, async) {
 
 TEST(intrusive_ptr, default_ctor) {
   intrusive_ptr<SharedObject> p;
-  PADDLE_ENFORCE_EQ(
-      p == nullptr, true, phi::errors::Fatal("Input pointer is not a nullptr"));
+  PADDLE_ENFORCE_EQ(p == nullptr,
+                    true,
+                    common::errors::Fatal("Input pointer is not a nullptr"));
 }
 TEST(intrusive_ptr, private_ctor) {
   auto p = make_intrusive<SharedObject>();

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ class FleetWrapper {`
`289`	`289`	`std::string GetDistDesc() const {`
`290`	`290`	`PADDLE_ENFORCE_EQ(is_initialized_,`
`291`	`291`	`true,`
`292`		`- phi::errors::PermissionDenied(`
	`292`	`+ common::errors::PermissionDenied(`
`293`	`293`	`"FleetWrapper should be initialized first!!!"));`
`294`	`294`	`return dist_desc_;`
`295`	`295`	`}`