PaddlePaddle
diff --git a/‎paddle/fluid/operators/activation_op.h
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions b/‎paddle/fluid/operators/activation_op.h
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions
diff --git a/‎paddle/fluid/operators/batch_norm_op.cc
Copy file name to clipboard
+1-67Lines changed: 1 addition & 67 deletions b/‎paddle/fluid/operators/batch_norm_op.cc
Copy file name to clipboard
+1-67Lines changed: 1 addition & 67 deletions
diff --git a/‎paddle/fluid/operators/batch_norm_op.h
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎paddle/fluid/operators/batch_norm_op.h
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎paddle/fluid/operators/elementwise/elementwise_mul_op.h
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎paddle/fluid/operators/elementwise/elementwise_mul_op.h
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎paddle/fluid/operators/fill_constant_batch_size_like_op.cc
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎paddle/fluid/operators/fill_constant_batch_size_like_op.cc
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎paddle/fluid/operators/fused/fused_gemm_epilogue_op.cc
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion b/‎paddle/fluid/operators/fused/fused_gemm_epilogue_op.cc
Copy file name to clipboard
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎paddle/fluid/operators/fused/multi_gru_op.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎paddle/fluid/operators/fused/multi_gru_op.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
@@ -30,8 +30,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/tensor_util.h"
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/phi/common/float16.h"
-#include "paddle/phi/kernels/funcs/blas/blas.h"
-#include "paddle/phi/kernels/funcs/eigen/common.h"
 
 #include "paddle/phi/kernels/funcs/activation_functor.h"
 
@@ -61,15 +59,6 @@ struct BaseActivationFunctor {
   template <typename T>                   \
   using name##GradGradFunctor = phi::funcs::name##GradGradFunctor<T>;
 
-USE_PHI_FUNCTOR(Tanh)
-USE_PHI_FUNCTOR(Relu6)
-USE_PHI_FUNCTOR(HardShrink)
-USE_PHI_FUNCTOR(ELU)
-USE_PHI_FUNCTOR(Sigmoid)
-USE_PHI_FUNCTOR(HardSigmoid)
-USE_PHI_FUNCTOR(Swish)
-USE_PHI_FUNCTOR(HardSwish)
-USE_PHI_FUNCTOR(Pow)
 USE_PHI_FUNCTOR(Mish)
 
 template <typename T>
 
@@ -23,7 +23,6 @@ limitations under the License. */
 #include "paddle/fluid/platform/onednn_helper.h"
 #endif
 
-#include "paddle/fluid/prim/api/composite_backward/composite_backward_api.h"
 #include "paddle/fluid/prim/utils/static/composite_grad_desc_maker.h"
 #include "paddle/fluid/prim/utils/static/desc_tensor.h"
 
@@ -547,70 +546,6 @@ phi::KernelKey BatchNormDoubleGradOp::GetExpectedKernelType(
                         ctx.GetPlace());
 }
 
