fix conflict

PaddlePaddle · Apr 23, 2024 · d3af174 · d3af174
1 parent 3822a8c
commit d3af174
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
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 #include "paddle/phi/kernels/reduce_as_kernel.h"
 
 #include "paddle/phi/core/device_context.h"

diff --git a/paddle/phi/kernels/cpu/reduce_as_kernel.cc b/paddle/phi/kernels/cpu/reduce_as_kernel.cc
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/reduce_as_kernel.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 
 #include "paddle/phi/core/device_context.h"
 #include "paddle/phi/core/kernel_registry.h"

diff --git a/paddle/phi/kernels/gpu/reduce_as_grad_kernel.cu b/paddle/phi/kernels/gpu/reduce_as_grad_kernel.cu
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/reduce_as_grad_kernel.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"

diff --git a/paddle/phi/kernels/gpu/reduce_as_kernel.cu b/paddle/phi/kernels/gpu/reduce_as_kernel.cu
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/reduce_as_kernel.h"
-#include "paddle/phi/kernels/funcs/common_shape.h"
-#include "paddle/phi/kernels/funcs/reduce_functor.h"
 
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"

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