[Inference] Fix delete pass not taking effect (#61056)

bukejiyu · web-flow · commit 54321b6c9d57 · 2024-01-30T19:31:18.000+08:00
* delete_pass fix

* update

update
diff --git a/paddle/fluid/inference/api/analysis_config.cc b/paddle/fluid/inference/api/analysis_config.cc
@@ -1093,6 +1093,9 @@ void AnalysisConfig::Update() {
         "but did not have the option -DWITH_CUSTOM_DEVICE compiled."));
 #endif
   }
+  for (auto &delete_pass : pass_builder()->GetAllDeletedPasses()) {
+    pass_builder_->DeletePass(delete_pass);
+  }
 }
 
 std::string AnalysisConfig::SerializeInfoCache() {
diff --git a/paddle/fluid/inference/api/paddle_pass_builder.h b/paddle/fluid/inference/api/paddle_pass_builder.h
@@ -205,6 +205,7 @@ class PD_INFER_DECL CpuPassStrategy : public PassStrategy {
     use_mkldnn_bfloat16_ = other.use_mkldnn_bfloat16_;
     use_mkldnn_int8_ = other.use_mkldnn_int8_;
     disable_mkldnn_fc_passes_ = other.disable_mkldnn_fc_passes_;
+    deleted_passes_ = other.deleted_passes_;
   }
   /// \brief Default destructor.
   virtual ~CpuPassStrategy() = default;
@@ -256,6 +257,7 @@ class PD_INFER_DECL GpuPassStrategy : public PassStrategy {
       : PassStrategy(other.AllPasses()) {
     use_gpu_ = true;
     use_cudnn_ = other.use_cudnn_;
+    deleted_passes_ = other.deleted_passes_;
   }
 
   /// \brief Enable the use of cuDNN kernel.
@@ -291,6 +293,11 @@ class PD_INFER_DECL GpuPassStrategy : public PassStrategy {
 class PD_INFER_DECL XpuPassStrategy final : public PassStrategy {
  public:
   XpuPassStrategy();
+  explicit XpuPassStrategy(const XpuPassStrategy &other)
+      : PassStrategy(other.AllPasses()) {
+    use_xpu_ = true;
+    deleted_passes_ = other.deleted_passes_;
+  }
 };
 
 /// \class CustomDevicePassStrategy
@@ -306,6 +313,7 @@ class PD_INFER_DECL CustomDevicePassStrategy final : public PassStrategy {
   explicit CustomDevicePassStrategy(const CustomDevicePassStrategy &other)
       : PassStrategy(other.AllPasses()) {
     use_custom_device_ = true;
+    deleted_passes_ = other.deleted_passes_;
   }
 };
 
@@ -322,6 +330,7 @@ class PD_INFER_DECL IpuPassStrategy final : public PassStrategy {
   explicit IpuPassStrategy(const IpuPassStrategy &other)
       : PassStrategy(other.AllPasses()) {
     use_ipu_ = true;
+    deleted_passes_ = other.deleted_passes_;
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1093,6 +1093,9 @@ void AnalysisConfig::Update() {`
`1093`	`1093`	`"but did not have the option -DWITH_CUSTOM_DEVICE compiled."));`
`1094`	`1094`	`#endif`
`1095`	`1095`	`}`
	`1096`	`+ for (auto &delete_pass : pass_builder()->GetAllDeletedPasses()) {`
	`1097`	`+ pass_builder_->DeletePass(delete_pass);`
	`1098`	`+ }`
`1096`	`1099`	`}`
`1097`	`1100`
`1098`	`1101`	`std::string AnalysisConfig::SerializeInfoCache() {`