Skip to content

Fix missing cmake_deps.toml dep from size_test to extension_data_loader #12744

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.

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 85 commits into from
Jul 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
9e3e2e7
Update
swolchok Jul 13, 2025
16f0274
forgot to amend
swolchok Jul 13, 2025
99ec5a7
Update
swolchok Jul 14, 2025
ff3cdb9
Update
swolchok Jul 14, 2025
513de13
Update
swolchok Jul 14, 2025
76db1f1
Update
swolchok Jul 14, 2025
08bffac
Update
swolchok Jul 14, 2025
dff96c8
Update
swolchok Jul 14, 2025
0e2bce6
Update
swolchok Jul 14, 2025
35d8319
Update
swolchok Jul 14, 2025
a31187e
Update
swolchok Jul 15, 2025
dcbce0d
Update
swolchok Jul 15, 2025
bc8f971
Update
swolchok Jul 15, 2025
29d3999
Update
swolchok Jul 15, 2025
7e4040a
Update
swolchok Jul 15, 2025
2dacf6f
Update
swolchok Jul 15, 2025
fb2b775
Update
swolchok Jul 15, 2025
02f19a6
Update
swolchok Jul 15, 2025
225d5a6
Update
swolchok Jul 15, 2025
41bf264
Update
swolchok Jul 16, 2025
f54a8ce
Update
swolchok Jul 16, 2025
e48e6cc
Update
swolchok Jul 16, 2025
a2f14ac
Update
swolchok Jul 16, 2025
c31a4b9
Update
swolchok Jul 17, 2025
4fd7372
Update
swolchok Jul 17, 2025
d650396
Update
swolchok Jul 17, 2025
3bfdade
Update
swolchok Jul 17, 2025
00acd77
Update
swolchok Jul 17, 2025
6946143
Update
swolchok Jul 17, 2025
431ddd8
Update
swolchok Jul 17, 2025
60456ca
Update
swolchok Jul 17, 2025
dcb3ca0
Update
swolchok Jul 18, 2025
3c30b31
Update
swolchok Jul 18, 2025
e9928a7
Update
swolchok Jul 18, 2025
b57678b
Update
swolchok Jul 18, 2025
05effc4
Update
swolchok Jul 18, 2025
f5bcdcc
Update
swolchok Jul 18, 2025
2e21d9a
Update
swolchok Jul 19, 2025
63e4a27
Update
swolchok Jul 19, 2025
4c2e046
rebase
swolchok Jul 19, 2025
0eb3d8d
rebase
swolchok Jul 19, 2025
a451cc3
rebase
swolchok Jul 19, 2025
0d164ce
Update
swolchok Jul 21, 2025
ccd0e2d
Update
swolchok Jul 21, 2025
f9b96eb
Update
swolchok Jul 21, 2025
02d6d67
Update
swolchok Jul 21, 2025
dd18bfe
Update
swolchok Jul 21, 2025
5be4b7b
Update
swolchok Jul 21, 2025
719bb4f
Update
swolchok Jul 21, 2025
a342614
Update
swolchok Jul 21, 2025
d451e7c
Update
swolchok Jul 21, 2025
91fe6ad
Update
swolchok Jul 21, 2025
9e9373a
Update
swolchok Jul 21, 2025
8627bbb
Update
swolchok Jul 22, 2025
995f6fa
Update
swolchok Jul 22, 2025
d2ee588
Update
swolchok Jul 22, 2025
853a128
Update
swolchok Jul 22, 2025
0ffc394
Update
swolchok Jul 22, 2025
a06c916
Merge branch 'main' into gh/swolchok/517/head
swolchok Jul 22, 2025
3d760e0
Update
swolchok Jul 22, 2025
ae4ac22
Update
swolchok Jul 22, 2025
9e04e6a
Update
swolchok Jul 22, 2025
fa557ca
Update
swolchok Jul 22, 2025
5173bf2
Update
swolchok Jul 23, 2025
e6c83db
Update
swolchok Jul 23, 2025
8978c19
Update
swolchok Jul 23, 2025
783c39d
Update
swolchok Jul 23, 2025
08d9f80
Update
swolchok Jul 23, 2025
1cf3567
Update
swolchok Jul 23, 2025
b0d965c
Update
swolchok Jul 23, 2025
d9bf112
Update
swolchok Jul 23, 2025
98ebc97
Update
swolchok Jul 23, 2025
387e8d8
Update
swolchok Jul 23, 2025
7852f9a
Update
swolchok Jul 23, 2025
5f9f7c5
Update
swolchok Jul 23, 2025
bdabc9c
Update
swolchok Jul 23, 2025
98cb422
Update
swolchok Jul 23, 2025
ee010ee
Update
swolchok Jul 23, 2025
a9dadf4
Update
swolchok Jul 23, 2025
707e40f
Update
swolchok Jul 23, 2025
3d04265
Update
swolchok Jul 23, 2025
388d4ba
Update
swolchok Jul 23, 2025
e0183db
fix zephyr size test to build data_loader extension. might be the las…
swolchok Jul 23, 2025
5efa8e7
fix zephyr size test to build data_loader extension. might be the las…
swolchok Jul 23, 2025
c560ee1
move zephyr fix to bottom PR where it belongs
swolchok Jul 24, 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 .github/workflows/trunk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
if [[ ${{ matrix.os}} == "bare_metal" ]]; then
bash test/build_size_test.sh "-DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake} -DEXECUTORCH_BUILD_ARM_BAREMETAL=ON"
elif [[ ${{ matrix.os}} == "zephyr-preset" ]]; then
CXXFLAGS=${cxx_flags} cmake --preset zephyr -DCMAKE_BUILD_TYPE=Release -DEXECUTORCH_OPTIMIZE_SIZE=ON -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out .
CXXFLAGS=${cxx_flags} cmake --preset zephyr -DCMAKE_BUILD_TYPE=Release -DEXECUTORCH_OPTIMIZE_SIZE=ON -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out .
cmake --build cmake-out -j9 --target install --config Release
CXXFLAGS=${cxx_flags} cmake -DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
cmake --build cmake-out/test -j9 --config Release
Expand Down
8 changes: 5 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ list(TRANSFORM _size_test__srcs PREPEND "${EXECUTORCH_ROOT}/")
# TODO(larryliu0820): Add EXECUTORCH_BUILD_EXECUTABLES to not build executable
# when we cross compile to ios
add_executable(size_test ${_size_test__srcs})
target_link_libraries(size_test executorch)
target_link_libraries(size_test executorch extension_data_loader)
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
target_link_options_gc_sections(size_test)
endif()
Expand All @@ -62,7 +62,8 @@ endif()
add_executable(size_test_all_ops ${_size_test__srcs})
executorch_target_link_options_shared_lib(portable_ops_lib)
target_link_libraries(
size_test_all_ops executorch portable_ops_lib portable_kernels
size_test_all_ops executorch extension_data_loader portable_ops_lib
portable_kernels
)
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
target_link_options_gc_sections(size_test_all_ops)
Expand All @@ -75,7 +76,8 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
add_executable(size_test_all_optimized_ops ${_size_test__srcs})
executorch_target_link_options_shared_lib(optimized_native_cpu_ops_lib)
target_link_libraries(
size_test_all_optimized_ops executorch optimized_native_cpu_ops_lib
size_test_all_optimized_ops executorch extension_data_loader
optimized_native_cpu_ops_lib
)
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
target_link_options_gc_sections(size_test_all_optimized_ops)
Expand Down
7 changes: 1 addition & 6 deletions test/build_size_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,12 @@ cmake_install_executorch_lib() {
update_tokenizers_git_submodule
local EXTRA_BUILD_ARGS="${@}"

if [[ "$EXTRA_BUILD_ARGS" == *"-DEXECUTORCH_BUILD_ARM_BAREMETAL=ON"* ]]; then
local BUILD_DATA_LOADER="OFF"
else
local BUILD_DATA_LOADER=ON
fi
CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
-DCMAKE_INSTALL_PREFIX=cmake-out \
-DCMAKE_BUILD_TYPE=Release \
-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
-DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=${BUILD_DATA_LOADER} \
-DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
-DEXECUTORCH_OPTIMIZE_SIZE=ON \
-DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
${EXTRA_BUILD_ARGS} \
Expand Down
1 change: 1 addition & 0 deletions tools/cmake/cmake_deps.toml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ excludes = [
deps = [
"executorch_core",
"executorch",
"extension_data_loader",
]
# ---------------------------------- binary end ----------------------------------
# ---------------------------------- MPS start ----------------------------------
Expand Down
Loading