Skip to content

Remove redundant headers in Paddle CPU #76910

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

Merged
yongqiangma merged 17 commits into from
Dec 22, 2025
Merged

Remove redundant headers in Paddle CPU #76910

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
08d5656
remove redundant header in Paddle CPU
YqGe585 Dec 15, 2025
eaa5c4a
fix setup
YqGe585 Dec 15, 2025
7ab9e2b
modified setup.py.in
YqGe585 Dec 15, 2025
e994791
fix setup.py.in
YqGe585 Dec 15, 2025
9928900
fix mac error
YqGe585 Dec 15, 2025
583d1e0
fix typo
YqGe585 Dec 16, 2025
29beed7
There is no WITH_CUSTOM_DEVICE env during setup.py
YqGe585 Dec 16, 2025
2c54dfc
fix npu error
YqGe585 Dec 17, 2025
2d76880
test
YqGe585 Dec 17, 2025
9774016
test
YqGe585 Dec 17, 2025
b662bae
test3
YqGe585 Dec 18, 2025
3510ef3
test4
YqGe585 Dec 18, 2025
ea18aeb
test5
YqGe585 Dec 18, 2025
e2610cc
test6
YqGe585 Dec 18, 2025
733c0fe
finally
YqGe585 Dec 18, 2025
43c7dc4
xpu info
YqGe585 Dec 19, 2025
099188d
fix GPU tests
YqGe585 Dec 19, 2025
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
7 changes: 7 additions & 0 deletions paddle/phi/backends/all_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ limitations under the License. */
// path replacement after implementing phi DeviceContext

#include "paddle/phi/backends/cpu/cpu_context.h"
#ifdef PADDLE_WITH_CUSTOM_DEVICE
#include "paddle/phi/backends/custom/custom_context.h"
#endif
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) || \
defined(PADDLE_WITH_CUSTOM_DEVICE)
#include "paddle/phi/backends/gpu/gpu_context.h"
#endif
#include "paddle/phi/backends/onednn/onednn_context.h"
#ifdef PADDLE_WITH_XPU
#include "paddle/phi/backends/xpu/xpu_context.h"
#endif

namespace phi {} // namespace phi
91 changes: 90 additions & 1 deletion python/setup.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,7 +1463,7 @@ headers = (
# phi level api headers (low level api, for training only)
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi')) + # phi extension header
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/include', recursive=True)) + # phi include headers
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends', recursive=True)) + # phi backends headers
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends')) + # phi backends headers
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/core', recursive=True)) + # phi core headers
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/infermeta', recursive=True)) + # phi infermeta headers
list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/kernels', recursive=True)) + # phi kernels headers
Expand Down Expand Up @@ -1532,6 +1532,21 @@ if '${WITH_OPENVINO}' == 'ON':
if '${WITH_GPU}' == 'ON' or '${WITH_ROCM}' == 'ON':
# externalErrorMsg.pb for External Error message
headers += list(find_files('*.pb', '${externalError_INCLUDE_DIR}'))
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/gpu, recursive=True')
)
headers += list(
find_files(
'*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload'
)
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/onednn')
)



if '${WITH_XPU}' == 'ON':
Expand All @@ -1540,6 +1555,20 @@ if '${WITH_XPU}' == 'ON':
if '/include/xpu/kernel/' not in h
] # xdnn api headers
headers += list(find_files('*.hpp', '@PADDLE_BINARY_DIR@/third_party/xpu/src/extern_xpu/xpu', recursive=True)) # xre headers with .hpp extension
headers += list(
find_files('*.h', '@PADDLE_BINARY_DIR@/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/xpu')
)
headers += list(
find_files(
'*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload'
)
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/onednn')
)

if (
'@WITH_GPU@' == 'ON'
Expand All @@ -1550,6 +1579,66 @@ if (
headers += list(find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/fluid/fp8/deep_gemm/include/cutlass/', recursive=True))
headers += list(find_files('*.hpp', '@PADDLE_SOURCE_DIR@/paddle/fluid/fp8/deep_gemm/include/cutlass/', recursive=True))
headers += list(find_files('*.cuh', '@PADDLE_SOURCE_DIR@/paddle/fluid/fp8/deep_gemm/include/deep_gemm', recursive=True))
if '${WITH_CUSTOM_DEVICE}' == 'ON':
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/custom')
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/gpu', recursive=True)
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/onednn')
)
headers += [
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/afs_api.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/dynamic_loader.h',
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/mklml.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/mklrt.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/lapack.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/hml.h'
),
]
else:
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', '@PADDLE_SOURCE_DIR@/paddle/phi/backends/onednn')
)
headers += [
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/afs_api.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/dynamic_loader.h',
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/mklml.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/mklrt.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/lapack.h'
),
os.path.join(
'@PADDLE_SOURCE_DIR@/paddle/phi/backends/dynload/hml.h'
),
]

headers += list(find_files('*.h', '${PYBIND_INCLUDE_DIR}', True)) # pybind headers

Expand Down
107 changes: 102 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,11 +2035,7 @@ def get_headers():
)
)
+ list( # phi backends headers
find_files(
'*.h',
paddle_source_dir + '/paddle/phi/backends',
recursive=True,
)
find_files('*.h', paddle_source_dir + '/paddle/phi/backends')
)
+ list( # phi core headers
find_files(
Expand Down Expand Up @@ -2326,6 +2322,23 @@ def get_headers():
headers += list(
find_files('*.pb', env_dict.get("externalError_INCLUDE_DIR"))
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/cpu')
)
headers += list(
find_files(
'*.h',
paddle_source_dir + '/paddle/phi/backends/gpu, recursive=True',
)
)
headers += list(
find_files(
'*.h', paddle_source_dir + '/paddle/phi/backends/dynload'
)
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/onednn')
)

if env_dict.get("WITH_XPU") == 'ON':
headers += [
Expand All @@ -2344,6 +2357,20 @@ def get_headers():
recursive=True,
)
) # xre headers with .hpp extension
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/xpu')
)
headers += list(
find_files(
'*.h', paddle_source_dir + '/paddle/phi/backends/dynload'
)
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/onednn')
)

if (
env_dict.get("WITH_GPU") == 'ON'
Expand Down Expand Up @@ -2381,6 +2408,76 @@ def get_headers():
recursive=True,
)
)

if (
env_dict.get("WITH_GPU") == 'OFF'
and env_dict.get("WITH_ROCM") == 'OFF'
and env_dict.get("WITH_XPU") == 'OFF'
): # Custom Device
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/custom')
)
headers += list(
find_files(
'*.h',
paddle_source_dir + '/paddle/phi/backends/gpu, recursive=True',
)
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/onednn')
)
headers += [
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/afs_api.h'
),
os.path.join(
paddle_source_dir,
'paddle/phi/backends/dynload/dynamic_loader.h',
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/mklml.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/mklrt.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/lapack.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/hml.h'
),
]
else:
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/cpu')
)
headers += list(
find_files('*.h', paddle_source_dir + '/paddle/phi/backends/onednn')
)
headers += [
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/afs_api.h'
),
os.path.join(
paddle_source_dir,
'paddle/phi/backends/dynload/dynamic_loader.h',
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/mklml.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/mklrt.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/lapack.h'
),
os.path.join(
paddle_source_dir, 'paddle/phi/backends/dynload/hml.h'
),
]
# pybind headers
headers += list(find_files('*.h', env_dict.get("PYBIND_INCLUDE_DIR"), True))
return headers
Expand Down
Loading