PaddlePaddle
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/pir/serialize_deserialize/include/deserialize_utils.h
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎paddle/fluid/pir/serialize_deserialize/include/deserialize_utils.h
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/serialize_deserialize/include/patch_util.h
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎paddle/fluid/pir/serialize_deserialize/include/patch_util.h
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/serialize_deserialize/patch/2.yaml
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions b/‎paddle/fluid/pir/serialize_deserialize/patch/2.yaml
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions
diff --git a/‎paddle/fluid/pir/serialize_deserialize/patch/Readme.md
Copy file name to clipboard
+11-11Lines changed: 11 additions & 11 deletions b/‎paddle/fluid/pir/serialize_deserialize/patch/Readme.md
Copy file name to clipboard
+11-11Lines changed: 11 additions & 11 deletions
@@ -43,7 +43,7 @@ class IR_API IntArrayAttribute : public pir::Attribute {
   static std::string name() { return "a_intarray"; }
 };
 
-class ScalarAttribute : public pir::Attribute {
+class IR_API ScalarAttribute : public pir::Attribute {
  public:
   using Attribute::Attribute;
 
@@ -84,7 +84,7 @@ class IR_API DataTypeAttribute : public pir::Attribute {
   static std::string name() { return "a_dtype"; }
 };
 
-class PlaceAttribute : public pir::Attribute {
+class IR_API PlaceAttribute : public pir::Attribute {
  public:
   using Attribute::Attribute;
 
@@ -98,7 +98,7 @@ class PlaceAttribute : public pir::Attribute {
   static std::string name() { return "a_place"; }
 };
 
-class DataLayoutAttribute : public pir::Attribute {
+class IR_API DataLayoutAttribute : public pir::Attribute {
  public:
   using Attribute::Attribute;
 
 
@@ -224,6 +224,15 @@ deserializeAttrFromJson<paddle::dialect::PlaceAttribute, int8_t>(
   return paddle::dialect::PlaceAttribute::get(ctx, place);
 }
 
+template <>
+paddle::dialect::DataLayoutAttribute
+deserializeAttrFromJson<paddle::dialect::DataLayoutAttribute, std::string>(
+    Json* attr_json, pir::IrContext* ctx) {
+  std::string data = attr_json->at(DATA).template get<std::string>();
+  phi::DataLayout data_type = common::StringToDataLayout(data);
+  return paddle::dialect::DataLayoutAttribute::get(ctx, data_type);
+}
+
 pir::Type parseType(Json* type_json) {
   auto type_name = type_json->at(ID).template get<std::string>();
 
@@ -439,6 +448,10 @@ pir::Attribute AttrTypeReader::ReadPaddleOperatorAttr(
     VLOG(8) << "Parse PlaceAttribute .";
     return pir::deserializeAttrFromJson<paddle::dialect::PlaceAttribute,
                                         int8_t>(attr_json, ctx);
+  } else if (attr_name == paddle::dialect::DataLayoutAttribute::name()) {
+    VLOG(8) << "Parse DataLayoutAttribute .";
+    return pir::deserializeAttrFromJson<paddle::dialect::DataLayoutAttribute,
+                                        std::string>(attr_json, ctx);
   } else {
     PADDLE_ENFORCE(false,
                    common::errors::InvalidArgument(
 
@@ -14,6 +14,7 @@
 
 #pragma once
 #include "paddle/fluid/pir/serialize_deserialize/include/third_party.h"
+#include "paddle/phi/common/data_type.h"
 
 namespace pir {
 
@@ -25,6 +26,12 @@ std::string GetTypeName(const YAML::Node &action);
 
 std::string GetAttrName(const YAML::Node &action);
 
+Json BuildScalarAttribute(const YAML::Node &action);
+
+phi::DataType YamlStringToDataType(const std::string &type);
+
+std::string YamlStringToDataLayoutString(const std::string &layout);
+
 Json BuildAttrJsonPatch(const YAML::Node &action);
 
 Json BuildTypeJsonPatch(const YAML::Node &action);
 
@@ -4,49 +4,49 @@ op_patches:
       - action : modify_attr
         object : strides
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
       - action : modify_attr
         object : paddings
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
   - op_name : pd_op.pool2d
     actions:
       - action : modify_attr
         object : strides
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
       - action : modify_attr
         object : paddings
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
   - op_name : pd_op.pool3d
     actions:
       - action : modify_attr
         object : kernel_size
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
       - action : modify_attr
         object : strides
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
       - action : modify_attr
         object : paddings
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
           - type: pir::Int64Attribute
@@ -55,5 +55,5 @@ op_patches:
       - action : modify_attr
         object : target_shape
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute
@@ -12,7 +12,7 @@ op_patches:
       - action : xxxx  # 可能会对一个op进行多次操作
         object : xxxx
         type : xxxx
-        default : xxx
+        data : xxx
 
   - op_name : builtin.xxx # 对另一个op进行操作
     actions :
@@ -34,31 +34,31 @@ op_patches:
       - action : modify_output_attr # 修改OpresultAttribute
         object : stop_gradient      # 修改的具体属性名为stop_gradient
         type : pir::ArrayAttribute  # 修改属性类型为ArrayAttribute
-        default :                   # 修改属性为具体值
+        data :                   # 修改属性为具体值
           - type: pir::BoolAttribute  # ArrayAttribute类型需要对每一个字元素标识类型和值
-            default: "false"
+            data: "false"
       - action : modify_attr        # 修改Attribute，与修改OpresultAttribute类似
         object : name
         type : pir::StrAttribute
-        default : "B"
+        data : "B"
   - op_name : pd_op.pool
     actions :
       - action : modify_attr  # 修改Attribute
         object : kernel_size
         type : pir::ArrayAttribute
-        default :
+        data :
           - type: pir::Int64Attribute # 对于修改ArrayAttribute内部类型的情况，依然归属在modify_attr中，但是default值置为空即可
           - type: pir::Int64Attribute
   - op_name : builtin.parameter
     actions :
       - action : add_attr           # 新增Attribute
         object : new_attribute      # 新增属性名为new_attribute
         type : pir::StrAttribute    # 新增属性类型为StrAttribute
-        default : "new.attribute"   # 新增属性值为"new.attribute"
+        data : "new.attribute"   # 新增属性值为"new.attribute"
       - action : add_output_attr    # 新增OpresultAttribute
         object : new_Attribute      # 新增属性名为new_output
         type : pir::Int64Attribute  # 新增属性类型为ArrayAttribute
-        default : 1                 # 新增属性为具体值
+        data : 1                 # 新增属性为具体值
 ```
 
 - 删：Attribute与OpresultAttribute的删除格式类似，只需要指定需要删除的具体对象object即可
@@ -84,7 +84,7 @@ op_patches:
       - action : modify_output_type # 修改Opresult Type
         object : 0                  # 修改第几个输出的Type
         type : pir::DenseTensorType  # 修改属性类型为DenseTensorType
-        default : [pir::Float32Type,[-1,30],"NCHW",[],0]   # 修改属性为具体值
+        data : [pir::Float32Type,[-1,30],"NCHW",[],0]   # 修改属性为具体值
 
   ```
 - OpOperand / OpResult 增删改：需要提到block层进行处理。
@@ -100,7 +100,7 @@ op_patches:
         - action : add_output      # 增加输出
           object : 1               # 增加为第几个输出
           type : pir::DenseTensorType  # 修改属性类型为DenseTensorType
-          default : [pir::Float32Type,[-1,30],"NCHW",[],0]   # 修改属性为具体值
+          data : [pir::Float32Type,[-1,30],"NCHW",[],0]   # 修改属性为具体值
     - op_name : pd_op.add
       actions :
         - action : delete_input      # 删除输入
@@ -112,7 +112,7 @@ op_patches:
         - action : add_value         # 增加输入和输出
           object : [1,2]             # 增加为第1个op的第几个输入，第2个op的第几个输出
           type : pir::DenseTensorType
-          default : [pir::Float32Type,[1],"NCHW",[],0]
+          data : [pir::Float32Type,[1],"NCHW",[],0]
         - action : delete_value      # 删除输入和输出
           object : [1, 2]            # 删除第1个op的第几个输入，第2个op的第几个输出
   ```
@@ -144,7 +144,7 @@ type_patches:
       - action : add_type_attr           # 新增Type属性
       - object : 5                       # 新增属性为第几个属性
       - type : pir::Int64Attribute       # 新增属性类型为Int64Attribute
-      - default : 0                      # 新增属性默认值
+      - data : 0                      # 新增属性默认值
 ```
 
 ## pir_version 配置说明