Skip to content

Build EXTENSION_DATA_LOADER with size_test #12678

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 64 commits into from
Jul 23, 2025
Merged

Build EXTENSION_DATA_LOADER with size_test #12678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 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
a342614
Update
swolchok Jul 21, 2025
d451e7c
Update
swolchok Jul 21, 2025
995f6fa
Update
swolchok Jul 22, 2025
d2ee588
Update
swolchok Jul 22, 2025
853a128
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
5173bf2
Update
swolchok Jul 23, 2025
e6c83db
Update
swolchok Jul 23, 2025
1cf3567
Update
swolchok Jul 23, 2025
b0d965c
Update
swolchok Jul 23, 2025
7852f9a
Update
swolchok Jul 23, 2025
5f9f7c5
Update
swolchok Jul 23, 2025
a9dadf4
Update
swolchok Jul 23, 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
8 changes: 7 additions & 1 deletion test/build_size_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# LICENSE file in the root directory of this source tree.

# Build size_test and show the size of it
set -e
set -ex

# shellcheck source=/dev/null
source "$(dirname "${BASH_SOURCE[0]}")/../.ci/scripts/utils.sh"
Expand All @@ -23,11 +23,17 @@ 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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: is double quote needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, but I also don't think it hurts

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_OPTIMIZE_SIZE=ON \
-DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
${EXTRA_BUILD_ARGS} \
Expand Down
2 changes: 1 addition & 1 deletion tools/cmake/preset/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ check_required_options_on(

check_conflicting_options_on(
IF_ON EXECUTORCH_BUILD_ARM_BAREMETAL CONFLICTS_WITH
EXECUTORCH_BUILD_EXTENSION_DATA_LOADER EXECUTORCH_BUILD_PTHREADPOOL
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this or install_executorch used by the ci scripts was the reason it was working before?

If we want to not enable this by default then perhaps we should also update install_executorch (if not using the default preset already).

And that should also make the baremetal build fail. I also realized that we don't run the baremetal size-test binary on the CI, so we may need to fix that too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the reason it was working before?

you may be interested in later PRs in this stack, particularly #12744

EXECUTORCH_BUILD_PTHREADPOOL
EXECUTORCH_BUILD_CPUINFO
)

Expand Down
Loading