diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index f38e73deb2d..b87f8c63388 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -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 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 797dc4c50e8..054dc8569ae 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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() @@ -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) @@ -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) diff --git a/test/build_size_test.sh b/test/build_size_test.sh index 9ef615a2bb0..37612b5154c 100644 --- a/test/build_size_test.sh +++ b/test/build_size_test.sh @@ -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} \ diff --git a/tools/cmake/cmake_deps.toml b/tools/cmake/cmake_deps.toml index 50c37ec431c..2f8dc4825d4 100644 --- a/tools/cmake/cmake_deps.toml +++ b/tools/cmake/cmake_deps.toml @@ -373,6 +373,7 @@ excludes = [ deps = [ "executorch_core", "executorch", + "extension_data_loader", ] # ---------------------------------- binary end ---------------------------------- # ---------------------------------- MPS start ----------------------------------