[Inference] Transfer layout pass

paddle/cinn/hlir/dialect/operator/transforms/group_merge/single_op_fallback_to_phi.cc

@@ -14,12 +14,12 @@
 
 #include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/single_op_fallback_to_phi.h"
 
-#include "build/paddle/cinn/hlir/dialect/operator/ir/cinn_op.h"
-#include "build/paddle/fluid/pir/dialect/operator/ir/pd_op.h"
+#include "paddle/cinn/hlir/dialect/operator/ir/cinn_op.h"
 #include "paddle/cinn/hlir/dialect/operator/ir/manual_op.h"
 #include "paddle/cinn/hlir/dialect/operator/ir/op_dialect.h"
 #include "paddle/cinn/hlir/dialect/runtime/ir/runtime_dialect.h"
 #include "paddle/fluid/pir/dialect/kernel/ir/kernel_dialect.h"
+#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
 #include "paddle/pir/include/dialect/control_flow/ir/cf_op.h"
 
 namespace cinn {

paddle/fluid/eager/auto_code_generator/CMakeLists.txt

@@ -12,6 +12,10 @@ set(EAGER_GENERATOR_DEPS
     imperative_profiler
     imperative_flag)
 
+if(WITH_CINN)
+  list(REMOVE_ITEM EAGER_GENERATOR_DEPS imperative_flag)
+endif()
+
 if(WITH_CUSTOM_DEVICE)
   set(EAGER_GENERATOR_DEPS ${EAGER_GENERATOR_DEPS}
                            custom_device_common_op_registry)

paddle/fluid/inference/api/analysis_config.cc

@@ -580,6 +580,9 @@ AnalysisConfig::AnalysisConfig(const AnalysisConfig &other) {
   CP_MEMBER(pm_opt_level_);
   CP_MEMBER(ir_debug_passes_);
 
+  // passes
+  CP_MEMBER(use_transfer_layout_pass_);
+
   if (use_gpu_) {
     PADDLE_ENFORCE_EQ(use_xpu_,
                       false,
@@ -1554,6 +1557,13 @@ void AnalysisConfig::EnableCINN() {
 
 bool AnalysisConfig::cinn_enabled() const { return use_cinn_; }
 
+void AnalysisConfig::EnableTransferLayout() {
+  use_transfer_layout_pass_ = true;
+}
+bool AnalysisConfig::transfer_layout_enabled() const {
+  return use_transfer_layout_pass_;
+}
+
 void AnalysisConfig::EnableCustomPasses(const std::vector<std::string> &passes,
                                         bool custom_pass_only) {
   custom_passes_ = passes;

paddle/fluid/inference/api/analysis_predictor.cc

@@ -52,6 +52,7 @@
 #include "paddle/fluid/inference/utils/model_utils.h"
 #include "paddle/fluid/inference/utils/singleton.h"
 #include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/pir/transforms/general/transfer_layout_pass.h"
 #include "paddle/fluid/platform/cpu_helper.h"
 #include "paddle/fluid/platform/device/gpu/gpu_info.h"
 #include "paddle/fluid/platform/device_context.h"
@@ -938,6 +939,9 @@ bool AnalysisPredictor::PrepareExecutor() {
             }
             pass_pm.AddPass(std::move(pass));
           }
+          if (config_.use_transfer_layout_pass_) {
+            pass_pm.AddPass(pir::CreateTransferLayoutPass());
+          }
         }
 
 #ifdef PADDLE_WITH_XPU

paddle/fluid/inference/api/paddle_analysis_config.h

@@ -1178,6 +1178,9 @@ struct PD_INFER_DECL AnalysisConfig {
   ///
   bool cinn_enabled() const;
 
+  void EnableTransferLayout();
+  bool transfer_layout_enabled() const;
+
   ///
   /// \brief Set the custom passes list .
   ///
@@ -1415,6 +1418,8 @@ struct PD_INFER_DECL AnalysisConfig {
   bool skip_load_params_{false};
 
   bool use_pir_{false};
+  bool use_transfer_layout_pass_{false};
+
   std::vector<std::string> custom_passes_;
   bool custom_pass_only_{false};
   int pm_opt_level_{2};