Fix attribtue attribute, etc (#62575)

co63oc · web-flow · commit 04d72bd62f98 · 2024-03-12T10:15:53.000+08:00
diff --git a/paddle/fluid/pir/dialect/op_generator/op_build_gen.py b/paddle/fluid/pir/dialect/op_generator/op_build_gen.py
@@ -248,7 +248,7 @@ def GenBuildInputArgsStr(
 }
 
 
-def GenBuildInserFullForMutableAttribute(
+def GenBuildInsertFullForMutableAttribute(
     op_class_name,
     op_attribute_name_list,
     op_attribute_build_arg_type_list,
@@ -480,7 +480,7 @@ def GenBuildOutputs(
 
 """
 
-    CREATE_INTARRAY_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  phi::IntArray {name};
+    CREATE_INTARRAY_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  phi::IntArray {name};
   if ({name}_.isa<pir::OpResult>() && {name}_.defining_op()->isa<paddle::dialect::FullIntArrayOp>()) {{
     {name} = std::move(phi::IntArray(paddle::dialect::GetInt64Vector(
                           {name}_.defining_op()
@@ -502,7 +502,7 @@ def GenBuildOutputs(
     PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType"));
   }}\n"""
 
-    CREATE_VECTOR_INT_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  std::vector<int64_t> {name};
+    CREATE_VECTOR_INT_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  std::vector<int64_t> {name};
   if ({name}_.isa<pir::OpResult>() && {name}_.defining_op()->isa<paddle::dialect::FullIntArrayOp>()) {{
     {name} = paddle::dialect::GetInt64Vector(
                     {name}_.defining_op()
@@ -522,7 +522,7 @@ def GenBuildOutputs(
     PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType"));
   }}\n"""
 
-    CREATE_SCALAR_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  phi::Scalar {name};
+    CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  phi::Scalar {name};
   if ({name}_.isa<pir::OpResult>() && {name}_.defining_op()->isa<paddle::dialect::FullOp>()) {{
     {name} = std::move(phi::Scalar({name}_.defining_op()
                                   ->dyn_cast<paddle::dialect::FullOp>()
@@ -577,24 +577,24 @@ def GenBuildOutputs(
                     op_class_name
                     in _PREPARE_DATA_WITH_VECTOR_INT64_MTTABLE_ATTRIBUTE
                 ):
-                    build_output_str += CREATE_VECTOR_INT_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                    build_output_str += CREATE_VECTOR_INT_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                         name=op_mutable_attribute_name_list[idx]
                     )
                 else:
-                    build_output_str += CREATE_INTARRAY_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                    build_output_str += CREATE_INTARRAY_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                         name=op_mutable_attribute_name_list[idx]
                     )
             # scalar
             elif attr_dtype[0] == "paddle::dialect::ScalarAttribute":
-                build_output_str += CREATE_SCALAR_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                build_output_str += CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                     name=op_mutable_attribute_name_list[idx],
                     dtype=attr_dtype[1],
                 )
             # string
             elif attr_dtype[0] == "pir::StrAttribute":
                 build_output_str += ""
             else:
-                assert "mutable attribtue type is not right."
+                assert "mutable attribute type is not right."
         build_output_str += "\n"
 
     # Prepare inputs_meta_tensor & attributes for infer meta
@@ -679,12 +679,12 @@ def GenBuildOutputs(
     CREATE_INFER_META_FUNC_TEMPLATE = """
   phi::{func}({args});
 """
-    CREATE_INFER_META_FUNC_WITH_METACINFIG_TEMPLATE = """
+    CREATE_INFER_META_FUNC_WITH_META_CONFIG_TEMPLATE = """
   phi::{func}({args}, phi::MetaConfig(false, false));
 """
     if op_infer_meta_map['func'] in _INFERMETA_NEED_META_CONFIG:
         build_output_str += (
-            CREATE_INFER_META_FUNC_WITH_METACINFIG_TEMPLATE.format(
+            CREATE_INFER_META_FUNC_WITH_META_CONFIG_TEMPLATE.format(
                 func=op_infer_meta_map['func'], args=", ".join(infer_meta_args)
             )
         )
@@ -813,7 +813,7 @@ def gen_build_func_str(
     inset_full_for_mutable_attributes_str = ""
     if not muta_attr_is_input:
         inset_full_for_mutable_attributes_str = (
-            GenBuildInserFullForMutableAttribute(
+            GenBuildInsertFullForMutableAttribute(
                 op_class_name,
                 op_attribute_name_list,
                 op_attribute_build_arg_type_list,
diff --git a/paddle/fluid/pir/dialect/op_generator/op_infermeta_gen.py b/paddle/fluid/pir/dialect/op_generator/op_infermeta_gen.py
@@ -221,11 +221,11 @@ def GenBuildOutputsPart2(
 
 """
 
-    CREATE_INTARRAY_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  is_from_tensor = false;
+    CREATE_INTARRAY_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  is_from_tensor = false;
   phi::IntArray {name} = std::move(phi::IntArray(paddle::dialect::ParseValueShape({name}_, &is_from_tensor)));
   if (is_from_tensor) {name}.SetFromTensor(true);\n"""
 
-    CREATE_VECTOR_INT_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  std::vector<int64_t> {name};
+    CREATE_VECTOR_INT_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  std::vector<int64_t> {name};
   if ({name}_.isa<pir::OpResult>() && {name}_.defining_op()->isa<paddle::dialect::FullIntArrayOp>()) {{
     {name} = paddle::dialect::GetInt64Vector(
                     {name}_.defining_op()
@@ -245,7 +245,7 @@ def GenBuildOutputsPart2(
     PADDLE_THROW(phi::errors::Unimplemented("Only support VectorType or DenseTensorType or AllocatedDenseTensorType"));
   }}\n"""
 
-    CREATE_SCALAR_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE = """  phi::Scalar {name};
+    CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE = """  phi::Scalar {name};
   if ({name}_.isa<pir::OpResult>() && {name}_.defining_op()->isa<paddle::dialect::FullOp>()) {{
     {name} = std::move(phi::Scalar({name}_.defining_op()
                                   ->dyn_cast<paddle::dialect::FullOp>()
@@ -288,16 +288,16 @@ def GenBuildOutputsPart2(
                     op_class_name
                     in _PREPARE_DATA_WITH_VECTOR_INT64_MTTABLE_ATTRIBUTE
                 ):
-                    build_output_str += CREATE_VECTOR_INT_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                    build_output_str += CREATE_VECTOR_INT_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                         name=op_mutable_attribute_name_list[idx]
                     )
                 else:
-                    build_output_str += CREATE_INTARRAY_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                    build_output_str += CREATE_INTARRAY_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                         name=op_mutable_attribute_name_list[idx]
                     )
             # scalar
             elif attr_dtype[0] == "paddle::dialect::ScalarAttribute":
-                build_output_str += CREATE_SCALAR_MUTABLE_ATTRIBUE_WITH_UNKONW_DATA_TEMPLATE.format(
+                build_output_str += CREATE_SCALAR_MUTABLE_ATTRIBUTE_WITH_UNKNOWN_DATA_TEMPLATE.format(
                     name=op_mutable_attribute_name_list[idx],
                     dtype=attr_dtype[1],
                 )
@@ -397,12 +397,12 @@ def GenBuildOutputsPart2(
     CREATE_INFER_META_FUNC_TEMPLATE = """
   phi::{func}({args});
 """
-    CREATE_INFER_META_FUNC_WITH_METACINFIG_TEMPLATE = """
+    CREATE_INFER_META_FUNC_WITH_META_CONFIG_TEMPLATE = """
   phi::{func}({args}, phi::MetaConfig(false, false));
 """
     if op_infer_meta_map['func'] in _INFERMETA_NEED_META_CONFIG:
         build_output_str += (
-            CREATE_INFER_META_FUNC_WITH_METACINFIG_TEMPLATE.format(
+            CREATE_INFER_META_FUNC_WITH_META_CONFIG_TEMPLATE.format(
                 func=op_infer_meta_map['func'], args=", ".join(infer_meta_args)
             )
         )
@@ -470,7 +470,7 @@ def GenBuildOutputsPart2(
 
 def GetAttributes(
     op_class_name,
-    muta_attr_is_input,
+    mutable_attr_is_input,
     inuse_infer_meta_args,
     op_attribute_name_list,
     op_attribute_type_list,
@@ -520,7 +520,7 @@ def GetAttributes(
     attr_names = []
     attr_types = []
     attr_build_arg_types = []
-    if not muta_attr_is_input:
+    if not mutable_attr_is_input:
         attr_names = op_attribute_name_list
         attr_types = op_attribute_type_list
         attr_build_arg_types = op_attribute_build_arg_type_list
@@ -606,7 +606,7 @@ def gen_infermeta_func_str(
     op_non_mutable_attribute_name_list,
     op_non_mutable_attribute_type_list,
     op_non_mutable_attribute_build_arg_type_list,
-    muta_attr_is_input=False,
+    mutable_attr_is_input=False,
     attr_args_is_map=True,
 ):
     inuse_infer_meta_args = []
@@ -627,12 +627,12 @@ def gen_infermeta_func_str(
         op_input_type_list,
         op_input_optional_list,
         op_mutable_attribute_name_list,
-        muta_attr_is_input,
+        mutable_attr_is_input,
     )
 
     get_attributes_str = GetAttributes(
         op_class_name,
-        muta_attr_is_input,
+        mutable_attr_is_input,
         inuse_infer_meta_args,
         op_attribute_name_list,
         op_attribute_type_list,
@@ -657,7 +657,7 @@ def gen_infermeta_func_str(
         op_output_optional_list,
         op_infer_meta_map,
         op_inplace_map,
-        muta_attr_is_input,
+        mutable_attr_is_input,
     )
 
     infermeta_func = OP_INFERMETA_TEMPLATE.format(
diff --git a/paddle/fluid/pir/dialect/op_generator/op_kerneltype_gen.py b/paddle/fluid/pir/dialect/op_generator/op_kerneltype_gen.py
@@ -67,7 +67,7 @@ def get_data_transform_check_str(op_data_transform_map):
                 )
         if "support_trans_dtype" in op_data_transform_map:
             args = op_data_transform_map["support_trans_dtype"]
-            # TODO:(chenxi67) comlete SUPPORT logic
+            # TODO:(chenxi67) complete SUPPORT logic
             if args is not None:
                 if_cond_args = []
                 for support_arg in args:
diff --git a/paddle/fluid/pir/dialect/op_generator/python_c_gen.py b/paddle/fluid/pir/dialect/op_generator/python_c_gen.py
@@ -72,10 +72,10 @@
         {attrs}
 
         // Call ir static api
-        CallStackRecorder callstack_recoder("{api_name}");
-        callstack_recoder.Record();
+        CallStackRecorder callstack_recorder("{api_name}");
+        callstack_recorder.Record();
         auto static_api_out = paddle::dialect::{api_name}({args});
-        callstack_recoder.AttachToOps();
+        callstack_recorder.AttachToOps();
         return ToPyObject(static_api_out);
     }} catch (...) {{
         ThrowExceptionToPython(std::current_exception());
@@ -97,10 +97,10 @@
         {attrs}
 
         // Call ir static api
-        CallStackRecorder callstack_recoder("{api_name}");
-        callstack_recoder.Record();
+        CallStackRecorder callstack_recorder("{api_name}");
+        callstack_recorder.Record();
         paddle::dialect::{api_name}({args});
-        callstack_recoder.AttachToOps();
+        callstack_recorder.AttachToOps();
         return nullptr;
     }} catch (...) {{
         ThrowExceptionToPython(std::current_exception());
@@ -134,10 +134,10 @@
         {cast_attrs}
 
         // Call ir static api
-        CallStackRecorder callstack_recoder("{api_name}");
-        callstack_recoder.Record();
+        CallStackRecorder callstack_recorder("{api_name}");
+        callstack_recorder.Record();
         auto static_api_out = paddle::dialect::{api_name}({args_with_mutable_attrs});
-        callstack_recoder.AttachToOps();
+        callstack_recorder.AttachToOps();
         return ToPyObject(static_api_out);
 
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ def get_data_transform_check_str(op_data_transform_map):`
`67`	`67`	`)`
`68`	`68`	`if "support_trans_dtype" in op_data_transform_map:`
`69`	`69`	`args = op_data_transform_map["support_trans_dtype"]`
`70`		`- # TODO:(chenxi67) comlete SUPPORT logic`
	`70`	`+ # TODO:(chenxi67) complete SUPPORT logic`
`71`	`71`	`if args is not None:`
`72`	`72`	`if_cond_args = []`
`73`	`73`	`for support_arg in args:`