Skip to content

bugfix: fix protobuf header shadowing by torch in DeepSeek V4 cpp chat template build. #75

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
DongheJin merged 1 commit into from
Jun 30, 2026
Merged

bugfix: fix protobuf header shadowing by torch in DeepSeek V4 cpp chat template build. #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion xllm_service/chat_template/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ cc_library (
${CMAKE_SOURCE_DIR}/third_party/xllm
${CMAKE_SOURCE_DIR}/third_party/xllm/xllm
${CMAKE_SOURCE_DIR}/third_party/xllm/xllm/core
${TORCH_HEADER_INCLUDE_DIRS}
DEPS
:chat_template
:message_projection
Expand All @@ -85,3 +84,16 @@ cc_library (
proto_xllm
)
target_link_libraries(deepseek_v4_cpp_chat_template PUBLIC brpc-static leveldb::leveldb ZLIB::ZLIB protobuf::libprotobuf OpenSSL::SSL OpenSSL::Crypto)

# Torch ships its own protobuf 3.13 headers. Adding torch via a plain -I would
# let them shadow vcpkg's protobuf 3.21 headers that the generated .pb.h files
# require, breaking the build. Add torch dirs with -idirafter so they sit at the
# very end of the search path: <google/protobuf/...> resolves to vcpkg's copy,
# while torch-only headers (<torch/torch.h>) still resolve as a fallback. The
# "SHELL:" prefix keeps each "-idirafter <dir>" pair intact and stops CMake from
# de-duplicating the repeated -idirafter flag.
set(_torch_idirafter_opts "")
foreach(_torch_dir IN LISTS TORCH_HEADER_INCLUDE_DIRS)
list(APPEND _torch_idirafter_opts "SHELL:-idirafter ${_torch_dir}")
endforeach()
target_compile_options(deepseek_v4_cpp_chat_template PRIVATE ${_torch_idirafter_opts})
Comment thread
XuZhang99 marked this conversation as resolved.
Loading