Build EXTENSION_DATA_LOADER with size_test

swolchok · swolchok · commit 9d5d0e45b47c · 2025-07-22T10:13:05.000-07:00
size_test.cpp uses FileDataLoader; no idea how this happens to work currently. Had to remove conflict with ARM_BAREMETAL because the size test is built for that too. ghstack-source-id: 3d56a97 ghstack-comment-id: 3097740659 Pull-Request: #12678
diff --git a/extension/llm/tokenizers b/extension/llm/tokenizers
@@ -1 +1 @@
-Subproject commit ea8691c6200c702cf28dd2aa2da902e9299b6bb3
+Subproject commit 93be043017b4c51e36ce963128d431bbb4e7272c
diff --git a/test/build_size_test.sh b/test/build_size_test.sh
@@ -28,6 +28,7 @@ cmake_install_executorch_lib() {
           -DCMAKE_INSTALL_PREFIX=cmake-out \
           -DCMAKE_BUILD_TYPE=Release \
           -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
+          -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
           -DEXECUTORCH_OPTIMIZE_SIZE=ON \
           -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
           ${EXTRA_BUILD_ARGS} \
diff --git a/tools/cmake/preset/default.cmake b/tools/cmake/preset/default.cmake
@@ -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
+  EXECUTORCH_BUILD_PTHREADPOOL
   EXECUTORCH_BUILD_CPUINFO
 )
 

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ check_required_options_on(`
`249`	`249`
`250`	`250`	`check_conflicting_options_on(`
`251`	`251`	`IF_ON EXECUTORCH_BUILD_ARM_BAREMETAL CONFLICTS_WITH`
`252`		`- EXECUTORCH_BUILD_EXTENSION_DATA_LOADER EXECUTORCH_BUILD_PTHREADPOOL`
	`252`	`+ EXECUTORCH_BUILD_PTHREADPOOL`
`253`	`253`	`EXECUTORCH_BUILD_CPUINFO`
`254`	`254`	`)`
`255`	`255`