PaddlePaddle
diff --git a/‎paddle/fluid/pir/dialect/distributed/ir/dist_type.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎paddle/fluid/pir/dialect/distributed/ir/dist_type.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/op_gen.py
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎paddle/fluid/pir/dialect/op_generator/op_gen.py
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎paddle/fluid/pir/dialect/op_generator/op_verify_gen.py
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎paddle/fluid/pir/dialect/op_generator/op_verify_gen.py
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.cc
Copy file name to clipboard
+39Lines changed: 39 additions & 0 deletions b/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.cc
Copy file name to clipboard
+39Lines changed: 39 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+3-225Lines changed: 3 additions & 225 deletions b/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+3-225Lines changed: 3 additions & 225 deletions
@@ -40,6 +40,9 @@ DistDenseTensorType DistDenseTensorType::get(
 
 common::DDim InferLocalDDim(const common::DDim& global_ddim,
                             TensorDistAttribute dist_attr) {
+  if (global_ddim.size() == -1 || global_ddim.size() == 0) {
+    return global_ddim;
+  }
   auto& mesh_dim = dist_attr.process_mesh_attr().shape();
   auto& dim_mapping = dist_attr.dims_mapping();
   PADDLE_ENFORCE_EQ(global_ddim.size(),
 
@@ -48,6 +48,7 @@
 # for some unittests these need to export symbol op compiled with dynamic lib.
 need_export_symbol_op_list = [
     'Add_Op',
+    'AddNOp',
     'AbsOp',
     'FullOp',
     'UniformOp',
@@ -335,7 +336,6 @@ class {TEST_API} {op_name} : public pir::Op<{op_name}{interfaces}{traits}> {{
 }
 
 PD_MANUAL_OP_LIST = {
-    'add_n',
     'add_n_',
     'split_grad',
     'expand',
@@ -1257,6 +1257,8 @@ def AutoCodeGen(
     op_to_multi_kernels_list = []
     sp_op_to_multi_kernels_list = []
     for key, op_info in op_info_items.items():
+        if key == "add_n_grad":
+            continue
         # get op inputs info
         op_input_name_list = op_info.input_name_list
         op_input_optional_list = op_info.input_optional_list
 
@@ -272,6 +272,10 @@ def gen_verify_func_str(
     outputs_type_check_str = gen_outputs_type_check_str(
         op_output_type_list, op_output_optional_list
     )
+    # skip AddNOp type check, because it would be select rows.
+    if op_class_name == "AddNOp":
+        inputs_type_check_str = ""
+        outputs_type_check_str = ""
 
     return OP_VERIFY_TEMPLATE.format(
         op_name=op_class_name,
 
@@ -21,6 +21,45 @@
 
 namespace paddle::dialect {
 
+bool AddNOpInferSymbolicShape(pir::Operation *op,
+                              pir::InferSymbolicShapeContext *infer_context) {
+  const auto &input_list_shape =
+      infer_context->GetShapeOrDataForValue(op->operand_source(0));
+  PADDLE_ENFORCE_EQ(
+      input_list_shape.isa<symbol::TensorListShapeOrDataDimExprs>(),
+      true,
+      common::errors::InvalidArgument(
+          "The type of inputs shape should be TensorListShapeOrDataDimExprs"));
+  const auto &inputs_shape =
+      input_list_shape.dyn_cast<symbol::TensorListShapeOrDataDimExprs>();
+  PADDLE_ENFORCE_GT(
+      inputs_shape.size(),
+      0,
+      common::errors::InvalidArgument(
+          "The input tensor X's dimensions of AddNOp "
+          "should be larger than 0. But received X's dimensions %d.",
+          inputs_shape.size()));
+  symbol::TensorShapeOrDataDimExprs candidate_shape = inputs_shape.front();
+  for (size_t i = 1; i < inputs_shape.size(); ++i) {
+    // 0D tensor
+    if (inputs_shape[i].shape().size() == 0) {
+      continue;
+    }
+    if (candidate_shape.shape().size() == 0) {
+      candidate_shape = inputs_shape[i];
+      continue;
+    }
+    for (size_t j = 0; j < candidate_shape.shape().size(); ++j) {
+      infer_context->AddEqualCstr(candidate_shape.shape()[j],
+                                  inputs_shape[i].shape()[j]);
+    }
+  }
+  infer_context->SetShapeOrDataForValue(
+      op->result(0), symbol::ShapeOrDataDimExprs{candidate_shape});
+
+  return true;
+}
+
 bool BicubicInterpOpInferSymbolicShape(
     pir::Operation *op, pir::InferSymbolicShapeContext *infer_context) {
   const symbol::ShapeOrDataDimExprs &x =
 
@@ -18,6 +18,7 @@
 
 namespace paddle::dialect {
 
+OP_DECLARE_INFER_SYMBOLIC_SHAPE(AddN)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(BicubicInterp)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(BilinearInterp)
 OP_DECLARE_INFER_SYMBOLIC_SHAPE(Concat)
 
@@ -13,7 +13,7 @@
 // limitations under the License.
 #ifdef GET_OP_LIST
 #undef GET_OP_LIST
-paddle::dialect::AddNOp, paddle::dialect::AddN_Op, paddle::dialect::AddNArrayOp,
+paddle::dialect::AddN_Op, paddle::dialect::AddNArrayOp,
     paddle::dialect::FusedGemmEpilogueOp, paddle::dialect::AssignOut_Op,
     paddle::dialect::FusedGemmEpilogueGradOp, paddle::dialect::SplitGradOp,
     paddle::dialect::ExpandOp, paddle::dialect::CreateArrayOp,
@@ -26,9 +26,9 @@ paddle::dialect::AddNOp, paddle::dialect::AddN_Op, paddle::dialect::AddNArrayOp,
     paddle::dialect::ShapeBroadcastOp, paddle::dialect::MemcpyD2hMultiIoOp,
     paddle::dialect::ArrayPopOp
 #else
-
 #include "paddle/fluid/pir/dialect/operator/ir/manual_op.h"
 #include "paddle/fluid/pir/dialect/kernel/ir/kernel_type.h"
+#include "paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape/multiary_infer_sym.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_meta_tensor.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_selected_rows.h"
 #include "paddle/fluid/pir/dialect/operator/ir/ir_tensor.h"
@@ -57,227 +57,6 @@ paddle::dialect::AddNOp, paddle::dialect::AddN_Op, paddle::dialect::AddNArrayOp,
 #endif
 
 namespace paddle::dialect {
-
-OpInfoTuple AddNOp::GetOpInfo() {
-  std::vector<paddle::dialect::OpInputInfo> inputs = {
-      OpInputInfo("inputs",
-                  "pir::VectorType<paddle::dialect::DenseTensorType>",
-                  false,
-                  false,
-                  false,
-                  true)};
-  std::vector<paddle::dialect::OpAttributeInfo> attributes = {};
-  std::vector<paddle::dialect::OpOutputInfo> outputs = {
-      OpOutputInfo("out", "paddle::dialect::DenseTensorType", false, false)};
-  paddle::dialect::OpRunTimeInfo run_time_info = OpRunTimeInfo(
-      "AddNInferMeta", {"inputs"}, "add_n", {"inputs"}, {}, {}, {}, {});
-
-  return std::make_tuple(inputs, attributes, outputs, run_time_info, "add_n");
-}
-
-void AddNOp::VerifySig() {
-  VLOG(4) << "Start Verifying inputs, outputs and attributes for: AddNOp.";
-  VLOG(4) << "Verifying inputs:";
-  {
-    auto input_size = num_operands();
-    PADDLE_ENFORCE_EQ(
-        input_size,
-        1u,
-        phi::errors::PreconditionNotMet(
-            "The size %d of inputs must be equal to 1.", input_size));
-    if (auto vec_type =
-            (*this)->operand(0).type().dyn_cast<pir::VectorType>()) {
-      for (size_t i = 0; i < vec_type.size(); ++i) {
-        PADDLE_ENFORCE(vec_type[i].isa<paddle::dialect::DenseTensorType>() ||
-                           vec_type[i].isa<paddle::dialect::SelectedRowsType>(),
-                       phi::errors::PreconditionNotMet(
-                           "Type validation failed for the 0th input."));
-      }
-    } else {
-      PADDLE_ENFORCE(
-          (*this)->operand(0).type().isa<paddle::dialect::DenseTensorType>() ||
-              (*this)
-                  ->operand(0)
-                  .type()
-                  .isa<paddle::dialect::SelectedRowsType>(),
-          phi::errors::PreconditionNotMet(
-              "Type validation failed for the 0th input."));
-    }
-  }
-  VLOG(4) << "Verifying attributes:";
-  {
-    // Attributes num is 0, not need to check attributes type.
-  }
-  VLOG(4) << "Verifying outputs:";
-  {
-    auto output_size = num_results();
-    PADDLE_ENFORCE_EQ(
-        output_size,
-        1u,
-        phi::errors::PreconditionNotMet(
-            "The size %d of outputs must be equal to 1.", output_size));
-    PADDLE_ENFORCE(
-        (*this)->result(0).type().isa<paddle::dialect::DenseTensorType>() ||
-            (*this)->result(0).type().isa<paddle::dialect::SelectedRowsType>(),
-        phi::errors::PreconditionNotMet(
-            "Type validation failed for the 0th output."));
-  }
-  VLOG(4) << "End Verifying for: AddNOp.";
-}
-
-void AddNOp::Build(pir::Builder &builder,             // NOLINT
-                   pir::OperationArgument &argument,  // NOLINT
-                   pir::Value inputs) {
-  VLOG(4) << "Start build AddNOp";
-
-  VLOG(4) << "Builder construction inputs";
-  std::vector<pir::Value> argument_inputs = {inputs};
-  argument.AddInput(inputs);
-
-  VLOG(4) << "Builder construction attributes";
-  pir::AttributeMap argument_attributes = {};
-  std::vector<pir::Type> argument_outputs =
-      AddNOp::InferMeta(argument_inputs, &argument_attributes);
-
-  argument.AddOutputs(argument_outputs.begin(), argument_outputs.end());
-  argument.AddAttributes(argument_attributes);
-  ::pir::PassStopGradientsDefaultly(argument);
-}
-
-void AddNOp::InferMeta(phi::InferMetaContext *infer_meta) {
-  auto fn = PD_INFER_META(phi::AddNInferMeta);
-  fn(infer_meta);
-}
-
-std::vector<pir::Type> AddNOp::InferMeta(
-    const std::vector<pir::Value> &input_values,
-    pir::AttributeMap *p_attributes) {
-  PADDLE_ENFORCE_NOT_NULL(
-      p_attributes,
-      common::errors::Fatal(
-          "AttrtibueMap pointer in InferMeta function is nullptr."));
-  VLOG(4) << "Start infermeta AddNOp";
-  PADDLE_ENFORCE_EQ(input_values.size(),
-                    1,
-                    phi::errors::InvalidArgument(
-                        "Num of inputs is expected to be 1 but got %d.",
-                        input_values.size()));
-  pir::Value inputs_ = input_values[0];
-
-  VLOG(4) << "Builder construction outputs";
-  pir::VectorType x = inputs_.type().dyn_cast<pir::VectorType>();
-
-  std::vector<paddle::dialect::IrTensor> vec_dense_x;
-  for (size_t i = 0; i < x.size(); i++) {
-    if (x[i].isa<paddle::dialect::DenseTensorType>()) {
-      vec_dense_x.push_back(paddle::dialect::IrTensor(
-          TransToPhiDataType(
-              x[i].dyn_cast<paddle::dialect::DenseTensorType>().dtype()),
-          x[i].dyn_cast<paddle::dialect::DenseTensorType>().dims(),
-          x[i].dyn_cast<paddle::dialect::DenseTensorType>().data_layout(),
-          x[i].dyn_cast<paddle::dialect::DenseTensorType>().lod(),
-          x[i].dyn_cast<paddle::dialect::DenseTensorType>().offset()));
-    } else {
-      PADDLE_THROW(phi::errors::Unimplemented(
-          "Only support paddle::dialect::DenseTensorType or "
-          "paddle::dialect::AllocatedDenseTensorType"));
-    }
-  }
-  std::vector<paddle::dialect::IrMetaTensor> vec_meta_x;
-  for (size_t i = 0; i < vec_dense_x.size(); i++) {
-    vec_meta_x.push_back(paddle::dialect::IrMetaTensor(&vec_dense_x[i]));
-  }
-
-  std::vector<const phi::MetaTensor *> meta_x;
-  for (size_t i = 0; i < static_cast<size_t>(vec_meta_x.size()); i++) {
-    meta_x.push_back(&vec_meta_x[i]);
-  }
-
-  paddle::dialect::IrTensor dense_out;
-  paddle::dialect::IrMetaTensor meta_out(&dense_out);
-
-  phi::AddNInferMeta(meta_x, &meta_out, phi::MetaConfig(false, false));
-
-  std::vector<pir::Type> argument_outputs;
-  pir::Type out_type = CvtToDenseTensorType(dense_out);
-#ifdef PADDLE_WITH_DISTRIBUTE
-  // Auto Parallel condition
-  if (AllInputAreDist(input_values)) {
-    ProcessMeshAttribute op_mesh =
-        x[0].dyn_cast<DistDenseTensorType>().process_mesh_attr();
-    auto ctx = pir::IrContext::Instance();
-    std::vector<pir::Attribute> dist_operand_attrs, dist_result_attrs;
-    auto dist_meta_x = CvtToDistMetaTensor(x);
-    auto spmd_info =
-        phi::distributed::VariadicReplicatedInferSpmdDynamic(dist_meta_x);
-    PADDLE_ENFORCE_EQ(
-        spmd_info.first.size(),
-        1u,
-        common::errors::Unavailable(
-            "Size of spmd_info.first for op[pd_op.add_n]is unexpected."));
-    for (auto &arg_dist : spmd_info.first) {
-      dist_operand_attrs.push_back(CvtToPirAttr(arg_dist));
-    }
-    auto dist_attr_output = CreateReplicatedDistAttr(out_type, op_mesh);
-
-    dist_result_attrs.push_back(dist_attr_output);
-    argument_outputs.push_back(CvtToPirDistType(out_type, dist_attr_output));
-
-    (*p_attributes)[kAttrOpDistAttr] = OperationDistAttribute::get(
-        ctx, op_mesh, dist_operand_attrs, dist_result_attrs);
-    return argument_outputs;
-  }
-#endif
-  argument_outputs.push_back(out_type);
-  return argument_outputs;
-}
-
-namespace details {
-bool AddNOpInferSymbolicShape(pir::Operation *op,
-                              pir::InferSymbolicShapeContext *infer_context) {
-  const auto &input_list_shape =
-      infer_context->GetShapeOrDataForValue(op->operand_source(0));
-  PADDLE_ENFORCE_EQ(
-      input_list_shape.isa<symbol::TensorListShapeOrDataDimExprs>(),
-      true,
-      common::errors::InvalidArgument(
-          "The type of inputs shape should be TensorListShapeOrDataDimExprs"));
-  const auto &inputs_shape =
-      input_list_shape.dyn_cast<symbol::TensorListShapeOrDataDimExprs>();
-  PADDLE_ENFORCE_GT(
-      inputs_shape.size(),
-      0,
-      common::errors::InvalidArgument(
-          "The input tensor X's dimensions of AddNOp "
-          "should be larger than 0. But received X's dimensions %d.",
-          inputs_shape.size()));
-  symbol::TensorShapeOrDataDimExprs candidate_shape = inputs_shape.front();
-  for (size_t i = 1; i < inputs_shape.size(); ++i) {
-    // 0D tensor
-    if (inputs_shape[i].shape().size() == 0) {
-      continue;
-    }
-    if (candidate_shape.shape().size() == 0) {
-      candidate_shape = inputs_shape[i];
-      continue;
-    }
-    for (size_t j = 0; j < candidate_shape.shape().size(); ++j) {
-      infer_context->AddEqualCstr(candidate_shape.shape()[j],
-                                  inputs_shape[i].shape()[j]);
-    }
-  }
-  infer_context->SetShapeOrDataForValue(
-      op->result(0), symbol::ShapeOrDataDimExprs{candidate_shape});
-
-  return true;
-}
-
-}  // namespace details
-
-bool AddNOp::InferSymbolicShape(pir::InferSymbolicShapeContext *infer_context) {
-  return details::AddNOpInferSymbolicShape(this->operation(), infer_context);
-}
-
 OpInfoTuple AddN_Op::GetOpInfo() {
   std::vector<paddle::dialect::OpInputInfo> inputs = {
       paddle::dialect::OpInputInfo(
@@ -428,7 +207,7 @@ std::vector<pir::Type> AddN_Op::InferMeta(
 
 bool AddN_Op::InferSymbolicShape(
     pir::InferSymbolicShapeContext *infer_context) {
-  return details::AddNOpInferSymbolicShape(this->operation(), infer_context);
+  return AddNOpInferSymbolicShape(this->operation(), infer_context);
 }
 
 OpInfoTuple AddNArrayOp::GetOpInfo() {
@@ -4631,7 +4410,6 @@ phi::DataType ArrayPopOp::GetKernelTypeForVar(
 
 }  // namespace paddle::dialect
 
-IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::AddNOp)
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::SplitGradOp)
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::AddN_Op)
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::AddNArrayOp)