Skip to content

Commit 1047cb1

Browse files
zhiqiuzhiqiu
authored
compile phi/backends into one static library (#44373)
* compile into one static library * fix xpu compile * fix xpu compile * fix inference compile * fix inference compile * add custom test * revert one file
1 parent 4e1f769 commit 1047cb1

File tree

19 files changed

+66
-164
lines changed

19 files changed

+66
-164
lines changed

‎paddle/fluid/imperative/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if(WITH_GPU)
5252
cc_library(
5353
layout_autotune
5454
SRCS layout_autotune.cc
55-
DEPS op_info phi_gpu_info)
55+
DEPS op_info phi_backends)
5656
else()
5757
cc_library(
5858
layout_autotune

‎paddle/fluid/memory/allocation/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include(ExternalProject)
22

3-
set(ALLOCATOR_DEPS place stats profiler)
3+
set(ALLOCATOR_DEPS place stats profiler phi_backends)
44
set(ALLOCATOR_SRCS
55
allocator.cc
66
cpu_allocator.cc
@@ -54,7 +54,6 @@ endif()
5454

5555
if(WITH_CUSTOM_DEVICE)
5656
list(APPEND ALLOCATOR_SRCS custom_allocator.cc)
57-
list(APPEND ALLOCATOR_DEPS device_manager)
5857
endif()
5958

6059
if(WITH_XPU)

‎paddle/fluid/platform/CMakeLists.txt‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,9 @@ cc_library(
220220
${XPU_CTX_DEPS}
221221
${MLU_CTX_DEPS}
222222
eigen3
223+
phi_backends
224+
phi_device_context
223225
generator)
224-
if(WITH_XPU)
225-
target_link_libraries(device_context xpu_context xpu_resource_pool)
226-
endif()
227-
228-
if(WITH_MKLDNN)
229-
target_link_libraries(device_context onednn_context)
230-
endif()
231-
232-
target_link_libraries(device_context cpu_context)
233226

234227
cc_library(
235228
collective_helper
@@ -244,22 +237,19 @@ if(WITH_CNCL)
244237
endif()
245238

246239
if(WITH_GPU OR WITH_ROCM)
247-
target_link_libraries(device_context gpu_info gpu_context phi_gpu_info)
248240
target_link_libraries(device_context gpu_resource_pool)
249241
endif()
250-
if(WITH_CUSTOM_DEVICE)
251-
target_link_libraries(device_context custom_context)
252-
endif()
242+
253243
if(WITH_ASCEND_CL)
254244
target_link_libraries(device_context npu_resource_pool)
255245
endif()
256246

257-
if(WITH_MLU)
258-
target_link_libraries(device_context mlu_resource_pool)
247+
if(WITH_XPU)
248+
target_link_libraries(device_context xpu_resource_pool)
259249
endif()
260250

261-
if(WITH_CUSTOM_DEVICE)
262-
target_link_libraries(device_context custom_context)
251+
if(WITH_MLU)
252+
target_link_libraries(device_context mlu_resource_pool)
263253
endif()
264254

265255
cc_test(

‎paddle/fluid/platform/device/gpu/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ if(WITH_GPU)
33
nv_library(
44
gpu_info
55
SRCS gpu_info.cc
6-
DEPS phi_gpu_info gflags glog enforce monitor dynload_cuda)
6+
DEPS phi_backends gflags glog enforce monitor dynload_cuda)
77

88
nv_test(cuda_helper_test SRCS cuda_helper_test.cu)
99
nv_test(
@@ -15,7 +15,7 @@ elseif(WITH_ROCM)
1515
hip_library(
1616
gpu_info
1717
SRCS gpu_info.cc
18-
DEPS phi_gpu_info gflags glog enforce monitor dynload_cuda)
18+
DEPS phi_backends gflags glog enforce monitor dynload_cuda)
1919

2020
hip_test(cuda_helper_test SRCS cuda_helper_test.cu)
2121
hip_test(

‎paddle/fluid/platform/device/xpu/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cc_library(
2020
xpulib
2121
device_context
2222
place
23-
phi_xpu_info)
23+
phi_backends)
2424
cc_library(
2525
xpu_op_list
2626
SRCS xpu_op_list.cc

‎paddle/phi/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif()
3030
set(PHI_DEPS
3131
convert_utils
3232
dense_tensor
33-
phi_context
33+
phi_backends
3434
kernel_factory
3535
kernel_context
3636
arg_map_context

‎paddle/phi/api/lib/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,12 @@ cc_library(
351351
cc_library(
352352
context_pool
353353
SRCS context_pool.cc
354-
DEPS phi_context phi_enforce place init)
354+
DEPS phi_backends phi_enforce place init)
355355

356356
cc_library(
357357
kernel_dispatch
358358
SRCS kernel_dispatch.cc
359-
DEPS phi_tensor_raw phi_context kernel_factory context_pool)
359+
DEPS phi_tensor_raw phi_backends kernel_factory context_pool)
360360
cc_library(
361361
api_gen_utils
362362
SRCS api_gen_utils.cc

‎paddle/phi/backends/CMakeLists.txt‎

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,58 @@
11
add_subdirectory(dynload)
22

3-
add_subdirectory(cpu)
4-
5-
add_subdirectory(custom)
3+
set(BACKENDS_SRCS all_context.cc cpu/cpu_context.cc)
4+
set(BACKENDS_DEPS enforce place flags)
65

76
if(WITH_GPU OR WITH_ROCM)
8-
add_subdirectory(gpu)
7+
list(APPEND BACKENDS_SRCS gpu/gpu_context.cc gpu/gpu_info.cc
8+
gpu/gpu_resources.cc)
9+
if(WITH_GPU)
10+
list(APPEND BACKENDS_SRCS gpu/cuda/cuda_info.cc)
11+
endif()
12+
if(WITH_ROCM)
13+
list(APPEND BACKENDS_SRCS gpu/rocm/rocm_info.cc)
14+
endif()
15+
list(APPEND BACKENDS_DEPS phi_dynload_cuda)
916
endif()
1017

1118
if(WITH_XPU)
12-
add_subdirectory(xpu)
19+
list(APPEND BACKENDS_SRCS xpu/xpu_context.cc xpu/xpu_info.cc)
1320
endif()
1421

1522
if(WITH_MKLDNN)
16-
add_subdirectory(onednn)
23+
list(APPEND BACKENDS_SRCS onednn/onednn_context.cc)
24+
list(APPEND BACKENDS_DEPS mkldnn)
1725
endif()
1826

19-
cc_library(
20-
phi_context
21-
SRCS all_context.cc
22-
DEPS device_context cpu_context)
23-
24-
if(WITH_XPU)
25-
add_dependencies(phi_context xpu_context)
27+
if(WITH_CUSTOM_DEVICE)
28+
list(
29+
APPEND
30+
BACKENDS_SRCS
31+
callback_manager.cc
32+
device_guard.cc
33+
stream.cc
34+
event.cc
35+
device_base.cc
36+
device_manager.cc
37+
custom/custom_context.cc
38+
custom/custom_device.cc)
2639
endif()
2740

28-
if(WITH_GPU)
29-
add_dependencies(phi_context gpu_context)
30-
endif()
41+
add_library(phi_backends "${BACKENDS_SRCS}")
42+
target_link_libraries(phi_backends ${BACKENDS_DEPS})
43+
44+
# for inference library
45+
get_property(phi_modules GLOBAL PROPERTY PHI_MODULES)
46+
set(phi_modules ${phi_modules} phi_backends)
47+
set_property(GLOBAL PROPERTY PHI_MODULES "${phi_modules}")
3148

3249
if(WITH_CUSTOM_DEVICE)
33-
add_dependencies(phi_context custom_context)
34-
cc_library(
35-
callback_manager
36-
SRCS callback_manager.cc
37-
DEPS enforce place)
38-
cc_library(
39-
device_guard
40-
SRCS device_guard.cc
41-
DEPS enforce place)
42-
cc_library(
43-
stream
44-
SRCS stream.cc
45-
DEPS callback_manager)
46-
cc_library(
47-
event
48-
SRCS event.cc
49-
DEPS enforce place)
50-
cc_library(
51-
device_base
52-
SRCS device_base.cc
53-
DEPS stream event callback_manager device_guard device_context flags)
54-
cc_library(
55-
device_manager
56-
SRCS device_manager.cc
57-
DEPS custom_device)
58-
set(GLOB_DEV_LIB
59-
device_manager custom_device
60-
CACHE INTERNAL "Global DEV library")
50+
cc_test(
51+
custom_device_test
52+
SRCS custom/custom_device_test.cc
53+
DEPS phi_backends phi_device_context)
54+
cc_test(
55+
capi_test
56+
SRCS custom/capi_test.cc
57+
DEPS phi_capi)
6158
endif()

‎paddle/phi/backends/cpu/CMakeLists.txt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎paddle/phi/backends/gpu/CMakeLists.txt‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)