-class BatchNormCompositeGradOpMaker : public prim::CompositeGradOpMakerBase {
-  using prim::CompositeGradOpMakerBase::CompositeGradOpMakerBase;
-
- public:
-  void Apply() override {
-    // inputs and outputs of batch_norm
-    paddle::Tensor x = this->GetSingleForwardInput("X");
-    paddle::Tensor scale = this->GetSingleForwardInput("Scale");
-    paddle::Tensor bias = this->GetSingleForwardInput("Bias");
-    paddle::Tensor mean = this->GetSingleForwardInput("Mean");
-    paddle::Tensor variance = this->GetSingleForwardInput("Variance");
-    paddle::Tensor y = this->GetSingleForwardOutput("Y");
-    paddle::Tensor mean_out = this->GetSingleForwardOutput("MeanOut");
-    paddle::Tensor variance_out = this->GetSingleForwardOutput("VarianceOut");
-    paddle::Tensor saved_mean = this->GetSingleForwardOutput("SavedMean");
-    paddle::Tensor saved_variance =
-        this->GetSingleForwardOutput("SavedVariance");
-    paddle::optional<paddle::Tensor> reserve_space;
-
-    paddle::Tensor y_grad = this->GetSingleOutputGrad("Y");
-    paddle::Tensor x_grad = this->GetSingleInputGrad("X");
-    paddle::Tensor scale_grad = this->GetSingleInputGrad("Scale");
-    paddle::Tensor bias_grad = this->GetSingleInputGrad("Bias");
-
-    auto dx_ptr = this->GetOutputPtr(&x_grad);
-    std::string dx_name = this->GetOutputName(x_grad);
-    auto dscale_ptr = this->GetOutputPtr(&scale_grad);
-    std::string dscale_name = this->GetOutputName(scale_grad);
-    auto dbias_ptr = this->GetOutputPtr(&bias_grad);
-    std::string dbias_name = this->GetOutputName(bias_grad);
-
-    // attrs of batch_norm
-    auto momentum = this->Attr<float>("momentum");
-    auto epsilon = this->Attr<float>("epsilon");
-    auto data_layout = this->Attr<std::string>("data_layout");
-    auto is_test = this->Attr<bool>("is_test");
-    auto use_global_stats = this->Attr<bool>("use_global_stats");
-    auto trainable_statistics = this->Attr<bool>("trainable_statistics");
-
-    VLOG(3) << "Running batch_norm composite func";
-    prim::batch_norm_grad<prim::DescTensor>(x,
-                                            scale,
-                                            bias,
-                                            mean_out,
-                                            variance_out,
-                                            saved_mean,
-                                            saved_variance,
-                                            reserve_space,
-                                            y_grad,
-                                            momentum,
-                                            epsilon,
-                                            data_layout,
-                                            is_test,
-                                            use_global_stats,
-                                            trainable_statistics,
-                                            dx_ptr,
-                                            dscale_ptr,
-                                            dbias_ptr);
-    this->RecoverOutputName(x_grad, dx_name);
-    this->RecoverOutputName(scale_grad, dscale_name);
-    this->RecoverOutputName(bias_grad, dbias_name);
-  }
-};
-
 DECLARE_INPLACE_OP_INFERER(BatchNormDoubleGradOpInplaceInferer, {"DY", "DDY"});
 
 }  // namespace operators
@@ -627,8 +562,7 @@ REGISTER_OPERATOR(batch_norm,
                   ops::BatchNormOpMaker,
                   ops::BatchNormOpInferVarType,
                   ops::BatchNormGradMaker<paddle::framework::OpDesc>,
-                  ops::BatchNormGradMaker<paddle::imperative::OpBase>,
-                  ops::BatchNormCompositeGradOpMaker);
+                  ops::BatchNormGradMaker<paddle::imperative::OpBase>);
 
 REGISTER_OPERATOR(batch_norm_grad,
                   ops::BatchNormGradOp,
 
@@ -19,9 +19,6 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/framework/op_registry.h"
-#include "paddle/phi/kernels/funcs/eigen/common.h"
-#include "paddle/phi/kernels/funcs/math_function.h"
-#include "paddle/phi/kernels/funcs/norm_utils.h"
 
 namespace paddle {
 namespace operators {
 
@@ -18,7 +18,6 @@ limitations under the License. */
 
 #include "paddle/fluid/operators/elementwise/elementwise_op.h"
 #include "paddle/phi/backends/cpu/cpu_info.h"
-#include "paddle/phi/kernels/elementwise_kernel.h"
 
 namespace paddle {
 namespace operators {
 
@@ -19,7 +19,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/phi/core/infermeta_utils.h"
 #include "paddle/phi/infermeta/unary.h"
-#include "paddle/phi/kernels/funcs/math_function.h"
 
 namespace paddle {
 namespace operators {
 
@@ -18,7 +18,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/phi/core/infermeta_utils.h"
 #include "paddle/phi/infermeta/fusion.h"
-#include "paddle/phi/kernels/funcs/fused_gemm_epilogue.h"
 
 namespace paddle {
 namespace operators {
 
@@ -18,9 +18,6 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/phi/kernels/funcs/blas/blas.h"
-#include "paddle/phi/kernels/funcs/fc_functor.h"
-#include "paddle/phi/kernels/funcs/sequence2batch.h"
 
 namespace paddle {
 namespace operators {