Fix tensor_comsumer tensor_consumer,etc (#62213)

co63oc · web-flow · commit a77172c4dae9 · 2024-03-01T23:12:35.000+08:00
diff --git a/paddle/fluid/pir/drr/src/attr_type_uilts.h b/paddle/fluid/pir/drr/src/attr_type_uilts.h
@@ -48,15 +48,15 @@ PD_SPECIALIZE_CppTypeToIrAttribute(phi::IntArray,
                                    paddle::dialect::IntArrayAttribute);
 
 template <typename T>
-struct IrAttrbuteCreator {
+struct IrAttributeCreator {
   typename CppTypeToIrAttribute<T>::type operator()(T obj) const {
     return CppTypeToIrAttribute<T>::type::template get(
         pir::IrContext::Instance(), obj);
   }
 };
 
 template <>
-struct IrAttrbuteCreator<std::vector<int32_t>> {
+struct IrAttributeCreator<std::vector<int32_t>> {
   pir::ArrayAttribute operator()(std::vector<int32_t> obj) const {
     std::vector<pir::Attribute> attr_vec;
     attr_vec.reserve(obj.size());
@@ -69,7 +69,7 @@ struct IrAttrbuteCreator<std::vector<int32_t>> {
 };
 
 template <>
-struct IrAttrbuteCreator<std::vector<float>> {
+struct IrAttributeCreator<std::vector<float>> {
   pir::ArrayAttribute operator()(std::vector<float> obj) const {
     std::vector<pir::Attribute> attr_vec;
     attr_vec.reserve(obj.size());
diff --git a/paddle/fluid/pir/drr/src/ir_operation_factory.cc b/paddle/fluid/pir/drr/src/ir_operation_factory.cc
@@ -65,33 +65,33 @@ void OperationFactory::RegisterManualOpCreator() {
 
 pir::Attribute CreateIrAttribute(const std::any& obj) {
   if (obj.type() == typeid(bool)) {
-    return IrAttrbuteCreator<bool>()(std::any_cast<bool>(obj));
+    return IrAttributeCreator<bool>()(std::any_cast<bool>(obj));
   } else if (obj.type() == typeid(int32_t)) {
-    return IrAttrbuteCreator<int32_t>()(std::any_cast<int32_t>(obj));
+    return IrAttributeCreator<int32_t>()(std::any_cast<int32_t>(obj));
   } else if (obj.type() == typeid(int64_t)) {
-    return IrAttrbuteCreator<int64_t>()(std::any_cast<int64_t>(obj));
+    return IrAttributeCreator<int64_t>()(std::any_cast<int64_t>(obj));
   } else if (obj.type() == typeid(float)) {
-    return IrAttrbuteCreator<float>()(std::any_cast<float>(obj));
+    return IrAttributeCreator<float>()(std::any_cast<float>(obj));
   } else if (obj.type() == typeid(std::string)) {
-    return IrAttrbuteCreator<std::string>()(std::any_cast<std::string>(obj));
+    return IrAttributeCreator<std::string>()(std::any_cast<std::string>(obj));
   } else if (obj.type() == typeid(const char*)) {
-    return IrAttrbuteCreator<std::string>()(std::any_cast<const char*>(obj));
+    return IrAttributeCreator<std::string>()(std::any_cast<const char*>(obj));
   } else if (obj.type() == typeid(phi::DataType)) {
-    return IrAttrbuteCreator<phi::DataType>()(
+    return IrAttributeCreator<phi::DataType>()(
         std::any_cast<phi::DataType>(obj));
   } else if (obj.type() == typeid(phi::Place)) {
-    return IrAttrbuteCreator<phi::Place>()(std::any_cast<phi::Place>(obj));
+    return IrAttributeCreator<phi::Place>()(std::any_cast<phi::Place>(obj));
   } else if (obj.type() == typeid(std::vector<int32_t>)) {  // NOLINT
-    return IrAttrbuteCreator<std::vector<int32_t>>()(
+    return IrAttributeCreator<std::vector<int32_t>>()(
         std::any_cast<std::vector<int32_t>>(obj));
   } else if (obj.type() == typeid(std::vector<int64_t>)) {
-    return IrAttrbuteCreator<std::vector<int64_t>>()(
+    return IrAttributeCreator<std::vector<int64_t>>()(
         std::any_cast<std::vector<int64_t>>(obj));
   } else if (obj.type() == typeid(std::vector<float>)) {
-    return IrAttrbuteCreator<std::vector<float>>()(
+    return IrAttributeCreator<std::vector<float>>()(
         std::any_cast<std::vector<float>>(obj));
   } else if (obj.type() == typeid(phi::IntArray)) {
-    return IrAttrbuteCreator<phi::IntArray>()(
+    return IrAttributeCreator<phi::IntArray>()(
         std::any_cast<phi::IntArray>(obj));
   } else {
     PADDLE_THROW(
diff --git a/paddle/fluid/pir/drr/src/pattern_graph.cc b/paddle/fluid/pir/drr/src/pattern_graph.cc
@@ -148,15 +148,15 @@ void GraphTopo::WalkGraphNodesTopoOrder(
       graph_->input_tensors();
   const std::unordered_map<std::string, std::shared_ptr<Tensor>>
       &id2owned_tensor = graph_->id2owned_tensor();
-  const std::vector<std::shared_ptr<OpCall>> &owend_opcall =
+  const std::vector<std::shared_ptr<OpCall>> &owned_opcall =
       graph_->owned_op_call();
 
   std::queue<const OpCall *> opcall_queue;
   std::unordered_map<const OpCall *, std::unordered_set<std::string>>
       opcall_dependent;
 
   // init opcall_dependent
-  for (const std::shared_ptr<OpCall> &opcall_sptr : owend_opcall) {
+  for (const std::shared_ptr<OpCall> &opcall_sptr : owned_opcall) {
     if (opcall_sptr.get()->inputs().empty()) {  // opcall inputs is empty
       opcall_queue.push(opcall_sptr.get());
     } else {
@@ -174,11 +174,11 @@ void GraphTopo::WalkGraphNodesTopoOrder(
                                             "The input tensor [%s] must exists "
                                             "in pattern graph to be obtained.",
                                             tensor_name));
-    for (const auto &tensor_comsumer :
+    for (const auto &tensor_consumer :
          id2owned_tensor.at(tensor_name).get()->consumers()) {
-      opcall_dependent[tensor_comsumer].erase(tensor_name);
-      if (opcall_dependent[tensor_comsumer].empty()) {
-        opcall_queue.push(tensor_comsumer);
+      opcall_dependent[tensor_consumer].erase(tensor_name);
+      if (opcall_dependent[tensor_consumer].empty()) {
+        opcall_queue.push(tensor_consumer);
       }
     }
   }
@@ -190,10 +190,10 @@ void GraphTopo::WalkGraphNodesTopoOrder(
 
     // update opcall_dependent
     for (const auto &output_tensor : opcall->outputs()) {
-      for (const auto &tensor_comsumer : output_tensor->consumers()) {
-        opcall_dependent[tensor_comsumer].erase(output_tensor->name());
-        if (opcall_dependent[tensor_comsumer].empty()) {
-          opcall_queue.push(tensor_comsumer);
+      for (const auto &tensor_consumer : output_tensor->consumers()) {
+        opcall_dependent[tensor_consumer].erase(output_tensor->name());
+        if (opcall_dependent[tensor_consumer].empty()) {
+          opcall_queue.push(tensor_consumer);
         }
       }
     }
diff --git a/paddle/fluid/pir/drr/src/rewrite_pattern.cc b/paddle/fluid/pir/drr/src/rewrite_pattern.cc
@@ -59,7 +59,7 @@ bool DrrRewritePattern::MatchAndRewrite(
   if (PatternGraphMatch(op, src_match_ctx.get())) {
     VLOG(4) << "DRR pattern (" << pattern_name_ << ") is matched in program.";
     PatternGraphRewrite(*src_match_ctx, rewriter);
-    VLOG(4) << "DRR pattern (" << pattern_name_ << ") is rewrited in program.";
+    VLOG(4) << "DRR pattern (" << pattern_name_ << ") is rewritten in program.";
     return true;
   }
   return false;

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ bool DrrRewritePattern::MatchAndRewrite(`
`59`	`59`	`if (PatternGraphMatch(op, src_match_ctx.get())) {`
`60`	`60`	`VLOG(4) << "DRR pattern (" << pattern_name_ << ") is matched in program.";`
`61`	`61`	`PatternGraphRewrite(*src_match_ctx, rewriter);`
`62`		`- VLOG(4) << "DRR pattern (" << pattern_name_ << ") is rewrited in program.";`
	`62`	`+ VLOG(4) << "DRR pattern (" << pattern_name_ << ") is rewritten in program.";`
`63`	`63`	`return true;`
`64`	`64`	`}`
`65`	`65`	`return false;`