@@ -33,7 +33,7 @@ function(generate_unify_header DIR_NAME)
3333
3434 # generate target header file
3535 set (header_file ${CMAKE_CURRENT_SOURCE_DIR} /include /${header_name} .h)
36- file (WRITE ${header_file} "// Header file generated by paddle/pten /CMakeLists.txt for external users,\n // DO NOT edit or include it within paddle.\n\n #pragma once\n\n " )
36+ file (WRITE ${header_file} "// Header file generated by paddle/phi /CMakeLists.txt for external users,\n // DO NOT edit or include it within paddle.\n\n #pragma once\n\n " )
3737
3838 # get all top-level headers and write into header file
3939 file (GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR} \/ ${DIR_NAME} \/ *.h" )
@@ -114,6 +114,9 @@ function(kernel_library TARGET)
114114 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /gpu/${TARGET} .cu)
115115 list (APPEND gpu_srcs ${CMAKE_CURRENT_SOURCE_DIR} /gpu/${TARGET} .cu)
116116 endif ()
117+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /gpu/${TARGET} .cu.cc)
118+ list (APPEND gpu_srcs ${CMAKE_CURRENT_SOURCE_DIR} /gpu/${TARGET} .cu.cc)
119+ endif ()
117120 endif ()
118121 if (WITH_XPU)
119122 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /xpu/${TARGET} .cc)
@@ -134,17 +137,17 @@ function(kernel_library TARGET)
134137 list (APPEND all_srcs ${xpu_srcs} )
135138 foreach (src ${all_srcs} )
136139 file (READ ${src} target_content)
137- string (REGEX MATCHALL "#include \" paddle\/ pten \/ kernels\/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
140+ string (REGEX MATCHALL "#include \" paddle\/ phi \/ kernels\/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
138141 if ("${kernel_library_SUB_DIR} " STREQUAL "" )
139- string (REGEX MATCHALL "#include \" paddle\/ pten \/ kernels\/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
142+ string (REGEX MATCHALL "#include \" paddle\/ phi \/ kernels\/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
140143 else ()
141- string (REGEX MATCHALL "#include \" paddle\/ pten \/ kernels\/ ${kernel_library_SUB_DIR} \/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
144+ string (REGEX MATCHALL "#include \" paddle\/ phi \/ kernels\/ ${kernel_library_SUB_DIR} \/ [a-z0-9_]+_kernel.h\" " include_kernels ${target_content} )
142145 endif ()
143146 foreach (include_kernel ${include_kernels} )
144147 if ("${kernel_library_SUB_DIR} " STREQUAL "" )
145- string (REGEX REPLACE "#include \" paddle\/ pten \/ kernels\/ " "" kernel_name ${include_kernel} )
148+ string (REGEX REPLACE "#include \" paddle\/ phi \/ kernels\/ " "" kernel_name ${include_kernel} )
146149 else ()
147- string (REGEX REPLACE "#include \" paddle\/ pten \/ kernels\/ ${kernel_library_SUB_DIR} \/ " "" kernel_name ${include_kernel} )
150+ string (REGEX REPLACE "#include \" paddle\/ phi \/ kernels\/ ${kernel_library_SUB_DIR} \/ " "" kernel_name ${include_kernel} )
148151 endif ()
149152 string (REGEX REPLACE ".h\" " "" kernel_name ${kernel_name} )
150153 list (APPEND kernel_deps ${kernel_name} )
@@ -161,7 +164,7 @@ function(kernel_library TARGET)
161164
162165 # Build Target according different src organization
163166 if ((${cpu_srcs_len} GREATER 0 OR ${gpu_srcs_len} GREATER 0 OR
164- ${xpu_srcs_len} GREATER 0) AND (${common_srcs_len} GREATER 0 OR
167+ ${xpu_srcs_len} GREATER 0) AND (${common_srcs_len} GREATER 0 OR
165168 ${selected_rows_srcs_len} GREATER 0))
166169 # If the common_srcs/selected_rows_srcs depends on specific device srcs, build target using this rule.
167170 if (WITH_GPU)
@@ -225,11 +228,11 @@ function(kernel_library TARGET)
225228 cc_library(${TARGET} SRCS ${selected_rows_srcs} DEPS ${kernel_library_DEPS} ${kernel_deps} )
226229 endif ()
227230 else ()
228- message (FATAL_ERROR "Cannot find any implementation for ${TARGET} " )
231+ message (FATAL_ERROR "Cannot find any implementation for ${TARGET} " )
229232 endif ()
230233
231234 if (${common_srcs_len} GREATER 0 OR ${cpu_srcs_len} GREATER 0 OR
232- ${gpu_srcs_len} GREATER 0 OR ${xpu_srcs_len} GREATER 0 OR
235+ ${gpu_srcs_len} GREATER 0 OR ${xpu_srcs_len} GREATER 0 OR
233236 ${selected_rows_srcs_len} GREATER 0)
234237 # append target into PTEN_KERNELS property
235238 get_property (pten_kernels GLOBAL PROPERTY PTEN_KERNELS)
@@ -285,7 +288,7 @@ function(append_op_util_declare TARGET)
285288 string (REGEX MATCH "(PT_REGISTER_BASE_KERNEL_NAME|PT_REGISTER_ARG_MAPPING_FN)\\ ([ \t\r\n ]*[a-z0-9_]*" util_registrar "${target_content} " )
286289 string (REPLACE "PT_REGISTER_ARG_MAPPING_FN" "PT_DECLARE_ARG_MAPPING_FN" util_declare "${util_registrar} " )
287290 string (REPLACE "PT_REGISTER_BASE_KERNEL_NAME" "PT_DECLARE_BASE_KERNEL_NAME" util_declare "${util_declare} " )
288- string (APPEND util_declare ");" )
291+ string (APPEND util_declare ");\n " )
289292 file (APPEND ${op_utils_header} "${util_declare} " )
290293endfunction ()
291294
0 commit comments