Skip to content

[CMake] llm_runner use executorch_core #10698

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
merged 26 commits into from
May 7, 2025
Merged

[CMake] llm_runner use executorch_core #10698

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1d669e1
[CMake] Update extension/ deps executorch->executorch_core
kirklandsign May 5, 2025
7e5aa83
test more
kirklandsign May 5, 2025
db89e73
Add deps
kirklandsign May 5, 2025
4aaeacf
Don't address flat_tensor yet
kirklandsign May 5, 2025
2b5edf5
Merge remote-tracking branch 'origin/main' into use-executorch-core
kirklandsign May 5, 2025
b4e56f3
Try again
kirklandsign May 5, 2025
792239c
missing
kirklandsign May 5, 2025
e1c7bfd
Update CMakeLists.txt
kirklandsign May 5, 2025
19b4ad0
Merge remote-tracking branch 'origin/main' into use-executorch-core
kirklandsign May 6, 2025
7c07d5e
module update
kirklandsign May 6, 2025
cd26efa
Fix
kirklandsign May 6, 2025
7ee03fc
Merge remote-tracking branch 'origin/main' into use-executorch-core
kirklandsign May 6, 2025
ef2fa93
flat tensor doesn't dep on extension_data_loader
kirklandsign May 6, 2025
f7cc7c3
linter
kirklandsign May 6, 2025
47f4082
[CMake] Avoid extension_module have dupe flat_tensor cpp
kirklandsign May 6, 2025
c023c37
propogate deps
kirklandsign May 6, 2025
94975dc
Kernels should depend on executorch_core
kirklandsign May 6, 2025
a57d31f
Add executorch to runner.exe
kirklandsign May 6, 2025
47acd57
Merge branch 'kernel-use-core' into module-avoid-dupe-cpp
kirklandsign May 7, 2025
2266cc3
Update runner to include extension_flat_tensor
kirklandsign May 7, 2025
5e286ed
Merge branch 'module-avoid-dupe-cpp' into use-executorch-core
kirklandsign May 7, 2025
47d3435
Merge remote-tracking branch 'origin/main' into module-avoid-dupe-cpp
kirklandsign May 7, 2025
9bdca39
add extension_flat_tensor
kirklandsign May 7, 2025
9e40662
Merge branch 'module-avoid-dupe-cpp' into use-executorch-core
kirklandsign May 7, 2025
ff56f04
untouch
kirklandsign May 7, 2025
ec6ec3c
Merge remote-tracking branch 'origin/main' into use-executorch-core
kirklandsign May 7, 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
5 changes: 4 additions & 1 deletion extension/flat_tensor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ endif()

list(TRANSFORM _extension_flat_tensor__srcs PREPEND "${EXECUTORCH_ROOT}/")
add_library(extension_flat_tensor ${_extension_flat_tensor__srcs})
target_link_libraries(extension_flat_tensor executorch extension_data_loader)
target_link_libraries(
extension_flat_tensor executorch_core extension_data_loader
flat_tensor_schema
)
target_include_directories(
extension_flat_tensor
PUBLIC ${EXECUTORCH_ROOT}/..
Expand Down
2 changes: 1 addition & 1 deletion extension/llm/runner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ target_include_directories(

add_library(extension_llm_runner STATIC ${_extension_llm_runner__srcs})

set(runner_deps executorch extension_module extension_tensor)
set(runner_deps executorch_core extension_module extension_tensor)

target_link_libraries(extension_llm_runner PUBLIC ${runner_deps})

Expand Down
8 changes: 6 additions & 2 deletions extension/module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ if(CMAKE_TOOLCHAIN_IOS
else()
add_library(extension_module SHARED ${_extension_module__srcs})
endif()
target_link_libraries(extension_module PRIVATE executorch_core extension_data_loader extension_flat_tensor)
target_link_libraries(extension_module PRIVATE executorch_core extension_data_loader)
# Expose the header include path
target_link_libraries(extension_module PUBLIC extension_flat_tensor)
target_include_directories(extension_module PUBLIC ${EXECUTORCH_ROOT}/..)
target_compile_options(
extension_module PUBLIC -Wno-deprecated-declarations -fPIC
Expand All @@ -37,8 +39,10 @@ target_compile_options(
# after cleaning up CMake targets.
add_library(extension_module_static STATIC ${_extension_module__srcs})
target_link_libraries(
extension_module_static PRIVATE executorch_core extension_data_loader extension_flat_tensor
extension_module_static PRIVATE executorch_core extension_data_loader
)
# Expose the header include path
target_link_libraries(extension_module_static PUBLIC extension_flat_tensor)
target_include_directories(extension_module_static PUBLIC ${EXECUTORCH_ROOT}/..)
target_compile_options(
extension_module_static PUBLIC -Wno-deprecated-declarations -fPIC
Expand Down
8 changes: 2 additions & 6 deletions tools/cmake/cmake_deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ filters = [
]
deps = [
"extension_flat_tensor_schema",
"executorch_core",
"extension_data_loader",
"executorch",
]

Expand All @@ -209,9 +209,9 @@ filters = [
".cpp$",
]
deps = [
"executorch",
"executorch_core",
"extension_data_loader",
"extension_flat_tensor",
]

[targets.extension_runner_util]
Expand All @@ -233,10 +233,8 @@ filters = [
".cpp$",
]
deps = [
"executorch",
"executorch_core",
"extension_module",
"extension_runner_util",
"extension_tensor",
]

Expand All @@ -248,7 +246,6 @@ filters = [
".cpp$",
]
deps = [
"executorch",
"executorch_core",
]

Expand All @@ -260,7 +257,6 @@ filters = [
".cpp$",
]
deps = [
"executorch",
"executorch_core",
]

Expand Down
Loading