PaddlePaddle
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/add_broadcast_to_elementwise_pass.cc
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions b/‎paddle/cinn/hlir/dialect/operator/transforms/add_broadcast_to_elementwise_pass.cc
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc
Copy file name to clipboard
+33-17Lines changed: 33 additions & 17 deletions b/‎paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc
Copy file name to clipboard
+33-17Lines changed: 33 additions & 17 deletions
diff --git a/‎paddle/fluid/pir/dialect/op_generator/gen_utils.py
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/pir/dialect/op_generator/gen_utils.py
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions b/‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/utils/utils.cc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎paddle/fluid/pir/dialect/operator/utils/utils.cc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎paddle/fluid/pir/drr/src/attr_type_uilts.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pir/drr/src/attr_type_uilts.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/drr/src/ir_operation_factory.cc
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎paddle/fluid/pir/drr/src/ir_operation_factory.cc
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/drr/src/match_context.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pir/drr/src/match_context.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/transforms/general/identity_op_clean_pass.cc
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions b/‎paddle/fluid/pir/transforms/general/identity_op_clean_pass.cc
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions
diff --git a/‎paddle/fluid/pir/transforms/gpu/fused_dot_product_attention_pass.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/pir/transforms/gpu/fused_dot_product_attention_pass.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
@@ -120,7 +120,10 @@ bool ProcessOp(pir::Operation* op, pir::PatternRewriter* rewriter) {
                              ->dyn_cast<paddle::dialect::FullOp>()) {
         auto new_full = rewriter->Build<paddle::dialect::FullOp>(
             output_shape,
-            full_op->attribute("value").dyn_cast<pir::FloatAttribute>().data(),
+            full_op->attribute("value")
+                .dyn_cast<paddle::dialect::ScalarAttribute>()
+                .data()
+                .to<double>(),
             full_op->attribute("dtype")
                 .dyn_cast<paddle::dialect::DataTypeAttribute>()
                 .data(),
@@ -144,7 +147,10 @@ bool ProcessOp(pir::Operation* op, pir::PatternRewriter* rewriter) {
                              ->dyn_cast<paddle::dialect::FullOp>()) {
         auto new_full = rewriter->Build<paddle::dialect::FullOp>(
             output_shape,
-            full_op->attribute("value").dyn_cast<pir::FloatAttribute>().data(),
+            full_op->attribute("value")
+                .dyn_cast<paddle::dialect::ScalarAttribute>()
+                .data()
+                .to<double>(),
             full_op->attribute("dtype")
                 .dyn_cast<paddle::dialect::DataTypeAttribute>()
                 .data(),
 
@@ -201,8 +201,10 @@ class ScaleOpPattern : public pir::OpRewritePattern<paddle::dialect::ScaleOp> {
       FullOp full_op = CastDefinedTo<FullOp>(op, 1);
       // scale is generator by full op
       // get attribute value from full op
-      auto scale_value =
-          full_op.attribute("value").dyn_cast<pir::FloatAttribute>().data();
+      auto scale_value = full_op.attribute("value")
+                             .dyn_cast<paddle::dialect::ScalarAttribute>()
+                             .data()
+                             .to<double>();
 
       auto cinn_scale = rewriter.Build<cinn::dialect::ScaleOp>(
           op->operand_source(0),
@@ -360,11 +362,13 @@ class IsCloseOpPattern
     const FullOp atol_full_op = CastDefinedTo<FullOp>(op, 3);
 
     auto rtol_val = rtol_full_op.attribute("value")
-                        .dyn_cast<::pir::FloatAttribute>()
-                        .data();
+                        .dyn_cast<paddle::dialect::ScalarAttribute>()
+                        .data()
+                        .to<double>();
     auto atol_val = atol_full_op.attribute("value")
-                        .dyn_cast<::pir::FloatAttribute>()
-                        .data();
+                        .dyn_cast<paddle::dialect::ScalarAttribute>()
+                        .data()
+                        .to<double>();
     auto equal_nan =
         op->attribute("equal_nan").dyn_cast<::pir::BoolAttribute>().data();
 
@@ -429,9 +433,11 @@ class ConcatOpPattern
   void Rewrite(paddle::dialect::ConcatOp op,
                pir::PatternRewriter &rewriter) const override {
     const FullOp axis_full_op = CastDefinedTo<FullOp>(op, 1);
-    int axis = static_cast<int>(axis_full_op.attribute("value")
-                                    .dyn_cast<::pir::FloatAttribute>()
-                                    .data());
+    int axis =
+        static_cast<int>(axis_full_op.attribute("value")
+                             .dyn_cast<paddle::dialect::ScalarAttribute>()
+                             .data()
+                             .to<double>());
     auto input_ops = op->operand_source(0)
                          .defining_op()
                          ->dyn_cast<pir::CombineOp>()
@@ -489,8 +495,10 @@ class ElementwisePowOpPattern
     auto y_op = op->operand_source(1)
                     .defining_op()
                     ->dyn_cast<paddle::dialect::FullOp>();
-    auto factor =
-        y_op.attribute("value").dyn_cast<::pir::FloatAttribute>().data();
+    auto factor = y_op.attribute("value")
+                      .dyn_cast<paddle::dialect::ScalarAttribute>()
+                      .data()
+                      .to<double>();
     if (factor == 2.0) {
       auto multiply = rewriter.Build<paddle::dialect::MultiplyOp>(
           op->operand_source(0), op->operand_source(0));
@@ -555,8 +563,11 @@ class SplitOpPattern : public pir::OpRewritePattern<paddle::dialect::SplitOp> {
   int GetAxis(paddle::dialect::SplitOp op) const {
     auto axis_gen_op = op->operand_source(2).defining_op();
     auto full_op = axis_gen_op->dyn_cast<paddle::dialect::FullOp>();
-    int axis = static_cast<int>(
-        full_op.attribute("value").dyn_cast<::pir::FloatAttribute>().data());
+    int axis =
+        static_cast<int>(full_op.attribute("value")
+                             .dyn_cast<paddle::dialect::ScalarAttribute>()
+                             .data()
+                             .to<double>());
     if (axis < 0) {
       axis += op.x()
                   .type()
@@ -659,8 +670,11 @@ class SplitWithNumOpPattern
   int GetAxis(paddle::dialect::SplitWithNumOp op) const {
     auto axis_gen_op = op->operand_source(1).defining_op();
     auto full_op = axis_gen_op->dyn_cast<paddle::dialect::FullOp>();
-    int axis = static_cast<int>(
-        full_op.attribute<::pir::FloatAttribute>("value").data());
+    int axis =
+        static_cast<int>(full_op.attribute("value")
+                             .dyn_cast<paddle::dialect::ScalarAttribute>()
+                             .data()
+                             .to<double>());
     if (axis < 0) {
       axis += op.x()
                   .type()
@@ -1101,8 +1115,10 @@ class GatherOpPattern
                             "Not Supported: The gather operator for CINN "
                             "only supports constant value"));
       auto full_op = axis_gen_op->dyn_cast<paddle::dialect::FullOp>();
-      return static_cast<int>(
-          full_op.attribute("value").dyn_cast<::pir::FloatAttribute>().data());
+      return static_cast<int>(full_op.attribute("value")
+                                  .dyn_cast<paddle::dialect::ScalarAttribute>()
+                                  .data()
+                                  .to<double>());
     }();
     auto out =
         rewriter.Build<cinn::dialect::GatherOp>(x, index, axis)->result(0);
 
@@ -24,10 +24,10 @@ def to_pascal_case(s):
 attr_types_map = {
     'IntArray': ['paddle::dialect::IntArrayAttribute', 'IntArray'],
     'Scalar': ['paddle::dialect::ScalarAttribute', 'Scalar'],
-    'Scalar(int)': ['pir::Int32Attribute', 'int'],
-    'Scalar(int64_t)': ['pir::Int64Attribute', 'int64_t'],
-    'Scalar(float)': ['pir::FloatAttribute', 'float'],
-    'Scalar(double)': ['pir::DoubleAttribute', 'double'],
+    'Scalar(int)': ['paddle::dialect::ScalarAttribute', 'Scalar'],
+    'Scalar(int64_t)': ['paddle::dialect::ScalarAttribute', 'Scalar'],
+    'Scalar(float)': ['paddle::dialect::ScalarAttribute', 'Scalar'],
+    'Scalar(double)': ['paddle::dialect::ScalarAttribute', 'Scalar'],
     'Scalar[]': [
         'pir::ArrayAttribute<paddle::dialect::ScalarAttribute>',
         'const std::vector<Scalar>&',
 
@@ -3172,8 +3172,9 @@ std::vector<pir::Type> ExpandOp::InferMeta(
       auto shape_item = shape.defining_op()
                             ->dyn_cast<paddle::dialect::FullOp>()
                             .attribute("value")
-                            .dyn_cast<pir::FloatAttribute>()
-                            .data();
+                            .dyn_cast<paddle::dialect::ScalarAttribute>()
+                            .data()
+                            .to<double>();
       vec_shape = {static_cast<int64_t>(shape_item)};
     } else if (shape.isa<pir::OpResult>() &&
                shape.defining_op()->isa<paddle::dialect::StackOp>()) {
@@ -3223,11 +3224,13 @@ std::vector<pir::Type> ExpandOp::InferMeta(
               vec_shape.push_back(value);
 
             } else if (shape.defining_op()->isa<paddle::dialect::FullOp>()) {
-              auto shape_item = shape.defining_op()
-                                    ->dyn_cast<paddle::dialect::FullOp>()
-                                    .attribute("value")
-                                    .dyn_cast<pir::FloatAttribute>()
-                                    .data();
+              auto shape_item =
+                  shape.defining_op()
+                      ->dyn_cast<paddle::dialect::FullOp>()
+                      .attribute("value")
+                      .dyn_cast<paddle::dialect::ScalarAttribute>()
+                      .data()
+                      .to<double>();
               vec_shape.push_back(static_cast<int64_t>(shape_item));
 
             } else {
 
@@ -446,8 +446,9 @@ std::vector<int64_t> ParseValueShape(const pir::Value& shape,
     auto shape_item = shape.defining_op()
                           ->dyn_cast<paddle::dialect::FullOp>()
                           .attribute("value")
-                          .dyn_cast<pir::FloatAttribute>()
-                          .data();
+                          .dyn_cast<paddle::dialect::ScalarAttribute>()
+                          .data()
+                          .to<double>();
     vec_shape = {static_cast<int64_t>(shape_item)};
   } else if (shape.isa<pir::OpResult>() &&
              shape.defining_op()->isa<paddle::dialect::StackOp>()) {
 
@@ -36,6 +36,7 @@ PD_SPECIALIZE_CppTypeToIrAttribute(bool, pir::BoolAttribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(int32_t, pir::Int32Attribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(int64_t, pir::Int64Attribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(float, pir::FloatAttribute);
+PD_SPECIALIZE_CppTypeToIrAttribute(double, pir::DoubleAttribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(std::string, pir::StrAttribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(std::vector<int32_t>, pir::ArrayAttribute);
 PD_SPECIALIZE_CppTypeToIrAttribute(std::vector<int64_t>,
 
@@ -299,6 +299,8 @@ pir::Attribute CreateIrAttribute(const std::any& obj) {
       return IrAttributeCreator<int64_t>()(std::any_cast<int64_t>(obj));
     } else if (obj.type() == typeid(float)) {
       return IrAttributeCreator<float>()(std::any_cast<float>(obj));
+    } else if (obj.type() == typeid(double)) {
+      return IrAttributeCreator<double>()(std::any_cast<double>(obj));
     } else if (obj.type() == typeid(std::string)) {
       return IrAttributeCreator<std::string>()(std::any_cast<std::string>(obj));
     } else if (obj.type() == typeid(const char*)) {
 
@@ -38,6 +38,7 @@ template bool MatchContext::Attr<bool>(const std::string&) const;
 template int32_t MatchContext::Attr<int32_t>(const std::string&) const;
 template int64_t MatchContext::Attr<int64_t>(const std::string&) const;
 template float MatchContext::Attr<float>(const std::string&) const;
+template double MatchContext::Attr<double>(const std::string&) const;
 template std::string MatchContext::Attr<std::string>(const std::string&) const;
 template std::vector<int32_t> MatchContext::Attr<std::vector<int32_t>>(
     const std::string&) const;
 
@@ -45,7 +45,7 @@ class RemoveUselessScalePattern : public paddle::drr::DrrPatternBase {
     scale_op({&pat.Tensor("x"), &full_op()}, {&pat.Tensor("scale_out")});
 
     pat.AddConstraint([&](const paddle::drr::MatchContext &match_ctx) {
-      return (match_ctx.Attr<float>("value") == 1.0 &&
+      return (match_ctx.Attr<double>("value") == 1.0 &&
               match_ctx.Attr<float>("bias") == 0.0);
     });
 
@@ -91,22 +91,22 @@ class RemoveRedundantScalePattern : public paddle::drr::DrrPatternBase {
           if (match_ctx.Attr<bool>("bias_after_scale_1")) {
             res_bias_1 = match_ctx.Attr<float>("bias_1");
           } else {
-            res_bias_1 = match_ctx.Attr<float>("value_1") *
+            res_bias_1 = match_ctx.Attr<double>("value_1") *
                          match_ctx.Attr<float>("bias_1");
           }
           if (match_ctx.Attr<bool>("bias_after_scale_2")) {
-            res_bias_2 = res_bias_1 * match_ctx.Attr<float>("value_2") +
+            res_bias_2 = res_bias_1 * match_ctx.Attr<double>("value_2") +
                          match_ctx.Attr<float>("bias_2");
           } else {
             res_bias_2 = (res_bias_1 + match_ctx.Attr<float>("bias_2")) *
-                         match_ctx.Attr<float>("value_2");
+                         match_ctx.Attr<double>("value_2");
           }
           return res_bias_2;
         });
     const auto &res_scale_input = res.ComputeAttr(
         [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return match_ctx.Attr<float>("value_1") *
-                 match_ctx.Attr<float>("value_2");
+          return match_ctx.Attr<double>("value_1") *
+                 match_ctx.Attr<double>("value_2");
         });
 
     const auto &full_op_res = res.Op(paddle::dialect::FullOp::name(),
@@ -242,8 +242,8 @@ class ReplaceDropoutWithScalePattern : public paddle::drr::DrrPatternBase {
     auto res = pat.ResultPattern();
 
     const auto &res_scale_input = res.ComputeAttr(
-        [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return 1.f - match_ctx.Attr<float>("value");
+        [](const paddle::drr::MatchContext &match_ctx) -> double {
+          return 1.f - match_ctx.Attr<double>("value");
         });
 
     const auto &full_op_res = res.Op(
 
@@ -110,7 +110,7 @@ class FusedDotProductAttentionPattern : public paddle::drr::DrrPatternBase {
     paddle::drr::ResultPattern res = src.ResultPattern();
     const auto &scaling_factor = res.ComputeAttr(
         [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return match_ctx.Attr<float>("q_scale_value");
+          return match_ctx.Attr<double>("q_scale_value");
         });
 
     const auto &dot_product_attention =
@@ -265,7 +265,7 @@ class FusedDotProductAttentionGradPattern : public paddle::drr::DrrPatternBase {
     paddle::drr::ResultPattern res = src.ResultPattern();
     const auto &scaling_factor = res.ComputeAttr(
         [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return match_ctx.Attr<float>("q_scale_value");
+          return match_ctx.Attr<double>("q_scale_value");
         });
 
     const auto &dot_product_attention =
@@ -403,7 +403,7 @@ class FusedDotProductAttentionWithDropoutPattern
     paddle::drr::ResultPattern res = src.ResultPattern();
     const auto &scaling_factor = res.ComputeAttr(
         [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return match_ctx.Attr<float>("q_scale_value");
+          return match_ctx.Attr<double>("q_scale_value");
         });
 
     const auto &dot_product_attention =
@@ -573,7 +573,7 @@ class FusedDotProductAttentionGradWithDropoutPattern
     paddle::drr::ResultPattern res = src.ResultPattern();
     const auto &scaling_factor = res.ComputeAttr(
         [](const paddle::drr::MatchContext &match_ctx) -> float {
-          return match_ctx.Attr<float>("q_scale_value");
+          return match_ctx.Attr<double>("q_scale_value");
         });
 
     const auto &dot_product_attention =