From e5e3049b07a50b9224f24d10ed4e45f7941ad768 Mon Sep 17 00:00:00 2001
From: Wang Huan <wanghuan29@baidu.com>
Date: Mon, 9 Oct 2023 02:41:48 +0000
Subject: [PATCH] refine

---
 paddle/fluid/framework/ir/sync_batch_norm_pass.cc |  3 ---
 paddle/fluid/framework/unused_var_check.cc        |  1 -
 paddle/fluid/pybind/eager_generator.h             | 10 ----------
 paddle/phi/api/yaml/op_compat.yaml                |  5 -----
 4 files changed, 19 deletions(-)

diff --git a/paddle/fluid/framework/ir/sync_batch_norm_pass.cc b/paddle/fluid/framework/ir/sync_batch_norm_pass.cc
index 1ba1d3e61f8be..828418597e623 100644
--- a/paddle/fluid/framework/ir/sync_batch_norm_pass.cc
+++ b/paddle/fluid/framework/ir/sync_batch_norm_pass.cc
@@ -39,9 +39,6 @@ class SyncBatchNormPass : public Pass {
         if (op->Type() == "batch_norm_grad") {
           op->SetType("sync_batch_norm_grad");
         }
-        if (op->Type() == "inplace_abn_grad") {
-          op->SetAttr("use_sync_bn", true);
-        }
       }
     }
   }
diff --git a/paddle/fluid/framework/unused_var_check.cc b/paddle/fluid/framework/unused_var_check.cc
index 6e5e8a672adde..16e6109a60657 100644
--- a/paddle/fluid/framework/unused_var_check.cc
+++ b/paddle/fluid/framework/unused_var_check.cc
@@ -59,7 +59,6 @@ static const std::unordered_set<std::string> &GetOpWithUnusedVarAllowSet() {
       "batch_norm_grad",                    // 0
       "sync_batch_norm",                    // 0
       "sync_batch_norm_grad",               // 0
-      "inplace_abn_grad",                   // 0
       "dgc_momentum",                       // 0
       "fake_quantize_range_abs_max",        // 0
       "rmsprop",                            // 0
diff --git a/paddle/fluid/pybind/eager_generator.h b/paddle/fluid/pybind/eager_generator.h
index 03b8690569c22..9e7a2ec10063b 100644
--- a/paddle/fluid/pybind/eager_generator.h
+++ b/paddle/fluid/pybind/eager_generator.h
@@ -249,8 +249,6 @@ std::map<std::string, std::set<std::string>> op_ins_map = {
     {"crop", {"X", "Y", "Offsets"}},
     {"batch_norm",
      {"X", "Scale", "Bias", "Mean", "Variance", "MomentumTensor"}},
-    {"inplace_abn",
-     {"X", "Scale", "Bias", "Mean", "Variance", "MomentumTensor"}},
     {"linear_interp", {"X", "OutSize"}},
     {"bilinear_interp", {"X", "OutSize"}},
     {"trilinear_interp", {"X", "OutSize"}},
@@ -297,13 +295,6 @@ std::map<std::string, std::set<std::string>> op_outs_map = {
       "SavedVariance",
       "ReserveSpace"}},
     {"lstsq", {"Solution", "Residuals", "Rank", "SingularValues"}},
-    {"inplace_abn",
-     {"Y",
-      "MeanOut",
-      "VarianceOut",
-      "SavedMean",
-      "SavedVariance",
-      "ReserveSpace"}},
     {"fused_attention", {"LnMean",         "LnVariance",
                          "LnOut",          "QKVOut",
                          "QKVBiasOut",     "TransposeOut2",
@@ -485,7 +476,6 @@ std::map<std::string, std::set<std::string>> op_passing_outs_map = {
     {"merged_momentum", {"ParamOut", "VelocityOut", "MasterParamOut"}},
     {"sparse_momentum", {"ParamOut", "VelocityOut", "MasterParamOut"}},
     {"batch_norm", {"MeanOut", "VarianceOut"}},
-    {"inplace_abn", {"MeanOut", "VarianceOut"}},
     {"sync_batch_norm", {"MeanOut", "VarianceOut"}},
     {"accuracy", {"Correct", "Total"}},
     {"fill_constant", {"Out"}},
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
index f74df02af26d2..30041bf323b1e 100755
--- a/paddle/phi/api/yaml/op_compat.yaml
+++ b/paddle/phi/api/yaml/op_compat.yaml
@@ -1490,11 +1490,6 @@
   attrs :
     axis : dim
 
-- op : inplace_abn
-  backward : inplace_abn_grad
-  extra :
-    attrs : [bool use_mkldnn = false, bool fuse_with_relu = false]
-
 - op : instance_norm
   inputs :
     x : X