Skip to content

[CMake] Avoid extension_module have dupe flat_tensor cpp #10735

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

[CMake] Avoid extension_module have dupe flat_tensor cpp #10735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
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
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
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 examples/models/llama/runner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ else()
endif()

set(llama_runner_deps executorch_core extension_data_loader extension_module
extension_tensor
extension_tensor extension_flat_tensor
)

target_link_libraries(llama_runner PUBLIC ${llama_runner_deps})
Expand Down
2 changes: 1 addition & 1 deletion examples/models/llava/runner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ add_subdirectory(
add_library(llava_runner STATIC ${_llava_runner__srcs})

set(llava_runner_deps executorch_core extension_data_loader extension_llm_runner
extension_module extension_tensor
extension_module extension_tensor extension_flat_tensor
)

target_link_libraries(llava_runner PUBLIC ${llava_runner_deps})
Expand Down
1 change: 1 addition & 0 deletions extension/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ list(
link_libraries
executorch
extension_data_loader
extension_flat_tensor
extension_module
extension_runner_util
extension_tensor
Expand Down
6 changes: 4 additions & 2 deletions tools/cmake/cmake_deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ filters = [
deps = [
"extension_flat_tensor_schema",
"executorch_core",
"executorch",
]

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

[targets.extension_runner_util]
Expand All @@ -236,6 +235,8 @@ deps = [
"executorch",
"executorch_core",
"extension_module",
"extension_data_loader",
"extension_flat_tensor",
"extension_runner_util",
"extension_tensor",
]
Expand Down Expand Up @@ -452,6 +453,7 @@ deps = [
"executorch",
"executorch_core",
"extension_data_loader",
"extension_flat_tensor",
"extension_module",
"extension_threadpool",
"optimized_cpublas",
Expand Down
1 change: 1 addition & 0 deletions tools/cmake/executorch-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ set(lib_list
etdump
bundled_program
extension_data_loader
extension_flat_tensor
${FLATCCRT_LIB}
coreml_util
coreml_inmemoryfs
Expand Down
Loading