[Fix] fix phi extension header error when compiling custom device

paddle/phi/kernels/copysign_grad_kernel.h

@@ -15,8 +15,6 @@
 #pragma once
 
 #include "paddle/phi/core/dense_tensor.h"
-#include "paddle/phi/kernels/funcs/elementwise_base.h"
-#include "paddle/phi/kernels/funcs/elementwise_functor.h"
 
 namespace phi {
 

paddle/phi/kernels/copysign_kernel.h

@@ -15,8 +15,6 @@
 #pragma once
 
 #include "paddle/phi/core/dense_tensor.h"
-#include "paddle/phi/kernels/funcs/broadcast_function.h"
-#include "paddle/phi/kernels/funcs/elementwise_base.h"
 namespace phi {
 
 using float16 = phi::dtype::float16;

paddle/phi/kernels/cpu/copysign_grad_kernel.cc

@@ -13,10 +13,11 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/copysign_grad_kernel.h"
-
 #include "paddle/phi/backends/cpu/cpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/kernels/cpu/elementwise_grad.h"
+#include "paddle/phi/kernels/funcs/elementwise_base.h"
+#include "paddle/phi/kernels/funcs/elementwise_functor.h"
 
 namespace phi {
 

paddle/phi/kernels/cpu/copysign_kernel.cc

@@ -13,9 +13,10 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/copysign_kernel.h"
-
 #include "paddle/phi/backends/cpu/cpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/funcs/broadcast_function.h"
+#include "paddle/phi/kernels/funcs/elementwise_base.h"
 namespace phi {
 template <typename T, typename Context>
 void CopySignKernel(const Context& dev_ctx,

paddle/phi/kernels/gpu/copysign_grad_kernel.cu

@@ -13,9 +13,10 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/copysign_grad_kernel.h"
-
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/funcs/elementwise_base.h"
+#include "paddle/phi/kernels/funcs/elementwise_functor.h"
 #include "paddle/phi/kernels/gpu/elementwise_grad.h"
 
 namespace phi {

paddle/phi/kernels/gpu/copysign_kernel.cu

@@ -13,9 +13,10 @@
 // limitations under the License.
 
 #include "paddle/phi/kernels/copysign_kernel.h"
-
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/funcs/broadcast_function.h"
+#include "paddle/phi/kernels/funcs/elementwise_base.h"
 namespace phi {
 template <typename T, typename Context>
 void CopySignKernel(const Context& dev_ctx,

test/custom_runtime/CMakeLists.txt

@@ -33,4 +33,8 @@ if(WITH_CUSTOM_DEVICE AND NOT WITH_GPU)
   set_tests_properties(test_fleet_launch_custom_device PROPERTIES TIMEOUT 120)
   set_tests_properties(test_custom_cpu_to_static PROPERTIES TIMEOUT 180)
   set_tests_properties(test_custom_op_setup PROPERTIES TIMEOUT 120)
+
+  # cpp testing
+  paddle_test(extension_header_test SRCS extension_header_test.cc DEPS phi
+              common)
 endif()

test/custom_runtime/extension_header_test.cc

@@ -0,0 +1,24 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
+// Note(qili93): ensure compile with one header file 'extension.h' only,
+// !!! do not fix this ut by adding other header files (PR#60842) !!!
+#include "paddle/phi/extension.h"
+
+TEST(CustomDevce, extension_header) {
+  VLOG(1) << "check extension header support compile only";
+}