PaddlePaddle
diff --git a/‎paddle/fluid/pir/drr/src/attr_type_uilts.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pir/drr/src/attr_type_uilts.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pir/drr/src/ir_operation_factory.cc
Copy file name to clipboard
+29-29Lines changed: 29 additions & 29 deletions b/‎paddle/fluid/pir/drr/src/ir_operation_factory.cc
Copy file name to clipboard
+29-29Lines changed: 29 additions & 29 deletions
diff --git a/‎paddle/fluid/pir/drr/src/ir_operation_factory.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pir/drr/src/ir_operation_factory.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pir/drr/src/match_context_impl.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/pir/drr/src/match_context_impl.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎paddle/fluid/pir/drr/src/pattern_graph.cc
Copy file name to clipboard
+28-25Lines changed: 28 additions & 25 deletions b/‎paddle/fluid/pir/drr/src/pattern_graph.cc
Copy file name to clipboard
+28-25Lines changed: 28 additions & 25 deletions
diff --git a/‎paddle/fluid/pir/drr/src/rewrite_pattern.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/pir/drr/src/rewrite_pattern.cc
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
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/pir/serialize_deserialize/include/deserialize_utils.h
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
@@ -125,7 +125,7 @@ struct IrAttrTypeCast<std::vector<int64_t>> {
       result =
           attr.dyn_cast<paddle::dialect::IntArrayAttribute>().data().GetData();
     } else {
-      PADDLE_THROW(phi::errors::Unavailable(
+      PADDLE_THROW(common::errors::Unavailable(
           "Dynamic cast failed for IR attribute vector<int64_t>"));
     }
     return result;
 
@@ -90,7 +90,7 @@ void OperationFactory::RegisterManualOpCreator() {
         if (inputs.size() == 3) {
           PADDLE_ENFORCE_NE(attrs.find("axes"),
                             attrs.end(),
-                            phi::errors::InvalidArgument(
+                            common::errors::InvalidArgument(
                                 "'axes' Attribute is expected for SliceOp. "));
           std::vector<int64_t> axes;
           for (size_t i = 0;
@@ -106,7 +106,7 @@ void OperationFactory::RegisterManualOpCreator() {
           PADDLE_ENFORCE_NE(
               attrs.find("infer_flags"),
               attrs.end(),
-              phi::errors::InvalidArgument(
+              common::errors::InvalidArgument(
                   "'infer_flags' Attribute is expected for SliceOp. "));
           std::vector<int64_t> infer_flags;
           for (size_t i = 0;
@@ -123,7 +123,7 @@ void OperationFactory::RegisterManualOpCreator() {
           PADDLE_ENFORCE_NE(
               attrs.find("decrease_axis"),
               attrs.end(),
-              phi::errors::InvalidArgument(
+              common::errors::InvalidArgument(
                   "'decrease_axis' Attribute is expected for SliceOp. "));
           std::vector<int64_t> decrease_axis;
           for (size_t i = 0;
@@ -155,8 +155,8 @@ void OperationFactory::RegisterManualOpCreator() {
           PADDLE_ENFORCE_EQ(
               attrs.find("strides") != attrs.end(),
               true,
-              phi::errors::InvalidArgument("'strides' Attribute is expected "
-                                           "for Conv2dTransposeBiasOp. "));
+              common::errors::InvalidArgument("'strides' Attribute is expected "
+                                              "for Conv2dTransposeBiasOp. "));
           std::vector<int> strides;
           for (size_t i = 0;
                i < attrs.at("strides").dyn_cast<pir::ArrayAttribute>().size();
@@ -168,11 +168,11 @@ void OperationFactory::RegisterManualOpCreator() {
                                   .data());
           }
 
-          PADDLE_ENFORCE_EQ(
-              attrs.find("paddings") != attrs.end(),
-              true,
-              phi::errors::InvalidArgument("'paddings' Attribute is expected "
-                                           "for Conv2dTransposeBiasOp. "));
+          PADDLE_ENFORCE_EQ(attrs.find("paddings") != attrs.end(),
+                            true,
+                            common::errors::InvalidArgument(
+                                "'paddings' Attribute is expected "
+                                "for Conv2dTransposeBiasOp. "));
           std::vector<int> paddings;
           for (size_t i = 0;
                i < attrs.at("paddings").dyn_cast<pir::ArrayAttribute>().size();
@@ -186,7 +186,7 @@ void OperationFactory::RegisterManualOpCreator() {
 
           PADDLE_ENFORCE_EQ(attrs.find("output_padding") != attrs.end(),
                             true,
-                            phi::errors::InvalidArgument(
+                            common::errors::InvalidArgument(
                                 "'output_padding' Attribute is expected for "
                                 "Conv2dTransposeBiasOp. "));
           std::vector<int> output_padding;
@@ -203,26 +203,26 @@ void OperationFactory::RegisterManualOpCreator() {
 
           PADDLE_ENFORCE_EQ(attrs.find("padding_algorithm") != attrs.end(),
                             true,
-                            phi::errors::InvalidArgument(
+                            common::errors::InvalidArgument(
                                 "'padding_algorithm' Attribute is expected for "
                                 "Conv2dTransposeBiasOp. "));
           std::string padding_algorithm = attrs.at("padding_algorithm")
                                               .dyn_cast<pir::StrAttribute>()
                                               .AsString();
 
-          PADDLE_ENFORCE_EQ(
-              attrs.find("groups") != attrs.end(),
-              true,
-              phi::errors::InvalidArgument("'groups' Attribute is expected for "
-                                           "Conv2dTransposeBiasOp. "));
+          PADDLE_ENFORCE_EQ(attrs.find("groups") != attrs.end(),
+                            true,
+                            common::errors::InvalidArgument(
+                                "'groups' Attribute is expected for "
+                                "Conv2dTransposeBiasOp. "));
           int groups =
               attrs.at("groups").dyn_cast<pir::Int32Attribute>().data();
 
-          PADDLE_ENFORCE_EQ(
-              attrs.find("dilations") != attrs.end(),
-              true,
-              phi::errors::InvalidArgument("'dilations' Attribute is expected "
-                                           "for Conv2dTransposeBiasOp. "));
+          PADDLE_ENFORCE_EQ(attrs.find("dilations") != attrs.end(),
+                            true,
+                            common::errors::InvalidArgument(
+                                "'dilations' Attribute is expected "
+                                "for Conv2dTransposeBiasOp. "));
           std::vector<int> dilations;
           for (size_t i = 0;
                i < attrs.at("dilations").dyn_cast<pir::ArrayAttribute>().size();
@@ -236,7 +236,7 @@ void OperationFactory::RegisterManualOpCreator() {
 
           PADDLE_ENFORCE_EQ(attrs.find("data_format") != attrs.end(),
                             true,
-                            phi::errors::InvalidArgument(
+                            common::errors::InvalidArgument(
                                 "'data_format' Attribute is expected for "
                                 "Conv2dTransposeBiasOp. "));
           std::string data_format =
@@ -245,8 +245,8 @@ void OperationFactory::RegisterManualOpCreator() {
           PADDLE_ENFORCE_EQ(
               attrs.find("is_test") != attrs.end(),
               true,
-              phi::errors::InvalidArgument("'is_test' Attribute is expected "
-                                           "for Conv2dTransposeBiasOp. "));
+              common::errors::InvalidArgument("'is_test' Attribute is expected "
+                                              "for Conv2dTransposeBiasOp. "));
           bool is_test =
               attrs.at("is_test").dyn_cast<pir::BoolAttribute>().data();
 
@@ -278,7 +278,7 @@ void OperationFactory::RegisterManualOpCreator() {
         if (inputs.size() == 2) {
           PADDLE_ENFORCE_NE(attrs.find("keepdim"),
                             attrs.end(),
-                            phi::errors::InvalidArgument(
+                            common::errors::InvalidArgument(
                                 "'keepdim' Attribute is expected for MaxOp. "));
           bool keepdim =
               attrs.at("keepdim").dyn_cast<pir::BoolAttribute>().data();
@@ -326,13 +326,13 @@ pir::Attribute CreateIrAttribute(const std::any& obj) {
       return IrAttributeCreator<phi::IntArray>()(
           std::any_cast<phi::IntArray>(obj));
     } else {
-      PADDLE_THROW(phi::errors::Unimplemented(
+      PADDLE_THROW(common::errors::Unimplemented(
           "Type error. CreateIrAttribute for type(%s) "
           "is unimplemented CreateInCurrently.",
           obj.type().name()));
     }
   } catch (const std::bad_any_cast& e) {
-    PADDLE_THROW(phi::errors::Fatal(
+    PADDLE_THROW(common::errors::Fatal(
         "%s: CreateIrAttribute for type(%s) not successfully.",
         e.what(),
         obj.type().name()));
@@ -391,7 +391,7 @@ void BindIrOutputsWithDrrOutputs(const std::vector<const Tensor*>& tensors,
   PADDLE_ENFORCE_LE(
       tensors.size(),
       op->num_results(),
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "The size of drr outputs should less equal the size of pir outputs"));
   for (size_t i = 0; i < tensors.size(); ++i) {
     match_ctx->BindIrValue(tensors[i]->name(), op->result(i));
 
@@ -49,7 +49,7 @@ class OperationFactory {
     PADDLE_ENFORCE_NE(
         iter,
         op_creator_map.end(),
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "The op to be created is not found."
             "Suggest fix: Place check if the op named %s has been registered.",
             op_name));
 
@@ -38,17 +38,17 @@ class MatchContextImpl final {
     PADDLE_ENFORCE_NE(
         tensor_map_.count(tensor_name),
         0,
-        phi::errors::NotFound("Not found tensor. The drr tensor [%s] must "
-                              "exist in pattern graph to be obtained.",
-                              tensor_name));
+        common::errors::NotFound("Not found tensor. The drr tensor [%s] must "
+                                 "exist in pattern graph to be obtained.",
+                                 tensor_name));
     return tensor_map_.at(tensor_name);
   }
 
   pir::Operation* IrOperation(const OpCall* op_call) const {
     PADDLE_ENFORCE_NE(
         operation_map_.count(op_call),
         0,
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "Not found operation. The drr operation [%s] must exist in the "
             "pattern graph to be obtained.",
             op_call->name()));
@@ -65,7 +65,7 @@ class MatchContextImpl final {
     PADDLE_ENFORCE_NE(
         iter,
         tensor_map_.end(),
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "Not found tensor. The drr tensor [%s] is not found in the map, "
             "unable to obtain the corresponding IrValue.",
             tensor_name));
@@ -77,7 +77,7 @@ class MatchContextImpl final {
     PADDLE_ENFORCE_NE(
         iter,
         attr_map_.end(),
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "Not found attr. The drr attr [%s] is not found in the map, unable "
             "to obtain the corresponding Attribute.",
             attr_name));
 
@@ -27,12 +27,13 @@ const drr::OpCall &PatternGraph::AddOpCall(
   owned_op_call_.push_back(op_call);
   for (const auto *input : op_call->inputs()) {
     const auto &tensor_name = input->name();
-    PADDLE_ENFORCE_NE(id2owned_tensor_.count(tensor_name),
-                      0,
-                      phi::errors::NotFound("Not found tensor."
-                                            "The intput tensor [%s] must exist "
-                                            "in pattern graph to be obtained.",
-                                            tensor_name));
+    PADDLE_ENFORCE_NE(
+        id2owned_tensor_.count(tensor_name),
+        0,
+        common::errors::NotFound("Not found tensor."
+                                 "The intput tensor [%s] must exist "
+                                 "in pattern graph to be obtained.",
+                                 tensor_name));
     id2owned_tensor_.at(tensor_name)->AddConsumer(op_call.get());
 
     if (input->producer() == nullptr) {
@@ -44,12 +45,13 @@ const drr::OpCall &PatternGraph::AddOpCall(
   }
   for (auto &output : op_call->outputs()) {
     const auto &out_tensor_name = output->name();
-    PADDLE_ENFORCE_NE(id2owned_tensor_.count(out_tensor_name),
-                      0,
-                      phi::errors::NotFound("Not found tensor."
-                                            "The output tensor [%s] must exist "
-                                            "in pattern graph to be obtained.",
-                                            out_tensor_name));
+    PADDLE_ENFORCE_NE(
+        id2owned_tensor_.count(out_tensor_name),
+        0,
+        common::errors::NotFound("Not found tensor."
+                                 "The output tensor [%s] must exist "
+                                 "in pattern graph to be obtained.",
+                                 out_tensor_name));
     id2owned_tensor_[output->name()]->set_producer(op_call.get());
   }
   return *owned_op_call_.back();
@@ -68,7 +70,7 @@ drr::Tensor &PatternGraph::AddTmpTensor(
     const std::shared_ptr<drr::Tensor> &tensor) {
   PADDLE_ENFORCE_EQ(id2owned_tensor_.count(tensor->name()),
                     0,
-                    phi::errors::AlreadyExists(
+                    common::errors::AlreadyExists(
                         "Tensor already exists."
                         "The tensor [%s] must not exist in pattern graph.",
                         tensor->name()));
@@ -122,12 +124,12 @@ void ResultPatternGraph::AssignTensor(const Tensor &from, const Tensor &to) {
     input_tensors_.insert(to.name());
   }
   output_tensors_.erase(to.name());
-  PADDLE_ENFORCE_EQ(
-      output_tensors_.count(from.name()),
-      1,
-      phi::errors::PreconditionNotMet("The Tensor (%s) which be assigned must "
-                                      "be the output of result pattern graph.",
-                                      from.name()));
+  PADDLE_ENFORCE_EQ(output_tensors_.count(from.name()),
+                    1,
+                    common::errors::PreconditionNotMet(
+                        "The Tensor (%s) which be assigned must "
+                        "be the output of result pattern graph.",
+                        from.name()));
   tensor_assign_map_[from.name()] = to.name();
 }
 
@@ -158,12 +160,13 @@ void GraphTopo::WalkGraphNodesTopoOrder(
 
   // init queue
   for (const auto &tensor_name : inputs_tensor) {
-    PADDLE_ENFORCE_NE(id2owned_tensor.count(tensor_name),
-                      0,
-                      phi::errors::NotFound("Not found tensor."
-                                            "The input tensor [%s] must exists "
-                                            "in pattern graph to be obtained.",
-                                            tensor_name));
+    PADDLE_ENFORCE_NE(
+        id2owned_tensor.count(tensor_name),
+        0,
+        common::errors::NotFound("Not found tensor."
+                                 "The input tensor [%s] must exists "
+                                 "in pattern graph to be obtained.",
+                                 tensor_name));
     for (const auto &tensor_consumer :
          id2owned_tensor.at(tensor_name).get()->consumers()) {
       opcall_dependent[tensor_consumer].erase(tensor_name);
 
@@ -47,7 +47,7 @@ DrrRewritePattern::DrrRewritePattern(
       drr_pattern_owner_(std::move(drr_pattern_owner)) {
   PADDLE_ENFORCE_NE(source_pattern_graph_->owned_op_call().empty(),
                     true,
-                    phi::errors::InvalidArgument(
+                    common::errors::InvalidArgument(
                         "Source pattern graph is empty. Suggested fix: please "
                         "check the drr source pattern definition code."));
   if (VLOG_IS_ON(4)) {
@@ -427,7 +427,7 @@ bool DrrRewritePattern::MatchFromOutputToInput(
     PADDLE_ENFORCE_EQ(
         step,
         source_pattern_graph.CountOfOpCalls(),
-        phi::errors::PreconditionNotMet(
+        common::errors::PreconditionNotMet(
             "Pattern matching failed. The number of successful matches and the "
             "number of OpCalls in the source pattern graph are not equal."));
   } else {
@@ -477,7 +477,7 @@ MatchContextImpl DrrRewritePattern::CreateOperations(
     PADDLE_ENFORCE_NE(
         result_pattern_graph.id2owned_tensor().count(in_tensor),
         0,
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "Not found the input tensor. Drr input tensor [%s] must exist in "
             "the result pattern graph to be obtained.",
             in_tensor));
 
@@ -143,7 +143,7 @@ pir::Attribute deserializeAttrFromJson_scalarAttr(Json* attr_json,
     scalar = phi::Scalar(data);
   } else {
     PADDLE_ENFORCE(false,
-                   phi::errors::InvalidArgument(
+                   common::errors::InvalidArgument(
                        "Invalid tensor data type `", dtype_, "`."));
   }
 
@@ -190,7 +190,7 @@ pir::Type parseType(Json* type_json) {
   } else {
     PADDLE_ENFORCE(
         false,
-        phi::errors::InvalidArgument(
+        common::errors::InvalidArgument(
             "Unknown Attr %s for parse builtin dialect attr", type_name));
   }
 
@@ -219,7 +219,7 @@ pir::Attribute parseAttr(Json* attr_json) {
   } else {
     PADDLE_ENFORCE(
         false,
-        phi::errors::InvalidArgument(
+        common::errors::InvalidArgument(
             "Unknown Attr %s for parse builtin dialect attr", attr_name));
   }
 
@@ -285,7 +285,7 @@ pir::Attribute AttrTypeReader::ReadBuiltInAttr(const std::string attr_name,
   } else {
     PADDLE_ENFORCE(
         false,
-        phi::errors::InvalidArgument(
+        common::errors::InvalidArgument(
             "Unknown Attr %s for parse builtin dialect attr", attr_name));
   }
   return pir::Attribute();
@@ -312,7 +312,7 @@ pir::Attribute AttrTypeReader::ReadPaddleOperatorAttr(
                                         int8_t>(attr_json, ctx);
   } else {
     PADDLE_ENFORCE(false,
-                   phi::errors::InvalidArgument(
+                   common::errors::InvalidArgument(
                        "Unknown Attr %s for parse paddleoperator dialect attr",
                        attr_name));
   }
@@ -482,7 +482,7 @@ pir::Type AttrTypeReader::ReadBuiltInType(const std::string type_name,
         type_json, ctx);
   } else {
     PADDLE_ENFORCE(false,
-                   phi::errors::InvalidArgument(
+                   common::errors::InvalidArgument(
                        "Unknown Type %s for parse builtintype", type_name));
     return pir::Type();
   }
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ struct IrAttrTypeCast<std::vector<int64_t>> {`
`125`	`125`	`result =`
`126`	`126`	`attr.dyn_cast<paddle::dialect::IntArrayAttribute>().data().GetData();`
`127`	`127`	`} else {`
`128`		`- PADDLE_THROW(phi::errors::Unavailable(`
	`128`	`+ PADDLE_THROW(common::errors::Unavailable(`
`129`	`129`	`"Dynamic cast failed for IR attribute vector<int64_t>"));`
`130`	`130`	`}`
`131`	`131`	`return result;`