fix conflict

PaddlePaddle · Apr 23, 2024 · 60157f1 · 60157f1
1 parent 671ad3d
commit 60157f1
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git a/paddle/phi/kernels/cpu/reduce_as_grad_kernel.cc b/paddle/phi/kernels/cpu/reduce_as_grad_kernel.cc
@@ -18,8 +18,6 @@
 
 #include "paddle/phi/core/device_context.h"
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 #include "paddle/phi/kernels/impl/reduce_grad.h"
 
 namespace phi {

diff --git a/paddle/phi/kernels/cpu/reduce_as_kernel.cc b/paddle/phi/kernels/cpu/reduce_as_kernel.cc
@@ -19,8 +19,6 @@
 #include "paddle/phi/core/device_context.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/kernels/cpu/reduce.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 
 namespace phi {
 

diff --git a/paddle/phi/kernels/gpu/reduce_as_grad_kernel.cu b/paddle/phi/kernels/gpu/reduce_as_grad_kernel.cu
@@ -18,8 +18,6 @@
 
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_function.h"
 #include "paddle/phi/kernels/gpu/reduce_grad.h"
 
 namespace phi {

diff --git a/paddle/phi/kernels/gpu/reduce_as_kernel.cu b/paddle/phi/kernels/gpu/reduce_as_kernel.cu
@@ -18,8 +18,6 @@
 
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/reduce_sum_kernel.h"
 
 namespace phi {
 

diff --git a/third_party/pybind b/third_party/pybind