Simplify "phi::errors" to "errors" [fluid_ops] (#68035)

co63oc · web-flow · commit 6eaae6be92fe · 2024-09-23T19:13:47.000+08:00
diff --git a/paddle/phi/infermeta/spmd_rules/moe_combine.cc b/paddle/phi/infermeta/spmd_rules/moe_combine.cc
@@ -42,21 +42,21 @@ SpmdInfo MoECombineFwdInferSpmd(const DistMetaTensor& x,
   PADDLE_ENFORCE_EQ(
       x_shape.size(),
       2,
-      phi::errors::InvalidArgument(
+      errors::InvalidArgument(
           "x should be a 2-D tensor, but got x_shape.size() == %d",
           x_shape.size()));
-  PADDLE_ENFORCE_EQ(combine_weights_shape.size(),
-                    2,
-                    phi::errors::InvalidArgument(
-                        "combine_weights should be a 2-D tensor, but got "
-                        "combine_weights_shape.size() == %d",
-                        combine_weights.size()));
-  PADDLE_ENFORCE_EQ(scatter_index_shape.size(),
-                    2,
-                    phi::errors::InvalidArgument(
-                        "scatter_index should be a 2-D tensor, but got "
-                        "scatter_index_shape.size() == %d",
-                        scatter_index.size()));
+  PADDLE_ENFORCE_EQ(
+      combine_weights_shape.size(),
+      2,
+      errors::InvalidArgument("combine_weights should be a 2-D tensor, but got "
+                              "combine_weights_shape.size() == %d",
+                              combine_weights.size()));
+  PADDLE_ENFORCE_EQ(
+      scatter_index_shape.size(),
+      2,
+      errors::InvalidArgument("scatter_index should be a 2-D tensor, but got "
+                              "scatter_index_shape.size() == %d",
+                              scatter_index.size()));
 
   // Step 1: infer sharding
   std::string x_axes = "sh", combine_weights_axes = "sk",
@@ -132,26 +132,26 @@ SpmdInfo MoECombineBwdInferSpmd(const DistMetaTensor& x,
   PADDLE_ENFORCE_EQ(
       x_shape.size(),
       2,
-      phi::errors::InvalidArgument(
+      errors::InvalidArgument(
           "x should be a 2-D tensor, but got x_shape.size() == %d",
           x_shape.size()));
 
-  PADDLE_ENFORCE_EQ(combine_weights_shape.size(),
-                    2,
-                    phi::errors::InvalidArgument(
-                        "combine_weights should be a 2-D tensor, but got "
-                        "combine_weights_shape.size() == %d",
-                        combine_weights_shape.size()));
-  PADDLE_ENFORCE_EQ(scatter_index_shape.size(),
-                    2,
-                    phi::errors::InvalidArgument(
-                        "scatter_index should be a 2-D tensor, but got "
-                        "scatter_index_shape.size() == %d",
-                        scatter_index_shape.size()));
+  PADDLE_ENFORCE_EQ(
+      combine_weights_shape.size(),
+      2,
+      errors::InvalidArgument("combine_weights should be a 2-D tensor, but got "
+                              "combine_weights_shape.size() == %d",
+                              combine_weights_shape.size()));
+  PADDLE_ENFORCE_EQ(
+      scatter_index_shape.size(),
+      2,
+      errors::InvalidArgument("scatter_index should be a 2-D tensor, but got "
+                              "scatter_index_shape.size() == %d",
+                              scatter_index_shape.size()));
   PADDLE_ENFORCE_EQ(
       grad_y_shape.size(),
       2,
-      phi::errors::InvalidArgument(
+      errors::InvalidArgument(
           "grad_y should be a 2-D tensor, but got grad_y_shape.size() == %d",
           grad_y_shape.size()));
 
diff --git a/paddle/phi/infermeta/spmd_rules/moe_gate_dispatch.cc b/paddle/phi/infermeta/spmd_rules/moe_gate_dispatch.cc
@@ -43,15 +43,15 @@ SpmdInfo MoEGateDispatchFwdInferSpmd(const DistMetaTensor& x,
   PADDLE_ENFORCE_EQ(
       x_shape.size(),
       2,
-      phi::errors::InvalidArgument(
+      errors::InvalidArgument(
           "x should be a 2-D tensor, but got x_shape.size() == %d",
           x_shape.size()));
   PADDLE_ENFORCE_EQ(
       gate_logits_shape.size(),
       2,
-      phi::errors::InvalidArgument("gate_logits should be a 2-D tensor, but "
-                                   "got gate_logits_shape.size() == %d",
-                                   gate_logits_shape.size()));
+      errors::InvalidArgument("gate_logits should be a 2-D tensor, but "
+                              "got gate_logits_shape.size() == %d",
+                              gate_logits_shape.size()));
   // infer axes dims_mapping
   std::string x_axes = "sh";
   std::string gate_logits_axes = "se";
@@ -138,33 +138,33 @@ SpmdInfo MoEGateDispatchBwdInferSpmd(const DistMetaTensor& combine_weights,
   EXTRACT_SHAPE_AND_DIST_ATTR_WITH_DIM_CK(grad_y);
   EXTRACT_SHAPE_AND_DIST_ATTR_WITH_DIM_CK(grad_combine_weights);
   // do some check
-  PADDLE_ENFORCE_EQ(combine_weights_shape.size(),
-                    2,
-                    phi::errors::InvalidArgument(
-                        "combine_weights should be a 2-D tensor, but "
-                        "got combine_weights_shape.size() == %d",
-                        combine_weights_shape.size()));
+  PADDLE_ENFORCE_EQ(
+      combine_weights_shape.size(),
+      2,
+      errors::InvalidArgument("combine_weights should be a 2-D tensor, but "
+                              "got combine_weights_shape.size() == %d",
+                              combine_weights_shape.size()));
   PADDLE_ENFORCE_EQ(
       scatter_index_shape.size(),
       2,
-      phi::errors::InvalidArgument("scatter_index should be a 2-D tensor, but "
-                                   "got scatter_index_shape.size() == %d",
-                                   scatter_index_shape.size()));
+      errors::InvalidArgument("scatter_index should be a 2-D tensor, but "
+                              "got scatter_index_shape.size() == %d",
+                              scatter_index_shape.size()));
   PADDLE_ENFORCE_EQ(
       expert_id_shape.size(),
       2,
-      phi::errors::InvalidArgument("expert_id should be a 2-D tensor, but "
-                                   "got expert_id_shape.size() == %d",
-                                   expert_id_shape.size()));
+      errors::InvalidArgument("expert_id should be a 2-D tensor, but "
+                              "got expert_id_shape.size() == %d",
+                              expert_id_shape.size()));
   PADDLE_ENFORCE_EQ(
       grad_y_shape.size(),
       3,
-      phi::errors::InvalidArgument("grad_y should be a 3-D tensor, but "
-                                   "got grad_y_shape.size() == %d",
-                                   grad_y_shape.size()));
+      errors::InvalidArgument("grad_y should be a 3-D tensor, but "
+                              "got grad_y_shape.size() == %d",
+                              grad_y_shape.size()));
   PADDLE_ENFORCE_EQ(grad_combine_weights_shape.size(),
                     2,
-                    phi::errors::InvalidArgument(
+                    errors::InvalidArgument(
                         "grad_combine_weights should be a 2-D tensor, but "
                         "got grad_combine_weights_shape.size() == %d",
                         grad_combine_weights_shape.size()));
diff --git a/paddle/phi/kernels/fusion/gpu/fused_gate_attention_kernel.cu b/paddle/phi/kernels/fusion/gpu/fused_gate_attention_kernel.cu
@@ -221,11 +221,10 @@ void FusedGateAttentionOpKernel(
     PADDLE_ENFORCE_EQ(
         !key || query == key || query->data<T>() == key->data<T>(),
         true,
-        phi::errors::InvalidArgument(
-            "key is expected to be nullptr or the same as "
-            "query, but received key=%p, query=%p.",
-            key,
-            query));
+        errors::InvalidArgument("key is expected to be nullptr or the same as "
+                                "query, but received key=%p, query=%p.",
+                                key,
+                                query));
 
     // 1. Merged QKV Matmul: einsum(nbhqk,nbkhc -> nbqhc)
     phi::DenseTensor *qkv_out = config.GetQKVOut();
diff --git a/paddle/phi/kernels/fusion/gpu/fused_multi_transformer_op.cu.h b/paddle/phi/kernels/fusion/gpu/fused_multi_transformer_op.cu.h
@@ -1462,7 +1462,7 @@ void dispatch_mbmmha_impl_headsize(
       break;
     default:
       PADDLE_THROW(
-          phi::errors::Unimplemented("Dim_head = %d is unsupport!", dim_head));
+          errors::Unimplemented("Dim_head = %d is unsupport!", dim_head));
   }
 }
 
diff --git a/paddle/phi/kernels/gpu/matrix_rank_tol_kernel.cu b/paddle/phi/kernels/gpu/matrix_rank_tol_kernel.cu
@@ -466,15 +466,15 @@ void MatrixRankAtolRtolKernel(const Context& dev_ctx,
   PADDLE_ENFORCE_NE(
       rows,
       0,
-      phi::errors::InvalidArgument("The input Tensor x's shape[-2] should not "
-                                   "be 0, but shape is %s now.",
-                                   dim_x));
+      errors::InvalidArgument("The input Tensor x's shape[-2] should not "
+                              "be 0, but shape is %s now.",
+                              dim_x));
   PADDLE_ENFORCE_NE(
       cols,
       0,
-      phi::errors::InvalidArgument("The input Tensor x's shape[-1] should not "
-                                   "be 0, but shape is %s now.",
-                                   dim_x));
+      errors::InvalidArgument("The input Tensor x's shape[-1] should not "
+                              "be 0, but shape is %s now.",
+                              dim_x));
   int k = std::min(rows, cols);
   auto numel = x.numel();
   int batches = numel / (rows * cols);

Original file line number	Diff line number	Diff line change
`@@ -1462,7 +1462,7 @@ void dispatch_mbmmha_impl_headsize(`
`1462`	`1462`	`break;`
`1463`	`1463`	`default:`
`1464`	`1464`	`PADDLE_THROW(`
`1465`		`- phi::errors::Unimplemented("Dim_head = %d is unsupport!", dim_head));`
	`1465`	`+ errors::Unimplemented("Dim_head = %d is unsupport!", dim_head));`
`1466`	`1466`	`}`
`1467`	`1467`	`}`
`1468`	`1468`