Clean platform/errors.h [fluid_ops] errors.h (#66367)

co63oc · web-flow · commit aa57b184391c · 2024-07-25T10:38:59.000+08:00
* Fix

* Fix

* Fix

* Fix
diff --git a/paddle/fluid/distributed/fleet_executor/carrier.h b/paddle/fluid/distributed/fleet_executor/carrier.h
@@ -22,14 +22,14 @@
 #include <unordered_map>
 #include <vector>
 
+#include "paddle/common/errors.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/distributed/fleet_executor/interceptor.h"
 #include "paddle/fluid/distributed/fleet_executor/interceptor_message.pb.h"
 #include "paddle/fluid/distributed/fleet_executor/task_loop_thread_pool.h"
 #include "paddle/fluid/framework/variable.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/place.h"
 
 namespace paddle {
diff --git a/paddle/fluid/distributed/fleet_executor/cond_interceptor.cc b/paddle/fluid/distributed/fleet_executor/cond_interceptor.cc
@@ -18,7 +18,6 @@
 #include "paddle/fluid/distributed/fleet_executor/task_node.h"
 #include "paddle/fluid/framework/executor_gc_helper.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/place.h"
 #include "paddle/phi/core/dense_tensor.h"
 
diff --git a/paddle/fluid/distributed/fleet_executor/interceptor.h b/paddle/fluid/distributed/fleet_executor/interceptor.h
@@ -22,12 +22,12 @@
 #include <thread>
 #include <vector>
 
+#include "paddle/common/errors.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/distributed/fleet_executor/interceptor_message.pb.h"
 #include "paddle/fluid/framework/blocking_queue.h"
 #include "paddle/fluid/framework/new_executor/interpretercore.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/place.h"
 #include "paddle/pir/include/core/program.h"
 #include "paddle/pir/include/core/value.h"
diff --git a/paddle/fluid/distributed/fleet_executor/message_bus.h b/paddle/fluid/distributed/fleet_executor/message_bus.h
@@ -26,10 +26,10 @@
 #include "paddle/fluid/distributed/fleet_executor/message_service.h"
 #endif
 
+#include "paddle/common/errors.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/distributed/fleet_executor/interceptor_message.pb.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 
 namespace paddle {
 namespace distributed {
diff --git a/paddle/fluid/distributed/fleet_executor/task_loop.cc b/paddle/fluid/distributed/fleet_executor/task_loop.cc
@@ -14,8 +14,8 @@
 
 #include "paddle/fluid/distributed/fleet_executor/task_loop.h"
 
+#include "paddle/common/errors.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 
 namespace paddle::distributed {
 
diff --git a/paddle/fluid/distributed/fleet_executor/task_loop_thread.cc b/paddle/fluid/distributed/fleet_executor/task_loop_thread.cc
@@ -14,9 +14,9 @@
 
 #include "paddle/fluid/distributed/fleet_executor/task_loop_thread.h"
 
+#include "paddle/common/errors.h"
 #include "paddle/fluid/distributed/fleet_executor/task_loop.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 
 namespace paddle::distributed {
 
diff --git a/paddle/fluid/distributed/fleet_executor/task_loop_thread_pool.cc b/paddle/fluid/distributed/fleet_executor/task_loop_thread_pool.cc
@@ -14,10 +14,10 @@
 
 #include "paddle/fluid/distributed/fleet_executor/task_loop_thread_pool.h"
 
+#include "paddle/common/errors.h"
 #include "paddle/fluid/distributed/fleet_executor/task_loop.h"
 #include "paddle/fluid/distributed/fleet_executor/task_loop_thread.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 
 namespace paddle::distributed {
 
diff --git a/paddle/fluid/eager/accumulation/accumulation_node.cc b/paddle/fluid/eager/accumulation/accumulation_node.cc
@@ -15,13 +15,13 @@
 #include "paddle/fluid/eager/accumulation/accumulation_node.h"
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/eager/api/generated/eager_generated/forwards/dygraph_functions.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/utils.h"
 #include "paddle/fluid/imperative/gradient_accumulator.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/api/all.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
diff --git a/paddle/fluid/eager/api/generated/eager_generated/backwards/scale_node.cc b/paddle/fluid/eager/api/generated/eager_generated/backwards/scale_node.cc
@@ -15,11 +15,11 @@
 #include "paddle/fluid/eager/api/generated/eager_generated/backwards/scale_node.h"
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/eager/api/utils/global_utils.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/kernels/scale_kernel.h"
 
 namespace egr {
diff --git a/paddle/fluid/eager/general_grad.h b/paddle/fluid/eager/general_grad.h
@@ -17,14 +17,14 @@
 #include <deque>
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/eager/accumulation/accumulation_node.h"
 #include "paddle/fluid/eager/api/utils/hook_utils.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/grad_node_info.h"
 #include "paddle/fluid/eager/grad_tensor_holder.h"
 #include "paddle/fluid/eager/utils.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/profiler.h"
 #include "paddle/fluid/platform/profiler/event_tracing.h"
 
diff --git a/paddle/fluid/eager/grad_node_info.cc b/paddle/fluid/eager/grad_node_info.cc
@@ -15,6 +15,7 @@
 #include "paddle/fluid/eager/grad_node_info.h"
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/eager/accumulation/accumulation_node.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/utils.h"
@@ -23,7 +24,6 @@
 #include "paddle/fluid/framework/data_type_transform.h"
 #include "paddle/fluid/framework/var_type.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/core/dense_tensor.h"
 
diff --git a/paddle/fluid/eager/pylayer/py_layer_node.cc b/paddle/fluid/eager/pylayer/py_layer_node.cc
@@ -15,10 +15,10 @@
 #include "paddle/fluid/eager/pylayer/py_layer_node.h"
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/pybind/eager.h"
 #include "paddle/fluid/pybind/eager_utils.h"
 #include "paddle/phi/api/all.h"
diff --git a/paddle/fluid/framework/attribute.h b/paddle/fluid/framework/attribute.h
@@ -23,10 +23,10 @@ limitations under the License. */
 #include <unordered_set>
 #include <vector>
 
+#include "paddle/common/errors.h"
 #include "paddle/fluid/framework/framework.pb.h"
 #include "paddle/fluid/framework/type_defs.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/scalar.h"
 #include "paddle/utils/any.h"
 #include "paddle/utils/variant.h"
diff --git a/paddle/fluid/framework/ir/cost_model.cc b/paddle/fluid/framework/ir/cost_model.cc
@@ -16,9 +16,9 @@
 
 #include <memory>
 
+#include "paddle/common/errors.h"
 #include "paddle/fluid/framework/executor.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/place.h"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/ir/cost_model_test.cc b/paddle/fluid/framework/ir/cost_model_test.cc
@@ -15,10 +15,10 @@
 #include "paddle/fluid/framework/ir/cost_model.h"
 
 #include "gtest/gtest.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/event.h"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/new_executor/garbage_collector/garbage_collector.h b/paddle/fluid/framework/new_executor/garbage_collector/garbage_collector.h
@@ -15,12 +15,12 @@
 
 #include <queue>
 
+#include "paddle/common/errors.h"
 #include "paddle/common/flags.h"
 #include "paddle/fluid/framework/new_executor/instruction/instruction_base.h"
 #include "paddle/fluid/memory/allocation/spin_lock.h"
 #include "paddle/fluid/platform/device_event.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 
 COMMON_DECLARE_bool(fast_eager_deletion_mode);
 COMMON_DECLARE_bool(new_executor_use_cuda_graph);
diff --git a/paddle/fluid/inference/api/analysis_config.cc b/paddle/fluid/inference/api/analysis_config.cc
@@ -18,14 +18,14 @@
 #include <unordered_set>
 
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/common/flags.h"
 #include "paddle/fluid/inference/api/helper.h"
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
 #include "paddle/fluid/inference/api/paddle_pass_builder.h"
 #include "paddle/fluid/inference/utils/table_printer.h"
 #include "paddle/fluid/platform/device/gpu/gpu_info.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/backends/cpu/cpu_info.h"
 #include "paddle/utils/string/split.h"
 
diff --git a/paddle/fluid/memory/stats.h b/paddle/fluid/memory/stats.h
@@ -18,9 +18,9 @@ limitations under the License. */
 #include <map>
 #include <string>
 
+#include "paddle/common/errors.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/phi/common/place.h"
 #include "paddle/phi/common/thread_data_registry.h"
 #include "paddle/utils/string/string_helper.h"
diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
@@ -61,9 +61,9 @@ limitations under the License. */
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 #include "glog/logging.h"
+#include "paddle/common/errors.h"
 #include "paddle/common/flags.h"
 #include "paddle/common/macros.h"
-#include "paddle/fluid/platform/errors.h"
 
 #include "paddle/phi/common/port.h"
 #include "paddle/utils/string/printf.h"
diff --git a/paddle/fluid/platform/errors.h b/paddle/fluid/platform/errors.h
diff --git a/paddle/fluid/platform/errors_test.cc b/paddle/fluid/platform/errors_test.cc
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/fluid/platform/errors.h"
+#include "paddle/common/errors.h"
 
 #include <string>
 
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 paddle::platform::error::INVALID_ARGUMENT:
+        case phi::ErrorCode::INVALID_ARGUMENT:
           PyErr_SetString(PyExc_ValueError, e.what());
           break;
-        case paddle::platform::error::NOT_FOUND:
-        case paddle::platform::error::ALREADY_EXISTS:
-        case paddle::platform::error::PRECONDITION_NOT_MET:
-        case paddle::platform::error::PERMISSION_DENIED:
-        case paddle::platform::error::EXECUTION_TIMEOUT:
-        case paddle::platform::error::UNAVAILABLE:
+        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:
           PyErr_SetString(PyExc_RuntimeError, e.what());
           break;
-        case paddle::platform::error::OUT_OF_RANGE:
+        case phi::ErrorCode::OUT_OF_RANGE:
           PyErr_SetString(PyExc_IndexError, e.what());
           break;
-        case paddle::platform::error::RESOURCE_EXHAUSTED:
+        case phi::ErrorCode::RESOURCE_EXHAUSTED:
           PyErr_SetString(PyExc_MemoryError, e.what());
           break;
-        case paddle::platform::error::UNIMPLEMENTED:
+        case phi::ErrorCode::UNIMPLEMENTED:
           PyErr_SetString(PyExc_NotImplementedError, e.what());
           break;
-        case paddle::platform::error::FATAL:
+        case phi::ErrorCode::FATAL:
           PyErr_SetString(PyExc_SystemError, e.what());
           break;
-        case paddle::platform::error::EXTERNAL:
+        case phi::ErrorCode::EXTERNAL:
           PyErr_SetString(PyExc_OSError, e.what());
           break;
-        case paddle::platform::error::INVALID_TYPE:
+        case phi::ErrorCode::INVALID_TYPE:
           PyErr_SetString(PyExc_TypeError, e.what());
           break;
         default:
@@ -100,33 +100,33 @@ void ThrowExceptionToPython(std::exception_ptr p) {
     PyErr_SetString(PyExc_MemoryError, e.what());
   } catch (const platform::EnforceNotMet& e) {
     switch (e.code()) {
-      case paddle::platform::error::INVALID_ARGUMENT:
+      case phi::ErrorCode::INVALID_ARGUMENT:
         PyErr_SetString(PyExc_ValueError, e.what());
         break;
-      case paddle::platform::error::NOT_FOUND:
-      case paddle::platform::error::ALREADY_EXISTS:
-      case paddle::platform::error::PRECONDITION_NOT_MET:
-      case paddle::platform::error::PERMISSION_DENIED:
-      case paddle::platform::error::EXECUTION_TIMEOUT:
-      case paddle::platform::error::UNAVAILABLE:
+      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:
         PyErr_SetString(PyExc_RuntimeError, e.what());
         break;
-      case paddle::platform::error::OUT_OF_RANGE:
+      case phi::ErrorCode::OUT_OF_RANGE:
         PyErr_SetString(PyExc_IndexError, e.what());
         break;
-      case paddle::platform::error::RESOURCE_EXHAUSTED:
+      case phi::ErrorCode::RESOURCE_EXHAUSTED:
         PyErr_SetString(PyExc_MemoryError, e.what());
         break;
-      case paddle::platform::error::UNIMPLEMENTED:
+      case phi::ErrorCode::UNIMPLEMENTED:
         PyErr_SetString(PyExc_NotImplementedError, e.what());
         break;
-      case paddle::platform::error::FATAL:
+      case phi::ErrorCode::FATAL:
         PyErr_SetString(PyExc_SystemError, e.what());
         break;
-      case paddle::platform::error::EXTERNAL:
+      case phi::ErrorCode::EXTERNAL:
         PyErr_SetString(PyExc_OSError, e.what());
         break;
-      case paddle::platform::error::INVALID_TYPE:
+      case phi::ErrorCode::INVALID_TYPE:
         PyErr_SetString(PyExc_TypeError, e.what());
         break;
       default:
diff --git a/paddle/fluid/pybind/global_value_getter_setter.cc b/paddle/fluid/pybind/global_value_getter_setter.cc
@@ -22,11 +22,11 @@
 #include <utility>
 #include <vector>
 
+#include "paddle/common/errors.h"
 #include "paddle/common/flags.h"
 #include "paddle/common/macros.h"
 #include "paddle/fluid/framework/python_headers.h"
 #include "paddle/fluid/platform/enforce.h"
-#include "paddle/fluid/platform/errors.h"
 #include "pybind11/stl.h"
 
 // FIXME(zengjinle): these 2 flags may be removed by the linker when compiling
diff --git a/test/cpp/fluid/framework/operator_test.cc b/test/cpp/fluid/framework/operator_test.cc
@@ -14,9 +14,9 @@ limitations under the License. */
 #include "paddle/fluid/framework/operator.h"
 
 #include "gtest/gtest.h"
+#include "paddle/common/errors.h"
 #include "paddle/fluid/framework/op_info.h"
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/fluid/platform/errors.h"
 #include "paddle/fluid/platform/init.h"
 
 PD_DECLARE_bool(enable_unused_var_check);
diff --git a/test/cpp/inference/api/paddle_infer_api_errors_tester.cc b/test/cpp/inference/api/paddle_infer_api_errors_tester.cc
diff --git a/test/cpp/inference/tensorrt/test_tensorrt_engine_instruction.cc b/test/cpp/inference/tensorrt/test_tensorrt_engine_instruction.cc
diff --git a/test/cpp/inference/test_helper.h b/test/cpp/inference/test_helper.h
diff --git a/test/cpp/pir/core/ir_program_test.cc b/test/cpp/pir/core/ir_program_test.cc
diff --git a/test/cpp/pir/pass/pass_manager_test.cc b/test/cpp/pir/pass/pass_manager_test.cc
diff --git a/test/cpp/pir/pattern_rewrite/pattern_rewrite_test.cc b/test/cpp/pir/pattern_rewrite/pattern_rewrite_test.cc
diff --git a/test/cpp/pir/tools/test_op.cc b/test/cpp/pir/tools/test_op.cc
diff --git a/test/deprecated/cpp/inference/api/analyzer_bert_tester.cc b/test/deprecated/cpp/inference/api/analyzer_bert_tester.cc
