fix (#60347)

zhangbo9674 · web-flow · commit 04ac74e79c4e · 2023-12-27T11:01:38.000+08:00
diff --git a/paddle/fluid/pir/dialect/operator/ir/manual_op.cc b/paddle/fluid/pir/dialect/operator/ir/manual_op.cc
@@ -1784,20 +1784,23 @@ phi::DataType SliceArrayOp::GetKernelTypeForVar(
   return expected_kernel_dtype;
 }
 
-const char *SliceArrayDenseOp::attributes_name[1] = {"starts"};
-
 OpInfoTuple SliceArrayDenseOp::GetOpInfo() {
   std::vector<paddle::dialect::OpInputInfo> inputs = {
       paddle::dialect::OpInputInfo("input",
                                    "paddle::dialect::DenseTensorArrayType",
                                    false,
                                    false,
                                    false,
+                                   false),
+      paddle::dialect::OpInputInfo("starts",
+                                   "paddle::dialect::IntArrayAttribute",
+                                   false,
+                                   false,
+                                   true,
                                    false)};
-  std::vector<paddle::dialect::OpAttributeInfo> attributes = {
-      paddle::dialect::OpAttributeInfo("starts",
-                                       "paddle::dialect::IntArrayAttribute",
-                                       "std::vector<int64_t>")};
+
+  std::vector<paddle::dialect::OpAttributeInfo> attributes = {};
+
   std::vector<paddle::dialect::OpOutputInfo> outputs = {
       paddle::dialect::OpOutputInfo(
           "out", "paddle::dialect::DenseTensorType", false, false)};
@@ -1806,8 +1809,8 @@ OpInfoTuple SliceArrayDenseOp::GetOpInfo() {
                                      {"input", "starts"},
                                      "slice_array_dense",
                                      {"input", "starts"},
-                                     {},
-                                     {},
+                                     {"input"},
+                                     {"input"},
                                      {},
                                      {});
   return std::make_tuple(
@@ -1820,7 +1823,7 @@ void SliceArrayDenseOp::VerifySig() {
   VLOG(4) << "Verifying inputs:";
   {
     auto input_size = num_operands();
-    IR_ENFORCE(input_size == 1u,
+    IR_ENFORCE(input_size == 2u,
                "The size %d of inputs must be equal to 1.",
                input_size);
     IR_ENFORCE((*this)
@@ -1829,14 +1832,13 @@ void SliceArrayDenseOp::VerifySig() {
                    .isa<paddle::dialect::DenseTensorArrayType>(),
                "Type validation failed for the 0th input, got %s.",
                (*this)->operand_source(0).type());
-  }
-  VLOG(4) << "Verifying attributes:";
-  {
-    auto &attributes = this->attributes();
-    IR_ENFORCE(attributes.count("starts") > 0, "starts does not exist.");
-    IR_ENFORCE(
-        attributes.at("starts").isa<paddle::dialect::IntArrayAttribute>(),
-        "Type of attribute: starts is not paddle::dialect::IntArrayAttribute.");
+    IR_ENFORCE((*this)->operand_source(1).type().isa<pir::VectorType>() ||
+                   (*this)
+                       ->operand_source(1)
+                       .type()
+                       .isa<paddle::dialect::DenseTensorType>(),
+               "Type validation failed for the 1st input, got %s.",
+               (*this)->operand_source(1).type());
   }
   VLOG(4) << "Verifying outputs:";
   {
diff --git a/paddle/fluid/pir/dialect/operator/ir/manual_op.h b/paddle/fluid/pir/dialect/operator/ir/manual_op.h
@@ -329,8 +329,8 @@ class SliceArrayDenseOp
  public:
   using Op::Op;
   static const char *name() { return "pd_op.slice_array_dense"; }
-  static const char *attributes_name[1];
-  static constexpr uint32_t attributes_num = 1;
+  static constexpr const char **attributes_name = nullptr;
+  static constexpr uint32_t attributes_num = 0;
   static OpInfoTuple GetOpInfo();
   void VerifySig();
 
diff --git a/test/dygraph_to_static/test_for_enumerate.py b/test/dygraph_to_static/test_for_enumerate.py
@@ -19,9 +19,7 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    IrMode,
-    ToStaticMode,
-    disable_test_case,
+    compare_legacy_with_pt,
     enable_to_static_guard,
     test_legacy_and_pt_and_pir,
 )
@@ -497,7 +495,7 @@ class TestForIterVarList(TestForInRangeConfig):
     def set_test_func(self):
         self.dygraph_func = for_iter_var_list
 
-    @disable_test_case((ToStaticMode.AST, IrMode.PT))
+    @compare_legacy_with_pt
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -507,7 +505,7 @@ class TestForEnumerateVarList(TestForInRangeConfig):
     def set_test_func(self):
         self.dygraph_func = for_enumerate_var_list
 
-    @disable_test_case((ToStaticMode.AST, IrMode.PT))
+    @compare_legacy_with_pt
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
