Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compile phi/backends into one static library #44373

Merged
merged 7 commits into from
Jul 19, 2022
Merged

compile phi/backends into one static library #44373

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
60a032a
compile into one static library
zhiqiu Jul 15, 2022
902a808
fix xpu compile
zhiqiu Jul 18, 2022
64b433d
fix xpu compile
zhiqiu Jul 18, 2022
613b43c
fix inference compile
zhiqiu Jul 18, 2022
c4f9abd
fix inference compile
zhiqiu Jul 18, 2022
a52d4f5
add custom test
zhiqiu Jul 18, 2022
8f64a78
revert one file
zhiqiu Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion paddle/fluid/imperative/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if(WITH_GPU)
cc_library(
layout_autotune
SRCS layout_autotune.cc
DEPS op_info phi_gpu_info)
DEPS op_info phi_backends)
else()
cc_library(
layout_autotune
Expand Down
3 changes: 1 addition & 2 deletions paddle/fluid/memory/allocation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include(ExternalProject)

set(ALLOCATOR_DEPS place stats profiler)
set(ALLOCATOR_DEPS place stats profiler phi_backends)
set(ALLOCATOR_SRCS
allocator.cc
cpu_allocator.cc
Expand Down Expand Up @@ -54,7 +54,6 @@ endif()

if(WITH_CUSTOM_DEVICE)
list(APPEND ALLOCATOR_SRCS custom_allocator.cc)
list(APPEND ALLOCATOR_DEPS device_manager)
endif()

if(WITH_XPU)
Expand Down
24 changes: 8 additions & 16 deletions paddle/fluid/platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,11 @@ cc_library(
${XPU_CTX_DEPS}
${MLU_CTX_DEPS}
eigen3
phi_backends
phi_device_context
generator)
if(WITH_XPU)
target_link_libraries(device_context xpu_context xpu_resource_pool)
endif()

if(WITH_MKLDNN)
target_link_libraries(device_context onednn_context)
endif()

target_link_libraries(device_context cpu_context)
# target_link_libraries(device_context phi_backends)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里是需要删掉的吗

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗯嗯，后续考虑删除


cc_library(
collective_helper
Expand All @@ -244,22 +239,19 @@ if(WITH_CNCL)
endif()

if(WITH_GPU OR WITH_ROCM)
target_link_libraries(device_context gpu_info gpu_context phi_gpu_info)
target_link_libraries(device_context gpu_resource_pool)
endif()
if(WITH_CUSTOM_DEVICE)
target_link_libraries(device_context custom_context)
endif()

if(WITH_ASCEND_CL)
target_link_libraries(device_context npu_resource_pool)
endif()

if(WITH_MLU)
target_link_libraries(device_context mlu_resource_pool)
if(WITH_XPU)
target_link_libraries(device_context xpu_resource_pool)
endif()

if(WITH_CUSTOM_DEVICE)
target_link_libraries(device_context custom_context)
if(WITH_MLU)
target_link_libraries(device_context mlu_resource_pool)
endif()

cc_test(
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/platform/device/gpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(WITH_GPU)
nv_library(
gpu_info
SRCS gpu_info.cc
DEPS phi_gpu_info gflags glog enforce monitor dynload_cuda)
DEPS phi_backends gflags glog enforce monitor dynload_cuda)

nv_test(cuda_helper_test SRCS cuda_helper_test.cu)
nv_test(
Expand All @@ -15,7 +15,7 @@ elseif(WITH_ROCM)
hip_library(
gpu_info
SRCS gpu_info.cc
DEPS phi_gpu_info gflags glog enforce monitor dynload_cuda)
DEPS phi_backends gflags glog enforce monitor dynload_cuda)

hip_test(cuda_helper_test SRCS cuda_helper_test.cu)
hip_test(
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/platform/device/xpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cc_library(
xpulib
device_context
place
phi_xpu_info)
phi_backends)
cc_library(
xpu_op_list
SRCS xpu_op_list.cc
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif()
set(PHI_DEPS
convert_utils
dense_tensor
phi_context
phi_backends
kernel_factory
kernel_context
arg_map_context
Expand Down
4 changes: 2 additions & 2 deletions paddle/phi/api/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,12 +351,12 @@ cc_library(
cc_library(
context_pool
SRCS context_pool.cc
DEPS phi_context phi_enforce place init)
DEPS phi_backends phi_enforce place init)

cc_library(
kernel_dispatch
SRCS kernel_dispatch.cc
DEPS phi_tensor_raw phi_context kernel_factory context_pool)
DEPS phi_tensor_raw phi_backends kernel_factory context_pool)
cc_library(
api_gen_utils
SRCS api_gen_utils.cc
Expand Down
85 changes: 41 additions & 44 deletions paddle/phi/backends/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,58 @@
add_subdirectory(dynload)

add_subdirectory(cpu)

add_subdirectory(custom)
set(BACKENDS_SRCS all_context.cc cpu/cpu_context.cc)
set(BACKENDS_DEPS enforce place flags)

if(WITH_GPU OR WITH_ROCM)
add_subdirectory(gpu)
list(APPEND BACKENDS_SRCS gpu/gpu_context.cc gpu/gpu_info.cc
gpu/gpu_resources.cc)
if(WITH_GPU)
list(APPEND BACKENDS_SRCS gpu/cuda/cuda_info.cc)
endif()
if(WITH_ROCM)
list(APPEND BACKENDS_SRCS gpu/rocm/rocm_info.cc)
endif()
list(APPEND BACKENDS_DEPS phi_dynload_cuda)
endif()

if(WITH_XPU)
add_subdirectory(xpu)
list(APPEND BACKENDS_SRCS xpu/xpu_context.cc xpu/xpu_info.cc)
endif()

if(WITH_MKLDNN)
add_subdirectory(onednn)
list(APPEND BACKENDS_SRCS onednn/onednn_context.cc)
list(APPEND BACKENDS_DEPS mkldnn)
endif()

cc_library(
phi_context
SRCS all_context.cc
DEPS device_context cpu_context)

if(WITH_XPU)
add_dependencies(phi_context xpu_context)
if(WITH_CUSTOM_DEVICE)
list(
APPEND
BACKENDS_SRCS
callback_manager.cc
device_guard.cc
stream.cc
event.cc
device_base.cc
device_manager.cc
custom/custom_context.cc
custom/custom_device.cc)
endif()

if(WITH_GPU)
add_dependencies(phi_context gpu_context)
endif()
add_library(phi_backends "${BACKENDS_SRCS}")
target_link_libraries(phi_backends ${BACKENDS_DEPS})

# for inference library
get_property(phi_modules GLOBAL PROPERTY PHI_MODULES)
set(phi_modules ${phi_modules} phi_backends)
set_property(GLOBAL PROPERTY PHI_MODULES "${phi_modules}")

if(WITH_CUSTOM_DEVICE)
add_dependencies(phi_context custom_context)
cc_library(
callback_manager
SRCS callback_manager.cc
DEPS enforce place)
cc_library(
device_guard
SRCS device_guard.cc
DEPS enforce place)
cc_library(
stream
SRCS stream.cc
DEPS callback_manager)
cc_library(
event
SRCS event.cc
DEPS enforce place)
cc_library(
device_base
SRCS device_base.cc
DEPS stream event callback_manager device_guard device_context flags)
cc_library(
device_manager
SRCS device_manager.cc
DEPS custom_device)
set(GLOB_DEV_LIB
device_manager custom_device
CACHE INTERNAL "Global DEV library")
cc_test(
custom_device_test
SRCS custom/custom_device_test.cc
DEPS phi_backends phi_device_context)
cc_test(
capi_test
SRCS custom/capi_test.cc
DEPS phi_capi)
endif()
12 changes: 0 additions & 12 deletions paddle/phi/backends/cpu/CMakeLists.txt
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions paddle/phi/backends/custom/CMakeLists.txt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions paddle/phi/backends/gpu/CMakeLists.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions paddle/phi/backends/gpu/cuda/CMakeLists.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions paddle/phi/backends/gpu/rocm/CMakeLists.txt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions paddle/phi/backends/onednn/CMakeLists.txt
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions paddle/phi/backends/xpu/CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion paddle/phi/capi/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cc_library(
cc_library(
phi_c_device_context
SRCS c_device_context.cc
DEPS phi_context)
DEPS phi_backends)

cc_library(
phi_c_int_array
Expand Down
4 changes: 2 additions & 2 deletions paddle/phi/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ if(WITH_GPU)
nv_library(
phi_place
SRCS place.cc
DEPS phi_gpu_info)
DEPS phi_backends)
elseif(WITH_ROCM)
hip_library(
phi_place
SRCS place.cc
DEPS phi_gpu_info)
DEPS phi_backends)
else()
cc_library(phi_place SRCS place.cc)
endif()
Expand Down
28 changes: 5 additions & 23 deletions paddle/phi/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cc_library(
cc_library(
kernel_context
SRCS kernel_context.cc
DEPS phi_enforce phi_context)
DEPS phi_enforce phi_backends)

cc_library(
ddim
Expand Down Expand Up @@ -86,38 +86,20 @@ if(WITH_GPU)
nv_library(
phi_tensor_utils
SRCS tensor_utils.cc
DEPS cpu_context
gpu_context
dense_tensor
selected_rows
malloc
memcpy
device_context)
DEPS phi_backends dense_tensor selected_rows malloc memcpy device_context)
elseif(WITH_ROCM)
hip_library(
phi_tensor_utils
SRCS tensor_utils.cc
DEPS cpu_context
gpu_context
dense_tensor
selected_rows
malloc
memcpy
device_context)
DEPS phi_backends dense_tensor selected_rows malloc memcpy device_context)
elseif(WITH_XPU_KP)
xpu_library(
phi_tensor_utils
SRCS tensor_utils.cc
DEPS cpu_context
xpu_context
dense_tensor
selected_rows
malloc
memcpy
device_context)
DEPS phi_backends dense_tensor selected_rows malloc memcpy device_context)
else()
cc_library(
phi_tensor_utils
SRCS tensor_utils.cc
DEPS cpu_context dense_tensor selected_rows malloc memcpy device_context)
DEPS dense_tensor selected_rows malloc memcpy device_context phi_backends)
endif()
Loading