diff --git a/test/build_size_test.sh b/test/build_size_test.sh index baeef5a849e..9ef615a2bb0 100644 --- a/test/build_size_test.sh +++ b/test/build_size_test.sh @@ -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" @@ -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" + 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} \ diff --git a/tools/cmake/preset/default.cmake b/tools/cmake/preset/default.cmake index 0500e730b1a..e2bef0113ff 100644 --- 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 )