PaddlePaddle
diff --git a/‎paddle/fluid/pir/dialect/distributed/ir/dist_attribute.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/pir/dialect/distributed/ir/dist_attribute.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/pir/dialect/distributed/ir/dist_op.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎paddle/fluid/pir/dialect/distributed/ir/dist_op.cc
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎paddle/fluid/pir/dialect/distributed/transforms/dist_to_dense_pass.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/pir/dialect/distributed/transforms/dist_to_dense_pass.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/pir/dialect/kernel/ir/kernel_op.cc
Copy file name to clipboard
+18-18Lines changed: 18 additions & 18 deletions b/‎paddle/fluid/pir/dialect/kernel/ir/kernel_op.cc
Copy file name to clipboard
+18-18Lines changed: 18 additions & 18 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/api_gen.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pir/dialect/op_generator/api_gen.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pir/dialect/op_generator/op_build_gen.py
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎paddle/fluid/pir/dialect/op_generator/op_build_gen.py
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/op_infermeta_func_gen.py
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions b/‎paddle/fluid/pir/dialect/op_generator/op_infermeta_func_gen.py
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/op_interface_gen.py
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/pir/dialect/op_generator/op_interface_gen.py
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -77,13 +77,13 @@ phi::distributed::Placements TensorDistAttribute::placements() const {
     if (mesh_id >= 0) {
       auto& p = placements[mesh_id];
       if (p->is_shard()) {
-        PADDLE_THROW(phi::errors::PreconditionNotMet(
+        PADDLE_THROW(common::errors::PreconditionNotMet(
             "ProcessMesh dimension cann't be mapped to two  dimension of the "
             "same tensor: {%d} and {%d}",
             i,
             dynamic_cast<phi::distributed::Shard&>(*p).get_dim()));
       } else if (p->is_partial()) {
-        PADDLE_THROW(phi::errors::PreconditionNotMet(
+        PADDLE_THROW(common::errors::PreconditionNotMet(
             "ProcessMesh dimension {%d} cannot be both shard and partial!",
             mesh_id));
       }
 
@@ -85,16 +85,16 @@ void ShardTensorOp::VerifySig() {
             "op_dist_attr");
     PADDLE_ENFORCE_EQ(op_dist_attr.num_operands(),
                       0u,
-                      phi::errors::PreconditionNotMet(
+                      common::errors::PreconditionNotMet(
                           "The op_dist_attr input size must be equal to 0."));
 
-    PADDLE_ENFORCE_EQ(
-        op_dist_attr.num_results(),
-        num_results(),
-        phi::errors::PreconditionNotMet("The op_dist_attr output size %d must "
-                                        "be equal to op output size %d.",
-                                        op_dist_attr.num_results(),
-                                        num_results()));
+    PADDLE_ENFORCE_EQ(op_dist_attr.num_results(),
+                      num_results(),
+                      common::errors::PreconditionNotMet(
+                          "The op_dist_attr output size %d must "
+                          "be equal to op output size %d.",
+                          op_dist_attr.num_results(),
+                          num_results()));
   }
   VLOG(4) << "End Verifying for: ShardTensorOp.";
 }
@@ -271,7 +271,7 @@ void ReshardOp::VerifySig() {
 
     PADDLE_ENFORCE_EQ(op_dist_attr.num_results(),
                       num_results(),
-                      phi::errors::PreconditionNotMet(
+                      common::errors::PreconditionNotMet(
                           "The op_dist_attr output size of reshard op must be "
                           "equal to op output size."));
   }
 
@@ -93,7 +93,7 @@ void ProcessDistBlock(pir::Block* block) {
       auto array_attr = prev_op->attribute<pir::ArrayAttribute>("value");
       PADDLE_ENFORCE_EQ(array_attr.size(),
                         local_dims.size(),
-                        phi::errors::PreconditionNotMet(
+                        common::errors::PreconditionNotMet(
                             "The reshape's shape inputs element's size must "
                             "equal to result's dim size."));
       std::vector<pir::Attribute> new_dims;
@@ -134,7 +134,7 @@ void VerifyDenseBlock(pir::Block* block) {
       PADDLE_ENFORCE_EQ(
           IsDistType(result.type()),
           false,
-          phi::errors::PreconditionNotMet(
+          common::errors::PreconditionNotMet(
               "Block op [%s] still contain dist type.", op_item->name()));
     }
 
 
@@ -33,17 +33,17 @@ void PhiKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
@@ -72,17 +72,17 @@ void LegacyKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
@@ -110,17 +110,17 @@ void CustomKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
@@ -152,17 +152,17 @@ void OneDNNPhiKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
@@ -191,17 +191,17 @@ void OneDNNMixedPhiKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
@@ -231,17 +231,17 @@ void OneDNNLegacyKernelOp::VerifySig() {
 
   PADDLE_ENFORCE(attributes.count("op_name") > 0 &&
                      attributes.at("op_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: op_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_name") > 0 &&
                      attributes.at("kernel_name").isa<pir::StrAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_name is not right."));
 
   PADDLE_ENFORCE(attributes.count("kernel_key") > 0 &&
                      attributes.at("kernel_key").isa<KernelAttribute>(),
-                 phi::errors::PreconditionNotMet(
+                 common::errors::PreconditionNotMet(
                      "Type of attribute: kernel_key is not right."));
 }
 
 
@@ -126,7 +126,7 @@
     }}"""
 
 OP_DISPATCH_ERROR_TEMPLATE = """
-    PADDLE_THROW(phi::errors::Unimplemented(
+    PADDLE_THROW(common::errors::Unimplemented(
         "The kernel of ({op_name}) for input Value is unimplemented, please check the type of input Value."));"""
 
 
 
@@ -498,7 +498,7 @@ def GenBuildOutputs(
     {name} = phi::IntArray(std::vector<int64_t>({name}_size, -1));
     {name}.SetFromTensor(true);
   }} else {{
-    PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType"));
+    PADDLE_THROW(common::errors::Unimplemented("Only support VectorType or DenseTensorType"));
   }}\n"""
 
     CREATE_VECTOR_INT_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  std::vector<int64_t> {name};
@@ -518,7 +518,7 @@ def GenBuildOutputs(
     }}
     {name} = std::vector<int64_t>({name}_size, -1);
   }} else {{
-    PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType"));
+    PADDLE_THROW(common::errors::Unimplemented("Only support VectorType or DenseTensorType"));
   }}\n"""
 
     CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  phi::Scalar {name};
@@ -829,23 +829,23 @@ def gen_build_func_str(
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<{attr_ir_type}>().data();
 """
     GET_STR_ATTRIBUTES_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<pir::StrAttribute>().AsString();
 """
     GET_ARRAY_ATTRIBUTE_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name};
   for (size_t i = 0; i < attributes.at("{attribute_name}").dyn_cast<pir::ArrayAttribute>().size(); i++) {{
@@ -856,15 +856,15 @@ def gen_build_func_str(
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<paddle::dialect::IntArrayAttribute>().data().GetData();
 """
     GET_SCALAR_ATTRIBUTE_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<paddle::dialect::ScalarAttribute>().data().to<{attr_type}>();
 """
 
@@ -52,7 +52,7 @@
   pir::Value {input_name}_ = input_values[{index}]; (void){input_name}_;"""
 
 ENFORCE_INPUT_NUM_TEMPLATE = """
-  PADDLE_ENFORCE_EQ(input_values.size() == {op_input_name_list_size}, true, phi::errors::InvalidArgument(
+  PADDLE_ENFORCE_EQ(input_values.size() == {op_input_name_list_size}, true, common::errors::InvalidArgument(
       "Num of inputs is expected to be {op_input_name_list_size} but got %d.", input_values.size()));
 """
 
@@ -61,7 +61,7 @@
   if ({name}_.type().isa<{type}>()) {{
     {name} = {name}_.type().dyn_cast<{type}>(); (void){name};
   }} else {{
-    PADDLE_THROW(phi::errors::Unimplemented("Only support {type} or {allocated_type}"));
+    PADDLE_THROW(common::errors::Unimplemented("Only support {type} or {allocated_type}"));
   }}
 """
 
@@ -195,7 +195,7 @@ def GenBuildOutputsPart2(
     if ({name}_.type().isa<{type}>()) {{
       {name} = {name}_.type().dyn_cast<{type}>();
     }} else {{
-      PADDLE_THROW(phi::errors::Unimplemented("Only support {type} or {allocated_type}"));
+      PADDLE_THROW(common::errors::Unimplemented("Only support {type} or {allocated_type}"));
     }}
     ir_tensor_{name} = paddle::dialect::IrTensor(paddle::dialect::TransToPhiDataType({name}.dtype()),
                                                         {name}.dims(),
@@ -217,7 +217,7 @@ def GenBuildOutputsPart2(
     if ({name}_.type().isa<{type}>()) {{
       {name} = {name}_.type().dyn_cast<{type}>();
     }} else {{
-      PADDLE_THROW(phi::errors::Unimplemented("Only support {type}"));
+      PADDLE_THROW(common::errors::Unimplemented("Only support {type}"));
     }}
     ir_tensor_{name} = paddle::dialect::IrSparseCooTensor(paddle::dialect::TransToPhiDataType({name}.dtype()),
                                                         {name}.dims(),
@@ -239,7 +239,7 @@ def GenBuildOutputsPart2(
     if ({name}_.type().isa<{type}>()) {{
       {name} = {name}_.type().dyn_cast<{type}>();
     }} else {{
-      PADDLE_THROW(phi::errors::Unimplemented("Only support {type}"));
+      PADDLE_THROW(common::errors::Unimplemented("Only support {type}"));
     }}
     ir_tensor_{name} = paddle::dialect::IrSparseCsrTensor(paddle::dialect::TransToPhiDataType({name}.dtype()),
                                                         {name}.dims(),
@@ -262,7 +262,7 @@ def GenBuildOutputsPart2(
                                                                     {name}_type.lod(),
                                                                     {name}_type.offset()));
     }} else {{
-        PADDLE_THROW(phi::errors::Unimplemented("Only support DenseTensorType or AllocatedDenseTensorType"));
+        PADDLE_THROW(common::errors::Unimplemented("Only support DenseTensorType or AllocatedDenseTensorType"));
     }}
   }}
   std::vector<paddle::dialect::IrMetaTensor> vec_meta_{name};
@@ -289,7 +289,7 @@ def GenBuildOutputsPart2(
                                                                         {name}_type.lod(),
                                                                         {name}_type.offset()));
         }} else {{
-            PADDLE_THROW(phi::errors::Unimplemented("Only support DenseTensorType or AllocatedDenseTensorType"));
+            PADDLE_THROW(common::errors::Unimplemented("Only support DenseTensorType or AllocatedDenseTensorType"));
         }}
     }}
   }}
@@ -341,7 +341,7 @@ def GenBuildOutputsPart2(
     }}
     {name} = std::vector<int64_t>({name}_size, -1);
   }}else {{
-    PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType or AllocatedDenseTensorType"));
+    PADDLE_THROW(common::errors::Unimplemented("Only support VectorType or DenseTensorType or AllocatedDenseTensorType"));
   }}\n"""
 
     CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  phi::Scalar {name};
@@ -669,23 +669,23 @@ def GetAttributes(
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<{attr_ir_type}>().data();
 """
     GET_STR_ATTRIBUTES_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<pir::StrAttribute>().AsString();
 """
     GET_ARRAY_ATTRIBUTE_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name};
   for (size_t i = 0; i < attributes.at("{attribute_name}").dyn_cast<pir::ArrayAttribute>().size(); i++) {{
@@ -696,15 +696,15 @@ def GetAttributes(
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<paddle::dialect::IntArrayAttribute>().data().GetData();
 """
     GET_SCALAR_ATTRIBUTE_FROM_MAP_TEMPLATE = """
   PADDLE_ENFORCE_NE(
       attributes.find("{attribute_name}"),
       attributes.end(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "'{attribute_name}' Attribute is expected for {op_name}. "));
   {attr_type} {attribute_name} = attributes.at("{attribute_name}").dyn_cast<paddle::dialect::ScalarAttribute>().data().to<{attr_type}>();
 """
 
@@ -26,11 +26,11 @@
     PADDLE_ENFORCE_EQ(
       inputs_.size(),
       {inputs_size},
-      phi::errors::InvalidArgument("{op_name} op's inputs size should be {inputs_size}, but now is %d.", inputs_.size()));
+      common::errors::InvalidArgument("{op_name} op's inputs size should be {inputs_size}, but now is %d.", inputs_.size()));
     PADDLE_ENFORCE_EQ(
       outputs.size(),
       {outputs_size},
-      phi::errors::InvalidArgument("{op_name} op's outputs size should be {outputs_size}, but now is %d.", outputs.size()));
+      common::errors::InvalidArgument("{op_name} op's outputs size should be {outputs_size}, but now is %d.", outputs.size()));
 """
 
 OP_VJP_FORWARD_INPUT_OR_OUTPUT_TEMPLATE = """