fix conflict

PaddlePaddle · Sep 28, 2023 · 7db6fec · 7db6fec
1 parent ebe7856
commit 7db6fec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring.cc
@@ -17,18 +17,18 @@
 #include <glog/logging.h>
 
 #include "paddle/cinn/auto_schedule/analysis/analyze_ir.h"
+#include "paddle/cinn/ir/ir_printer.h"
 #include "paddle/cinn/ir/schedule/ir_schedule.h"
 #include "paddle/cinn/ir/schedule/ir_schedule_util.h"
 #include "paddle/cinn/ir/tensor.h"
 #include "paddle/cinn/ir/utils/ir_copy.h"
 #include "paddle/cinn/ir/utils/ir_nodes_collector.h"
-#include "paddle/cinn/ir/utils/ir_printer.h"
 
 namespace cinn {
 namespace auto_schedule {
 
 bool ReductionFactoring::CanApply(const std::string& block_name,
-                                  ir::IRSchedule* ir_schedule) {
+                                  ir::IRSchedule* ir_schedule) const {
   ir::Expr block_expr = ir_schedule->GetBlock(block_name);
   ir::ScheduleBlockRealize* block_realize =
       block_expr.As<ir::ScheduleBlockRealize>();
@@ -95,7 +95,7 @@ bool ReductionFactoring::CanApply(const std::string& block_name,
 
 RuleApplyType ReductionFactoring::AnalyseApplyType(
     SearchState state, const std::string& block_name) const {
-  return CanApply(block_name, &state->ir_schedule)
+  return this->CanApply(block_name, &(state->ir_schedule))
              ? RuleApplyType::kApply
              : RuleApplyType::kCannotApply;
 }

diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring.h
@@ -51,7 +51,8 @@ class ReductionFactoring : public AutoGenRule {
   void Apply(const std::string& block_name, ir::IRSchedule* ir_schedule);
 
  private:
-  bool CanApply(const std::string& block_name, ir::IRSchedule* ir_schedule);
+  bool CanApply(const std::string& block_name,
+                ir::IRSchedule* ir_schedule) const;
 };
 
 }  // namespace auto_schedule

diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/reduction_factoring_test.cc
@@ -22,7 +22,7 @@
 #include <numeric>
 
 #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h"
-#include "paddle/cinn/ir/utils/ir_printer.h"
+#include "paddle/cinn/ir/ir_printer.h"
 #include "test/cpp/cinn/concrete_program_builder.h"
 
 namespace cinn {