From 6d51bff6d163ac79061b45a7dc34e556222b2403 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 4 Mar 2025 17:40:16 -0800 Subject: [PATCH 01/34] Update [ghstack-poisoned] --- CMakeLists.txt | 8 +++++++- backends/apple/coreml/CMakeLists.txt | 1 + backends/apple/mps/CMakeLists.txt | 1 + backends/mediatek/CMakeLists.txt | 2 +- backends/qualcomm/CMakeLists.txt | 2 +- backends/vulkan/CMakeLists.txt | 1 + backends/xnnpack/CMakeLists.txt | 17 +++++++++-------- backends/xnnpack/cmake/Dependencies.cmake | 2 ++ configurations/CMakeLists.txt | 2 +- extension/data_loader/CMakeLists.txt | 3 ++- extension/flat_tensor/CMakeLists.txt | 6 +++--- extension/llm/custom_ops/CMakeLists.txt | 9 +++++---- extension/llm/tokenizer/CMakeLists.txt | 1 + extension/module/CMakeLists.txt | 5 +++-- extension/runner_util/CMakeLists.txt | 3 ++- extension/tensor/CMakeLists.txt | 3 ++- extension/threadpool/CMakeLists.txt | 10 ++++++---- extension/training/CMakeLists.txt | 1 + kernels/optimized/CMakeLists.txt | 6 +++--- kernels/portable/CMakeLists.txt | 1 + kernels/quantized/CMakeLists.txt | 1 + schema/CMakeLists.txt | 11 ++++++++++- 22 files changed, 64 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de941663a88..294c0e076a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -384,7 +384,7 @@ if(NOT "${_repo_dir_name}" STREQUAL "executorch") "fix for this restriction." ) endif() -set(_common_include_directories ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/runtime/core/portable_type/c10) +set(_common_include_directories $ $) # # The `__srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}. @@ -653,6 +653,7 @@ install(DIRECTORY extension/tensor/ DESTINATION include/executorch/extension/te install(DIRECTORY extension/threadpool/ DESTINATION include/executorch/extension/threadpool FILES_MATCHING PATTERN "*.h") install( TARGETS executorch executorch_core + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} @@ -835,6 +836,7 @@ if(EXECUTORCH_BUILD_PYBIND) target_link_libraries(portable_lib PRIVATE ${_dep_libs}) install(TARGETS portable_lib + EXPORT ExecuTorchTargets LIBRARY DESTINATION executorch/extension/pybindings ) @@ -863,6 +865,7 @@ if(EXECUTORCH_BUILD_PYBIND) target_link_libraries(_training_lib PRIVATE ${_pybind_training_dep_libs}) install(TARGETS _training_lib + EXPORT ExecuTorchTargets LIBRARY DESTINATION executorch/extension/training/pybindings ) endif() @@ -921,5 +924,8 @@ endif() include(Test.cmake) +install(EXPORT ExecuTorchTargets + FILE ExecuTorchTargets.cmake + DESTINATION lib/cmake/ExecuTorch) # Print all summary executorch_print_configuration_summary() diff --git a/backends/apple/coreml/CMakeLists.txt b/backends/apple/coreml/CMakeLists.txt index 01fe9d0f59a..6947b4ee7ac 100644 --- a/backends/apple/coreml/CMakeLists.txt +++ b/backends/apple/coreml/CMakeLists.txt @@ -200,6 +200,7 @@ set(TARGET coremldelegate APPEND_STRING PROPERTY COMPILE_FLAGS install( TARGETS coremldelegate + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/backends/apple/mps/CMakeLists.txt b/backends/apple/mps/CMakeLists.txt index 96aa007563b..b621db327cb 100644 --- a/backends/apple/mps/CMakeLists.txt +++ b/backends/apple/mps/CMakeLists.txt @@ -88,6 +88,7 @@ target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc") install( TARGETS mpsdelegate + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/backends/mediatek/CMakeLists.txt b/backends/mediatek/CMakeLists.txt index 45f4bcda7fe..033eb6ca599 100644 --- a/backends/mediatek/CMakeLists.txt +++ b/backends/mediatek/CMakeLists.txt @@ -46,4 +46,4 @@ target_sources( ) target_link_options_shared_lib(neuron_backend) -install(TARGETS neuron_backend DESTINATION lib) +install(TARGETS neuron_backend EXPORT ExecuTorchTargets DESTINATION lib) diff --git a/backends/qualcomm/CMakeLists.txt b/backends/qualcomm/CMakeLists.txt index aefa929ee9f..10aabd5fca6 100644 --- a/backends/qualcomm/CMakeLists.txt +++ b/backends/qualcomm/CMakeLists.txt @@ -220,7 +220,7 @@ add_subdirectory( ${QNN_EXECUTORCH_ROOT_DIR}/aot/ir ${CMAKE_CURRENT_BINARY_DIR}/qnn_executorch/ir ) -install(TARGETS qnn_executorch_backend DESTINATION lib) +install(TARGETS qnn_executorch_backend EXPORT ExecuTorchTargets DESTINATION lib) # QNN pybind if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt index fca34fdf6a4..a471e7c2f43 100644 --- a/backends/vulkan/CMakeLists.txt +++ b/backends/vulkan/CMakeLists.txt @@ -148,6 +148,7 @@ endif() install( TARGETS vulkan_backend + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${COMMON_INCLUDES} diff --git a/backends/xnnpack/CMakeLists.txt b/backends/xnnpack/CMakeLists.txt index dc42a52a234..2bbb061c697 100644 --- a/backends/xnnpack/CMakeLists.txt +++ b/backends/xnnpack/CMakeLists.txt @@ -48,7 +48,6 @@ if(EXECUTORCH_XNNPACK_ENABLE_KLEIDI) add_definitions(-DENABLE_XNNPACK_KLEIDI) endif() -set(_common_include_directories ${EXECUTORCH_ROOT}/..) set(_common_compile_options -Wno-deprecated-declarations -fPIC) set(_xnnpack_schema__include_dir "${CMAKE_BINARY_DIR}/schema/include") @@ -89,10 +88,9 @@ add_custom_command( add_library(xnnpack_schema INTERFACE ${_xnnpack_schema__outputs}) set_target_properties(xnnpack_schema PROPERTIES LINKER_LANGUAGE CXX) target_include_directories( - xnnpack_schema INTERFACE ${_xnnpack_schema__include_dir} - ${EXECUTORCH_ROOT}/third-party/flatbuffers/include + xnnpack_schema INTERFACE $ ) - +target_link_libraries(xnnpack_schema INTERFACE flatbuffers) set(xnnpack_third_party pthreadpool cpuinfo) include(cmake/Dependencies.cmake) @@ -106,14 +104,14 @@ target_link_libraries( target_include_directories( xnnpack_backend PUBLIC ${_common_include_directories} ) -target_include_directories(xnnpack_backend PUBLIC ${XNNPACK_INCLUDE_DIR}) +target_include_directories(xnnpack_backend PRIVATE ${XNNPACK_INCLUDE_DIR}) target_include_directories( xnnpack_backend - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third-party/pthreadpool/include + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third-party/pthreadpool/include ) target_include_directories( xnnpack_backend - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cpuinfo/include + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cpuinfo/include ) target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options}) target_link_options_shared_lib(xnnpack_backend) @@ -155,7 +153,10 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$") endif() install( - TARGETS xnnpack_backend + # XNNPACK doesn't export the XNNPACK and following targets, + # so we need to export them ourselves. + TARGETS xnnpack_backend xnnpack_schema XNNPACK fxdiv + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/backends/xnnpack/cmake/Dependencies.cmake b/backends/xnnpack/cmake/Dependencies.cmake index fef63badf23..5aa6926674e 100644 --- a/backends/xnnpack/cmake/Dependencies.cmake +++ b/backends/xnnpack/cmake/Dependencies.cmake @@ -58,6 +58,7 @@ add_subdirectory("${XNNPACK_SOURCE_DIR}") include_directories(SYSTEM ${XNNPACK_INCLUDE_DIR}) list(APPEND xnnpack_third_party XNNPACK) install(TARGETS microkernels-prod + EXPORT ExecuTorchTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) @@ -65,6 +66,7 @@ install(TARGETS microkernels-prod if(EXECUTORCH_XNNPACK_ENABLE_KLEIDI) install(TARGETS kleidiai + EXPORT ExecuTorchTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/configurations/CMakeLists.txt b/configurations/CMakeLists.txt index 462124a6ea6..209c02453f1 100644 --- a/configurations/CMakeLists.txt +++ b/configurations/CMakeLists.txt @@ -57,5 +57,5 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED) executorch ) - install(TARGETS optimized_native_cpu_ops_lib DESTINATION lib) + install(TARGETS optimized_native_cpu_ops_lib EXPORT ExecuTorchTargets DESTINATION lib) endif() diff --git a/extension/data_loader/CMakeLists.txt b/extension/data_loader/CMakeLists.txt index 0af3fbcc161..4da2104dd91 100644 --- a/extension/data_loader/CMakeLists.txt +++ b/extension/data_loader/CMakeLists.txt @@ -19,12 +19,13 @@ endif() list(TRANSFORM _extension_data_loader__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(extension_data_loader ${_extension_data_loader__srcs}) target_link_libraries(extension_data_loader executorch) -target_include_directories(extension_data_loader PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_data_loader PUBLIC ${_common_include_directories}) target_compile_options(extension_data_loader PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_data_loader + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/flat_tensor/CMakeLists.txt b/extension/flat_tensor/CMakeLists.txt index caacd96b557..be51ee6fddb 100644 --- a/extension/flat_tensor/CMakeLists.txt +++ b/extension/flat_tensor/CMakeLists.txt @@ -21,9 +21,8 @@ add_library(extension_flat_tensor ${_extension_flat_tensor__srcs}) target_link_libraries(extension_flat_tensor executorch extension_data_loader) target_include_directories( extension_flat_tensor - PUBLIC ${EXECUTORCH_ROOT}/.. - "${CMAKE_BINARY_DIR}/extension/flat_tensor/include" - "${EXECUTORCH_ROOT}/third-party/flatbuffers/include" + PUBLIC $ + $ ${_common_include_directories} ) target_compile_options(extension_flat_tensor PUBLIC ${_common_compile_options}) @@ -31,6 +30,7 @@ target_compile_options(extension_flat_tensor PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_flat_tensor + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/llm/custom_ops/CMakeLists.txt b/extension/llm/custom_ops/CMakeLists.txt index c3969e6f9bf..2a7c65c3988 100644 --- a/extension/llm/custom_ops/CMakeLists.txt +++ b/extension/llm/custom_ops/CMakeLists.txt @@ -37,7 +37,7 @@ extract_sources(${EXECUTORCH_SRCS_FILE}) include(${EXECUTORCH_SRCS_FILE}) # Let files say "include ". -set(_common_include_directories ${EXECUTORCH_ROOT}/..) +set(_common_include_directories $ $) # Custom op libraries set(custom_ops_libs pthreadpool) @@ -73,7 +73,7 @@ add_library(custom_ops ${_custom_ops__srcs}) target_include_directories(custom_ops PUBLIC "${_common_include_directories}") target_include_directories( - custom_ops PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../../include" + custom_ops PRIVATE $ ) target_link_libraries(custom_ops PUBLIC ${custom_ops_libs} executorch_core) @@ -81,7 +81,7 @@ target_compile_options( custom_ops PUBLIC ${_common_compile_options} -DET_USE_THREADPOOL ) -install(TARGETS custom_ops DESTINATION lib) +install(TARGETS custom_ops EXPORT ExecuTorchTargets DESTINATION lib) if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT) # Add a AOT library @@ -98,7 +98,7 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT) custom_ops_aot_lib PUBLIC "${_common_include_directories}" ) target_include_directories( - custom_ops_aot_lib PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../../include" + custom_ops_aot_lib PRIVATE $ ) # TODO: This only works if we install portable_lib.so to # /executorch/extension/pybindings/. @@ -134,6 +134,7 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT) ) install(TARGETS custom_ops_aot_lib + EXPORT ExecuTorchTargets LIBRARY DESTINATION executorch/extension/llm/custom_ops ) endif() diff --git a/extension/llm/tokenizer/CMakeLists.txt b/extension/llm/tokenizer/CMakeLists.txt index 8745da6780a..ffef76eec91 100644 --- a/extension/llm/tokenizer/CMakeLists.txt +++ b/extension/llm/tokenizer/CMakeLists.txt @@ -45,6 +45,7 @@ target_compile_options( # Install libraries install( TARGETS extension_llm_tokenizer + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/module/CMakeLists.txt b/extension/module/CMakeLists.txt index d144ce95356..9d42b93cbb4 100644 --- a/extension/module/CMakeLists.txt +++ b/extension/module/CMakeLists.txt @@ -28,7 +28,7 @@ else() add_library(extension_module SHARED ${_extension_module__srcs}) endif() target_link_libraries(extension_module PRIVATE executorch extension_data_loader extension_flat_tensor) -target_include_directories(extension_module PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_module PUBLIC ${_common_include_directories}) target_compile_options( extension_module PUBLIC -Wno-deprecated-declarations -fPIC ) @@ -39,7 +39,7 @@ add_library(extension_module_static STATIC ${_extension_module__srcs}) target_link_libraries( extension_module_static PRIVATE executorch extension_data_loader extension_flat_tensor ) -target_include_directories(extension_module_static PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_module_static PUBLIC ${_common_include_directories}) target_compile_options( extension_module_static PUBLIC -Wno-deprecated-declarations -fPIC ) @@ -47,6 +47,7 @@ target_compile_options( # Install libraries install( TARGETS extension_module extension_module_static + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/runner_util/CMakeLists.txt b/extension/runner_util/CMakeLists.txt index 19aa884fd77..6efd8de736f 100644 --- a/extension/runner_util/CMakeLists.txt +++ b/extension/runner_util/CMakeLists.txt @@ -19,12 +19,13 @@ endif() list(TRANSFORM _extension_runner_util__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(extension_runner_util ${_extension_runner_util__srcs}) target_link_libraries(extension_runner_util executorch) -target_include_directories(extension_runner_util PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_runner_util PUBLIC ${_common_include_directories}) target_compile_options(extension_runner_util PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_runner_util + EXPORT ExecuTorchTargets DESTINATION ${CMAKE_BINARY_DIR}/lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/tensor/CMakeLists.txt b/extension/tensor/CMakeLists.txt index 51f955570db..9547de5b056 100644 --- a/extension/tensor/CMakeLists.txt +++ b/extension/tensor/CMakeLists.txt @@ -19,12 +19,13 @@ endif() list(TRANSFORM _extension_tensor__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(extension_tensor ${_extension_tensor__srcs}) target_link_libraries(extension_tensor executorch_core) -target_include_directories(extension_tensor PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_tensor PUBLIC ${_common_include_directories}) target_compile_options(extension_tensor PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_tensor + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/threadpool/CMakeLists.txt b/extension/threadpool/CMakeLists.txt index 90288656674..38ed8432a12 100644 --- a/extension/threadpool/CMakeLists.txt +++ b/extension/threadpool/CMakeLists.txt @@ -26,17 +26,19 @@ add_library( target_link_libraries( extension_threadpool PUBLIC executorch_core cpuinfo pthreadpool ) -target_include_directories(extension_threadpool PUBLIC ${EXECUTORCH_ROOT}/..) +target_include_directories(extension_threadpool PUBLIC ${_common_include_directories}) target_include_directories( extension_threadpool - PUBLIC ${EXECUTORCH_ROOT}/backends/xnnpack/third-party/cpuinfo/include - ${EXECUTORCH_ROOT}/backends/xnnpack/third-party/pthreadpool/include + PUBLIC $ + $ ) target_compile_options(extension_threadpool PUBLIC ${_common_compile_options}) # Install libraries install( - TARGETS extension_threadpool + # pthreadpool doesn't export itself, so we have to do our own install to export it. + TARGETS pthreadpool pthreadpool_interface extension_threadpool + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/extension/training/CMakeLists.txt b/extension/training/CMakeLists.txt index 97e75955837..43028d09c0b 100644 --- a/extension/training/CMakeLists.txt +++ b/extension/training/CMakeLists.txt @@ -43,6 +43,7 @@ target_compile_options(train_xor PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_training + EXPORT ExecuTorchTargets DESTINATION lib INCLUDES DESTINATION ${_common_include_directories} diff --git a/kernels/optimized/CMakeLists.txt b/kernels/optimized/CMakeLists.txt index 235c6738d9a..756b204e7f2 100644 --- a/kernels/optimized/CMakeLists.txt +++ b/kernels/optimized/CMakeLists.txt @@ -74,9 +74,9 @@ gen_operators_lib( ) install( - TARGETS cpublas optimized_kernels optimized_ops_lib + # eigen_blas doesn't export itself, so we have to do our own install to export it. + TARGETS cpublas optimized_kernels optimized_ops_lib eigen_blas + EXPORT ExecuTorchTargets DESTINATION lib PUBLIC_HEADER DESTINATION include/executorch/kernels/optimized/ ) - -install(TARGETS cpublas DESTINATION lib) diff --git a/kernels/portable/CMakeLists.txt b/kernels/portable/CMakeLists.txt index 885c509246b..31da5883772 100644 --- a/kernels/portable/CMakeLists.txt +++ b/kernels/portable/CMakeLists.txt @@ -65,6 +65,7 @@ gen_operators_lib( install( TARGETS portable_kernels portable_ops_lib + EXPORT ExecuTorchTargets DESTINATION lib PUBLIC_HEADER DESTINATION include/executorch/kernels/portable/ ) diff --git a/kernels/quantized/CMakeLists.txt b/kernels/quantized/CMakeLists.txt index 6b01ba4fc27..d96d5062f50 100644 --- a/kernels/quantized/CMakeLists.txt +++ b/kernels/quantized/CMakeLists.txt @@ -153,6 +153,7 @@ gen_operators_lib( install( TARGETS quantized_kernels quantized_ops_lib + EXPORT ExecuTorchTargets DESTINATION lib PUBLIC_HEADER DESTINATION include/executorch/kernels/quantized/ ) diff --git a/schema/CMakeLists.txt b/schema/CMakeLists.txt index 64f8821da1e..b39a7eec557 100644 --- a/schema/CMakeLists.txt +++ b/schema/CMakeLists.txt @@ -55,8 +55,10 @@ function(generate_program_schema _schema_srcs _schema_name) target_include_directories( ${_schema_name} INTERFACE ${_program_schema__include_dir} - ${EXECUTORCH_ROOT}/third-party/flatbuffers/include + $ ) + target_link_libraries(${_schema_name} INTERFACE flatbuffers) + endfunction() # Generate common schema @@ -67,3 +69,10 @@ generate_program_schema("${common_schema_srcs}" "common_schema") set(program_schema_srcs program.fbs) generate_program_schema("${program_schema_srcs}" "program_schema") add_dependencies(program_schema common_schema) + +install( + TARGETS common_schema program_schema + EXPORT ExecuTorchTargets + DESTINATION lib + INCLUDES + DESTINATION ${_common_include_directories}) From 9e3e2e7bde6916ae5c424727b9aeb751da7b0611 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 13 Jul 2025 09:47:07 -0700 Subject: [PATCH 02/34] Update [ghstack-poisoned] --- backends/xnnpack/CMakeLists.txt | 3 +- backends/xnnpack/cmake/Dependencies.cmake | 127 ++++++++++++---------- tools/cmake/executorch-config.cmake | 21 ++-- 3 files changed, 80 insertions(+), 71 deletions(-) diff --git a/backends/xnnpack/CMakeLists.txt b/backends/xnnpack/CMakeLists.txt index b6ba211ecb3..c4c5068d197 100644 --- a/backends/xnnpack/CMakeLists.txt +++ b/backends/xnnpack/CMakeLists.txt @@ -92,9 +92,8 @@ target_include_directories( ${EXECUTORCH_ROOT}/third-party/flatbuffers/include ) -set(xnnpack_third_party pthreadpool extension_threadpool cpuinfo) - include(cmake/Dependencies.cmake) +set(xnnpack_third_party XNNPACK pthreadpool extension_threadpool cpuinfo) list(TRANSFORM _xnnpack_backend__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(xnnpack_backend ${_xnnpack_backend__srcs}) diff --git a/backends/xnnpack/cmake/Dependencies.cmake b/backends/xnnpack/cmake/Dependencies.cmake index ca31a1e45cb..7272cddc30d 100644 --- a/backends/xnnpack/cmake/Dependencies.cmake +++ b/backends/xnnpack/cmake/Dependencies.cmake @@ -10,71 +10,86 @@ set(THIRD_PARTY_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/third-party") # --- XNNPACK -# Setting this global PIC flag for all XNNPACK targets. This is needed for -# Object libraries within XNNPACK which must be PIC to successfully link this -# static libXNNPACK -set(ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG - ${CMAKE_POSITION_INDEPENDENT_CODE} -) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(XNNPACK_SOURCE_DIR "${THIRD_PARTY_ROOT}/XNNPACK") set(XNNPACK_INCLUDE_DIR "${XNNPACK_SOURCE_DIR}/include") -set(XNNPACK_LIBRARY_TYPE - "static" - CACHE STRING "" -) -set(XNNPACK_BUILD_BENCHMARKS - OFF - CACHE BOOL "" + +include(ExternalProject) +set(XNNPACK_STATIC_LIB "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/lib/libXNNPACK.a") +set(XNNPACK_MICROKERNELS_STATIC_LIB + "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/lib/libxnnpack-microkernels-prod.a" ) -set(XNNPACK_BUILD_TESTS - OFF - CACHE BOOL "" +ExternalProject_Add( + XNNPACKExternalProject + SOURCE_DIR ${XNNPACK_SOURCE_DIR} + # XXX should we install to CMAKE_INSTALL_PREFIX instead? Review how we do it + # with flatbuffers + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} + INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/XNNPACK + INSTALL_BYPRODUCTS ${XNNPACK_STATIC_LIB} ${XNNPACK_MICROKERNELS_STATIC_LIB} + CMAKE_ARGS + -D + XNNPACK_LIBRARY_TYPE=static + -D + XNNPACK_BUILD_BENCHMARKS=OFF + -D + XNNPACK_BUILD_TESTS=OFF + -D + XNNPACK_ENABLE_AVXVNNI=OFF + # Work around observed failure: + # https://github.com/pytorch/executorch/pull/10362#issuecomment-2906391232 + -D + XNNPACK_ENABLE_AVX512VNNIGFNI=OFF + -D + ENABLE_XNNPACK_WEIGHTS_CACHE=${EXECUTORCH_XNNPACK_ENABLE_WEIGHT_CACHE} + -D + ENABLE_XNNPACK_SHARED_WORKSPACE=${EXECUTORCH_XNNPACK_SHARED_WORKSPACE} + -D + XNNPACK_ENABLE_KLEIDIAI=${EXECUTORCH_XNNPACK_ENABLE_KLEIDIAI} + -D + CMAKE_INSTALL_PREFIX= + -D + XNNPACK_BUILD_ALL_MICROKERNELS=OFF + -D + CMAKE_POSITION_INDEPENDENT_CODE=ON ) -set(XNNPACK_ENABLE_AVXVNNI - OFF - CACHE BOOL "" - ) -# Work around observed failure: https://github.com/pytorch/executorch/pull/10362#issuecomment-2906391232 -set(XNNPACK_ENABLE_AVX512VNNIGFNI - OFF - CACHE BOOL "") -if(EXECUTORCH_XNNPACK_ENABLE_KLEIDI) - set(XNNPACK_ENABLE_KLEIDIAI - ON - CACHE BOOL "" - ) -else() - set(XNNPACK_ENABLE_KLEIDIAI - OFF - CACHE BOOL "" - ) -endif() +# add_subdirectory("${XNNPACK_SOURCE_DIR}") include_directories(SYSTEM +# ${XNNPACK_INCLUDE_DIR}) + +add_library(XNNPACK STATIC IMPORTED GLOBAL) +# TODO: this probably doesn't work on Windows. +set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION ${XNNPACK_STATIC_LIB}) +add_dependencies(XNNPACK XNNPACKExternalProject) -set(XNNPACK_BUILD_ALL_MICROKERNELS - OFF - CACHE BOOL "" +add_library(xnnpack-microkernels-prod STATIC IMPORTED GLOBAL) +set_property( + TARGET xnnpack-microkernels-prod PROPERTY IMPORTED_LOCATION + ${XNNPACK_MICROKERNELS_STATIC_LIB} ) -add_subdirectory("${XNNPACK_SOURCE_DIR}") -include_directories(SYSTEM ${XNNPACK_INCLUDE_DIR}) -list(APPEND xnnpack_third_party XNNPACK) -install(TARGETS xnnpack-microkernels-prod - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +add_dependencies(xnnpack-microkernels-prod XNNPACKExternalProject) +set_target_properties( + XNNPACK PROPERTIES INTERFACE_LINK_LIBRARIES xnnpack-microkernels-prod +) + +install(FILES ${XNNPACK_MICROKERNELS_STATIC_LIB} + DESTINATION ${CMAKE_INSTALL_LIBDIR} +) if(EXECUTORCH_XNNPACK_ENABLE_KLEIDI) - install(TARGETS kleidiai - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + add_library(kleidiai SHARED IMPORTED) + find_library( + KLEIDIAI_LIBRARY kleidiai + PATHS "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/kleidiai-source" + ) + if(not KLEIDIAI_LIBRARY) + message(FATAL_ERROR "Can't find KleidiAI") + endif() + install( + TARGETS kleidiai + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) endif() - -# Revert PIC Flag to what it originally was -set(CMAKE_POSITION_INDEPENDENT_CODE - ${ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG} -) diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake index e73104b0f1e..9095ae12cb9 100644 --- a/tools/cmake/executorch-config.cmake +++ b/tools/cmake/executorch-config.cmake @@ -78,11 +78,6 @@ set(lib_list extension_threadpool extension_training xnnpack_backend - # Start XNNPACK Lib Deps - XNNPACK - xnnpack-microkernels-prod - kleidiai - # End XNNPACK Lib Deps cpuinfo pthreadpool vulkan_backend @@ -150,7 +145,9 @@ if(TARGET coremldelegate) endif() if(TARGET etdump) - set_target_properties(etdump PROPERTIES INTERFACE_LINK_LIBRARIES "flatccrt;executorch") + set_target_properties( + etdump PROPERTIES INTERFACE_LINK_LIBRARIES "flatccrt;executorch" + ) endif() if(TARGET optimized_native_cpu_ops_lib) @@ -174,13 +171,11 @@ if(TARGET extension_threadpool) endif() set(shared_lib_list - # executorch -- size tests fail due to regression if we include this and I'm not sure it's needed. - optimized_native_cpu_ops_lib - portable_ops_lib - quantized_ops_lib - xnnpack_backend - vulkan_backend - quantized_ops_aot_lib) + # executorch -- size tests fail due to regression if we include this and I'm + # not sure it's needed. + optimized_native_cpu_ops_lib portable_ops_lib quantized_ops_lib + xnnpack_backend vulkan_backend quantized_ops_aot_lib +) foreach(lib ${shared_lib_list}) if(TARGET ${lib}) target_link_options_shared_lib(${lib}) From 16f027467ef4a4d54e35f36b6f43e50c825c31cd Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 13 Jul 2025 09:48:21 -0700 Subject: [PATCH 03/34] forgot to amend [ghstack-poisoned] --- backends/xnnpack/cmake/Dependencies.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backends/xnnpack/cmake/Dependencies.cmake b/backends/xnnpack/cmake/Dependencies.cmake index 7272cddc30d..ac36a0e6a73 100644 --- a/backends/xnnpack/cmake/Dependencies.cmake +++ b/backends/xnnpack/cmake/Dependencies.cmake @@ -14,18 +14,16 @@ set(XNNPACK_SOURCE_DIR "${THIRD_PARTY_ROOT}/XNNPACK") set(XNNPACK_INCLUDE_DIR "${XNNPACK_SOURCE_DIR}/include") include(ExternalProject) -set(XNNPACK_STATIC_LIB "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/lib/libXNNPACK.a") +set(XNNPACK_STATIC_LIB "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/libXNNPACK.a") set(XNNPACK_MICROKERNELS_STATIC_LIB - "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/lib/libxnnpack-microkernels-prod.a" + "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/libxnnpack-microkernels-prod.a" ) ExternalProject_Add( XNNPACKExternalProject SOURCE_DIR ${XNNPACK_SOURCE_DIR} - # XXX should we install to CMAKE_INSTALL_PREFIX instead? Review how we do it - # with flatbuffers - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} - INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/XNNPACK - INSTALL_BYPRODUCTS ${XNNPACK_STATIC_LIB} ${XNNPACK_MICROKERNELS_STATIC_LIB} + # Not 100% clear on these locations + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/XNNPACK + BUILD_BYPRODUCTS ${XNNPACK_STATIC_LIB} ${XNNPACK_MICROKERNELS_STATIC_LIB} CMAKE_ARGS -D XNNPACK_LIBRARY_TYPE=static From 99ec5a7f1367bfed8cfc1cd6774ddf703f619c1c Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 11:09:22 -0700 Subject: [PATCH 04/34] Update [ghstack-poisoned] --- CMakeLists.txt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83a1db3d7b7..8caaecf9e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,11 +112,12 @@ set(CMAKE_SKIP_BUILD_RPATH OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Automatically add all linked folders that are NOT in the build directory to # the rpath (per library?) -# TODO: Doesn't work for us right now because we are -# not installing .so's into the correct locations. For example we have -# libcustom_ops_aot_lib.so depending on _portable_lib.so, which was eventually -# put under /executorch/extension/pybindings/ but this rpath is -# not automatically added because at build time it seems `portable_lib` is being +# +# TODO: Doesn't work for us right now because we are not installing .so's into +# the correct locations. For example we have libcustom_ops_aot_lib.so depending +# on _portable_lib.so, which was eventually put under +# /executorch/extension/pybindings/ but this rpath is not +# automatically added because at build time it seems `portable_lib` is being # built under the same directory, so no extra rpath is being added. To properly # fix this we need to install `portable_lib` into the correct path. set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) @@ -321,8 +322,9 @@ if(EXECUTORCH_USE_CPP_CODE_COVERAGE) " -fprofile-instr-generate -fcoverage-mapping" ) else() - message(FATAL_ERROR - "Code coverage for compiler ${CMAKE_CXX_COMPILER_ID} is unsupported" + message( + FATAL_ERROR + "Code coverage for compiler ${CMAKE_CXX_COMPILER_ID} is unsupported" ) endif() endif() @@ -633,8 +635,8 @@ if(EXECUTORCH_BUILD_PYBIND) endif() if(EXECUTORCH_BUILD_XNNPACK) - # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here otherwise - # uses XNNPACK and microkernel-prod symbols from libtorch_cpu + # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here + # otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu list(APPEND _dep_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod) endif() From ff3cdb9fc721f93efc6d57d07b654e65c35c0a2f Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 11:09:26 -0700 Subject: [PATCH 05/34] Update [ghstack-poisoned] --- extension/training/CMakeLists.txt | 53 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/extension/training/CMakeLists.txt b/extension/training/CMakeLists.txt index 11f94b39a89..26a5c752d5b 100644 --- a/extension/training/CMakeLists.txt +++ b/extension/training/CMakeLists.txt @@ -25,47 +25,58 @@ target_include_directories( target_include_directories(extension_training PUBLIC ${EXECUTORCH_ROOT}/..) target_compile_options(extension_training PUBLIC ${_common_compile_options}) -target_link_libraries(extension_training executorch_core kernels_util_all_deps - extension_data_loader extension_module_static extension_tensor extension_flat_tensor ) - +target_link_libraries( + extension_training + executorch_core + kernels_util_all_deps + extension_data_loader + extension_module_static + extension_tensor + extension_flat_tensor +) list(TRANSFORM _train_xor__srcs PREPEND "${EXECUTORCH_ROOT}/") add_executable(train_xor ${_train_xor__srcs}) -target_include_directories( - train_xor PUBLIC ${_common_include_directories} -) +target_include_directories(train_xor PUBLIC ${_common_include_directories}) target_link_libraries( -train_xor gflags executorch_core portable_ops_lib extension_tensor - extension_training program_schema + train_xor + gflags + executorch_core + portable_ops_lib + extension_tensor + extension_training + program_schema ) target_compile_options(train_xor PUBLIC ${_common_compile_options}) if(EXECUTORCH_BUILD_PYBIND) # Pybind library. - set(_pybind_training_dep_libs - ${TORCH_PYTHON_LIBRARY} - etdump - executorch - util - torch - extension_training + set(_pybind_training_dep_libs ${TORCH_PYTHON_LIBRARY} etdump executorch util + torch extension_training ) if(EXECUTORCH_BUILD_XNNPACK) - # need to explicitly specify XNNPACK and xnnpack-microkernels-prod - # here otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu - list(APPEND _pybind_training_dep_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod) + # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here + # otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu + list(APPEND _pybind_training_dep_libs xnnpack_backend XNNPACK + xnnpack-microkernels-prod + ) endif() # pybind training - pybind11_add_module(_training_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/pybindings/_training_lib.cpp) + pybind11_add_module( + _training_lib SHARED + ${CMAKE_CURRENT_SOURCE_DIR}/pybindings/_training_lib.cpp + ) target_include_directories(_training_lib PRIVATE ${TORCH_INCLUDE_DIRS}) - target_compile_options(_training_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions) + target_compile_options( + _training_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions + ) target_link_libraries(_training_lib PRIVATE ${_pybind_training_dep_libs}) install(TARGETS _training_lib - LIBRARY DESTINATION executorch/extension/training/pybindings + LIBRARY DESTINATION executorch/extension/training/pybindings ) endif() From 08bffac71384e5046a7f0f1ab47c803b1be8ba8e Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 14:25:44 -0700 Subject: [PATCH 06/34] Update [ghstack-poisoned] --- backends/apple/coreml/CMakeLists.txt | 66 +++++++++++------------- backends/mediatek/CMakeLists.txt | 10 ++-- backends/qualcomm/CMakeLists.txt | 40 +++++++++----- backends/vulkan/CMakeLists.txt | 3 +- configurations/CMakeLists.txt | 4 +- extension/llm/custom_ops/CMakeLists.txt | 13 +++-- extension/module/CMakeLists.txt | 8 ++- kernels/optimized/CMakeLists.txt | 18 ++++--- kernels/portable/CMakeLists.txt | 35 ++++++++----- kernels/portable/cpu/util/CMakeLists.txt | 8 ++- kernels/quantized/CMakeLists.txt | 14 ++--- schema/CMakeLists.txt | 16 +++--- 12 files changed, 133 insertions(+), 102 deletions(-) diff --git a/backends/apple/coreml/CMakeLists.txt b/backends/apple/coreml/CMakeLists.txt index 8d7b89c5a8d..96684a50dce 100644 --- a/backends/apple/coreml/CMakeLists.txt +++ b/backends/apple/coreml/CMakeLists.txt @@ -104,7 +104,9 @@ if(APPLE) endif() add_library(coreml_util ${UTIL_SOURCES}) -target_include_directories(coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util) +target_include_directories( + coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util +) if(APPLE) target_link_libraries(coreml_util PRIVATE ${FOUNDATION_FRAMEWORK}) endif() @@ -119,21 +121,25 @@ install( # CoreML inmemoryfs -set( - INMEMORYFS_SOURCES - runtime/inmemoryfs/inmemory_filesystem.cpp - runtime/inmemoryfs/memory_buffer.cpp - runtime/inmemoryfs/memory_stream.cpp - runtime/inmemoryfs/reversed_memory_stream.cpp +set(INMEMORYFS_SOURCES + runtime/inmemoryfs/inmemory_filesystem.cpp + runtime/inmemoryfs/memory_buffer.cpp runtime/inmemoryfs/memory_stream.cpp + runtime/inmemoryfs/reversed_memory_stream.cpp ) if(APPLE) - list(APPEND INMEMORYFS_SOURCES runtime/inmemoryfs/inmemory_filesystem_utils.mm) + list(APPEND INMEMORYFS_SOURCES + runtime/inmemoryfs/inmemory_filesystem_utils.mm + ) endif() add_library(coreml_inmemoryfs ${INMEMORYFS_SOURCES}) -target_include_directories(coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs) +target_include_directories( + coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs +) if(APPLE) - target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK}) + target_link_libraries( + coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK} + ) endif() target_compile_options(coreml_inmemoryfs PUBLIC -fPIC) @@ -148,17 +154,12 @@ install( if(EXECUTORCH_BUILD_PYBIND) pybind11_add_module( - executorchcoreml - SHARED - runtime/inmemoryfs/inmemory_filesystem_py.cpp - runtime/inmemoryfs/inmemory_filesystem_utils.cpp + executorchcoreml SHARED runtime/inmemoryfs/inmemory_filesystem_py.cpp + runtime/inmemoryfs/inmemory_filesystem_utils.cpp ) target_link_libraries( - executorchcoreml - PRIVATE - coreml_util - coreml_inmemoryfs - nlohmann_json::nlohmann_json + executorchcoreml PRIVATE coreml_util coreml_inmemoryfs + nlohmann_json::nlohmann_json ) target_compile_options(executorchcoreml PUBLIC -fPIC) endif() @@ -179,8 +180,12 @@ if(APPLE) coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/delegate ) target_include_directories(coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/..) - target_include_directories(coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/runtime/core/portable_type/c10) - target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS) + target_include_directories( + coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/runtime/core/portable_type/c10 + ) + target_compile_definitions( + coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS + ) if(EXECUTORCH_BUILD_DEVTOOLS) target_sources(coremldelegate PRIVATE ${SDK_SOURCES} ${PROTOBUF_SOURCES}) @@ -200,13 +205,9 @@ if(APPLE) target_link_libraries( coremldelegate - PUBLIC coreml_util - coreml_inmemoryfs - PRIVATE executorch_core - ${ACCELERATE_FRAMEWORK} - ${COREML_FRAMEWORK} - ${FOUNDATION_FRAMEWORK} - ${SQLITE_LIBRARY} + PUBLIC coreml_util coreml_inmemoryfs + PRIVATE executorch_core ${ACCELERATE_FRAMEWORK} ${COREML_FRAMEWORK} + ${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY} ) target_link_options_shared_lib(coremldelegate) @@ -218,13 +219,8 @@ if(APPLE) endif() target_compile_options( - coremldelegate - PRIVATE - -fobjc-arc - -fno-exceptions - -x objective-c++ - -Wno-null-character - -Wno-receiver-expr + coremldelegate PRIVATE -fobjc-arc -fno-exceptions -x objective-c++ + -Wno-null-character -Wno-receiver-expr ) if(EXECUTORCH_BUILD_DEVTOOLS) diff --git a/backends/mediatek/CMakeLists.txt b/backends/mediatek/CMakeLists.txt index e6c68616445..128faa70cc6 100644 --- a/backends/mediatek/CMakeLists.txt +++ b/backends/mediatek/CMakeLists.txt @@ -24,13 +24,9 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/include) # targets add_library(neuron_backend SHARED) target_compile_options(neuron_backend PRIVATE "-frtti" "-fexceptions") -target_link_libraries(neuron_backend - PRIVATE - executorch_core - portable_ops_lib - portable_kernels - android - log +target_link_libraries( + neuron_backend PRIVATE executorch_core portable_ops_lib portable_kernels + android log ) target_sources( neuron_backend diff --git a/backends/qualcomm/CMakeLists.txt b/backends/qualcomm/CMakeLists.txt index 9f1be61de2b..9f353a50782 100644 --- a/backends/qualcomm/CMakeLists.txt +++ b/backends/qualcomm/CMakeLists.txt @@ -69,15 +69,15 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() include_directories( - BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN + BEFORE + ${_common_include_directories} + ${QNN_SDK_ROOT}/include/QNN ${QNN_SDK_ROOT}/share/QNN/converter/jni ${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include ${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type/c10 ) -set(_qnn_schema__srcs - backends/qualcomm/serialization/qc_compiler_spec.fbs -) +set(_qnn_schema__srcs backends/qualcomm/serialization/qc_compiler_spec.fbs) set(_qnn_schema__include_dir "${CMAKE_BINARY_DIR}/schema/include") # Paths to headers generated from the .fbs files. set(_qnn_schema__outputs) @@ -145,22 +145,24 @@ add_library(utils STATIC) target_link_libraries(qcir_utils PRIVATE qcir) target_link_libraries(wrappers PRIVATE qnn_executorch_logging) target_link_libraries( - qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS} + qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging + ${CMAKE_DL_LIBS} ) target_link_libraries( - qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS} + qnn_sys_implementation PRIVATE qnn_sys_function_interface + qnn_executorch_logging ${CMAKE_DL_LIBS} ) target_link_libraries(qnn_executorch_logging PRIVATE qnn_schema) target_link_libraries(qnn_profiler PRIVATE qnn_executorch_logging) target_link_libraries(qnn_logger PRIVATE qnn_implementation ${android_log}) -target_link_libraries(qnn_backend PRIVATE qnn_implementation qnn_logger qnn_op_package_manager) -target_link_libraries(qnn_custom_protocol PRIVATE qnn_logger) target_link_libraries( - qnn_device PRIVATE qnn_executorch_logging qnn_implementation qnn_logger + qnn_backend PRIVATE qnn_implementation qnn_logger qnn_op_package_manager ) +target_link_libraries(qnn_custom_protocol PRIVATE qnn_logger) target_link_libraries( - qnn_backend_cache PRIVATE qnn_sys_implementation + qnn_device PRIVATE qnn_executorch_logging qnn_implementation qnn_logger ) +target_link_libraries(qnn_backend_cache PRIVATE qnn_sys_implementation) target_link_libraries( qnn_context PRIVATE qnn_implementation qnn_logger qnn_backend qnn_device qnn_backend_cache @@ -174,14 +176,24 @@ target_link_libraries( ) target_link_libraries( - qnn_factory PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph - qnn_mem_manager qnn_custom_protocol + qnn_factory + PRIVATE qnn_schema + qnn_backend + qnn_device + qnn_context + qnn_graph + qnn_mem_manager + qnn_custom_protocol ) -target_link_libraries(qnn_dlc_manager PRIVATE qnn_factory qnn_backend qnn_device qnn_context qnn_graph qnn_mem_manager) +target_link_libraries( + qnn_dlc_manager PRIVATE qnn_factory qnn_backend qnn_device qnn_context + qnn_graph qnn_mem_manager +) target_link_libraries( - qnn_manager PRIVATE qnn_factory wrappers qnn_schema utils shared_buffer qnn_dlc_manager + qnn_manager PRIVATE qnn_factory wrappers qnn_schema utils shared_buffer + qnn_dlc_manager ) target_link_libraries( qnn_executorch_backend PRIVATE qnn_executorch_header qnn_schema qnn_manager diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt index db7c3694f28..e4fd991858e 100644 --- a/backends/vulkan/CMakeLists.txt +++ b/backends/vulkan/CMakeLists.txt @@ -82,7 +82,8 @@ add_custom_command( OUTPUT ${GENERATED_HEADER} COMMAND flatc --cpp --cpp-std c++11 --scoped-enums -o - "${SCHEMA_INCLUDE_DIR}/executorch/backends/vulkan/serialization/" ${_vulkan_schema__srcs} + "${SCHEMA_INCLUDE_DIR}/executorch/backends/vulkan/serialization/" + ${_vulkan_schema__srcs} WORKING_DIRECTORY ${EXECUTORCH_ROOT} DEPENDS flatc COMMENT "Generating vulkan_schema headers" diff --git a/configurations/CMakeLists.txt b/configurations/CMakeLists.txt index c039d1a8e05..dfb24d27f94 100644 --- a/configurations/CMakeLists.txt +++ b/configurations/CMakeLists.txt @@ -44,7 +44,9 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED) # optimized_native_cpu_ops_lib: Register optimized op kernels into the runtime if(TARGET optimized_portable_kernels) - set(_optimized_native_cpu_ops_lib_portable_kernels_lib optimized_portable_kernels) + set(_optimized_native_cpu_ops_lib_portable_kernels_lib + optimized_portable_kernels + ) else() set(_optimized_native_cpu_ops_lib_portable_kernels_lib portable_kernels) endif() diff --git a/extension/llm/custom_ops/CMakeLists.txt b/extension/llm/custom_ops/CMakeLists.txt index 6f8ac245182..20890794857 100644 --- a/extension/llm/custom_ops/CMakeLists.txt +++ b/extension/llm/custom_ops/CMakeLists.txt @@ -78,9 +78,7 @@ target_include_directories( ) target_link_libraries(custom_ops PUBLIC ${custom_ops_libs} executorch_core) -target_compile_options( - custom_ops PUBLIC ${_common_compile_options} -) +target_compile_options(custom_ops PUBLIC ${_common_compile_options}) install(TARGETS custom_ops DESTINATION lib) @@ -117,7 +115,9 @@ if(EXECUTORCH_BUILD_KERNELS_LLM_AOT) else() # If no portable_lib, custom_ops_aot_lib still gives the ability to use the # ops in PyTorch - target_link_libraries(custom_ops_aot_lib PUBLIC executorch_core kernels_util_all_deps) + target_link_libraries( + custom_ops_aot_lib PUBLIC executorch_core kernels_util_all_deps + ) endif() target_link_libraries( @@ -130,9 +130,8 @@ if(EXECUTORCH_BUILD_KERNELS_LLM_AOT) target_link_libraries(custom_ops_aot_lib PUBLIC pthreadpool cpuinfo) endif() target_compile_options( - custom_ops_aot_lib - PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions - ${_common_compile_options} + custom_ops_aot_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti + -fexceptions ${_common_compile_options} ) install(TARGETS custom_ops_aot_lib diff --git a/extension/module/CMakeLists.txt b/extension/module/CMakeLists.txt index abf95f866f0..cd22f1ccfc2 100644 --- a/extension/module/CMakeLists.txt +++ b/extension/module/CMakeLists.txt @@ -27,7 +27,10 @@ if(CMAKE_TOOLCHAIN_IOS else() add_library(extension_module SHARED ${_extension_module__srcs}) endif() -target_link_libraries(extension_module PRIVATE executorch_core extension_data_loader extension_flat_tensor) +target_link_libraries( + extension_module PRIVATE executorch_core extension_data_loader + extension_flat_tensor +) target_include_directories(extension_module PUBLIC ${EXECUTORCH_ROOT}/..) target_compile_options( extension_module PUBLIC -Wno-deprecated-declarations -fPIC @@ -37,7 +40,8 @@ target_compile_options( # after cleaning up CMake targets. add_library(extension_module_static STATIC ${_extension_module__srcs}) target_link_libraries( - extension_module_static PRIVATE executorch_core extension_data_loader extension_flat_tensor + extension_module_static PRIVATE executorch_core extension_data_loader + extension_flat_tensor ) target_include_directories(extension_module_static PUBLIC ${EXECUTORCH_ROOT}/..) target_compile_options( diff --git a/kernels/optimized/CMakeLists.txt b/kernels/optimized/CMakeLists.txt index 8dfc9e0f734..9f9094657b0 100644 --- a/kernels/optimized/CMakeLists.txt +++ b/kernels/optimized/CMakeLists.txt @@ -52,24 +52,30 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}") generate_bindings_for_kernels( LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML - ${CMAKE_CURRENT_SOURCE_DIR}/optimized.yaml - ADD_EXCEPTION_BOUNDARY + ${CMAKE_CURRENT_SOURCE_DIR}/optimized.yaml ADD_EXCEPTION_BOUNDARY ) message("Generated files ${gen_command_sources}") list(TRANSFORM _optimized_kernels__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(optimized_kernels ${_optimized_kernels__srcs}) -target_include_directories(optimized_kernels PRIVATE ${TORCH_INCLUDE_DIRS} "${EXECUTORCH_ROOT}/third-party/pocketfft") -target_compile_definitions(optimized_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS") +target_include_directories( + optimized_kernels PRIVATE ${TORCH_INCLUDE_DIRS} + "${EXECUTORCH_ROOT}/third-party/pocketfft" +) +target_compile_definitions( + optimized_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS" +) target_link_libraries( - optimized_kernels PUBLIC executorch_core cpublas extension_threadpool kernels_util_all_deps + optimized_kernels PUBLIC executorch_core cpublas extension_threadpool + kernels_util_all_deps ) target_compile_options(optimized_kernels PUBLIC ${_common_compile_options}) # Build a library for _optimized_kernels_srcs # # optimized_ops_lib: Register optimized ops kernels into Executorch runtime gen_operators_lib( - LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch_core + LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS + executorch_core ) install( diff --git a/kernels/portable/CMakeLists.txt b/kernels/portable/CMakeLists.txt index 15aaece750e..b729d56993e 100644 --- a/kernels/portable/CMakeLists.txt +++ b/kernels/portable/CMakeLists.txt @@ -48,7 +48,9 @@ message("Generated files ${gen_command_sources}") # Focused on portability and understandability rather than speed. # add_library(portable_kernels ${_portable_kernels__srcs}) -target_link_libraries(portable_kernels PRIVATE executorch_core kernels_util_all_deps) +target_link_libraries( + portable_kernels PRIVATE executorch_core kernels_util_all_deps +) target_compile_options(portable_kernels PUBLIC ${_common_compile_options}) # Build a library for _portable_kernels__srcs @@ -59,26 +61,35 @@ gen_operators_lib( LIB_NAME "portable_ops_lib" KERNEL_LIBS portable_kernels DEPS executorch_core ) -# Portable kernels support optional parallelization (and, in the -# future, perhaps other performance features). If support is present, -# produce an optimized version. +# Portable kernels support optional parallelization (and, in the future, perhaps +# other performance features). If support is present, produce an optimized +# version. if(EXECUTORCH_BUILD_PTHREADPOOL AND EXECUTORCH_BUILD_KERNELS_OPTIMIZED) add_library(optimized_portable_kernels ${_portable_kernels__srcs}) target_link_libraries(optimized_portable_kernels PRIVATE executorch_core) target_link_libraries(optimized_portable_kernels PUBLIC extension_threadpool) - target_compile_options(optimized_portable_kernels PUBLIC ${_common_compile_options}) - target_include_directories(optimized_portable_kernels PRIVATE ${TORCH_INCLUDE_DIRS}) - target_compile_definitions(optimized_portable_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS") - gen_selected_ops(LIB_NAME "optimized_portable_ops_lib" OPS_SCHEMA_YAML "${_yaml}") + target_compile_options( + optimized_portable_kernels PUBLIC ${_common_compile_options} + ) + target_include_directories( + optimized_portable_kernels PRIVATE ${TORCH_INCLUDE_DIRS} + ) + target_compile_definitions( + optimized_portable_kernels + PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS" + ) + gen_selected_ops( + LIB_NAME "optimized_portable_ops_lib" OPS_SCHEMA_YAML "${_yaml}" + ) generate_bindings_for_kernels( LIB_NAME "optimized_portable_ops_lib" FUNCTIONS_YAML "${_yaml}" ) gen_operators_lib( - LIB_NAME "optimized_portable_ops_lib" KERNEL_LIBS optimized_portable_kernels DEPS executorch_core + LIB_NAME "optimized_portable_ops_lib" KERNEL_LIBS + optimized_portable_kernels DEPS executorch_core ) - install( - TARGETS optimized_portable_kernels optimized_portable_ops_lib - DESTINATION lib + install(TARGETS optimized_portable_kernels optimized_portable_ops_lib + DESTINATION lib ) endif() diff --git a/kernels/portable/cpu/util/CMakeLists.txt b/kernels/portable/cpu/util/CMakeLists.txt index 8a2da87936d..19d33cf84d9 100644 --- a/kernels/portable/cpu/util/CMakeLists.txt +++ b/kernels/portable/cpu/util/CMakeLists.txt @@ -25,6 +25,10 @@ set(_common_compile_options -Wno-deprecated-declarations) add_library(kernels_util_all_deps ${_kernels_util_all_deps__srcs}) target_link_libraries(kernels_util_all_deps PRIVATE executorch_core) -target_include_directories(kernels_util_all_deps PUBLIC ${_common_include_directories}) -target_compile_definitions(kernels_util_all_deps PUBLIC C10_USING_CUSTOM_GENERATED_MACROS) +target_include_directories( + kernels_util_all_deps PUBLIC ${_common_include_directories} +) +target_compile_definitions( + kernels_util_all_deps PUBLIC C10_USING_CUSTOM_GENERATED_MACROS +) target_compile_options(kernels_util_all_deps PUBLIC ${_common_compile_options}) diff --git a/kernels/quantized/CMakeLists.txt b/kernels/quantized/CMakeLists.txt index e5d1a94e068..ddbbc1a10b8 100644 --- a/kernels/quantized/CMakeLists.txt +++ b/kernels/quantized/CMakeLists.txt @@ -88,11 +88,8 @@ if(NOT CMAKE_GENERATOR STREQUAL "Xcode" if(TARGET portable_lib) add_library(quantized_pybind_kernels_lib ${_quantized_kernels__srcs}) target_link_libraries( - quantized_pybind_kernels_lib - PRIVATE - portable_lib - executorch_core - kernels_util_all_deps + quantized_pybind_kernels_lib PRIVATE portable_lib executorch_core + kernels_util_all_deps ) target_compile_options( quantized_pybind_kernels_lib PUBLIC ${_common_compile_options} @@ -140,13 +137,16 @@ if(NOT CMAKE_GENERATOR STREQUAL "Xcode" endif() add_library(quantized_kernels ${_quantized_kernels__srcs}) -target_link_libraries(quantized_kernels PRIVATE executorch_core kernels_util_all_deps) +target_link_libraries( + quantized_kernels PRIVATE executorch_core kernels_util_all_deps +) target_compile_options(quantized_kernels PUBLIC ${_common_compile_options}) # Build a library for _quantized_kernels_srcs # # quantized_ops_lib: Register quantized ops kernels into Executorch runtime gen_operators_lib( - LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS executorch_core + LIB_NAME "quantized_ops_lib" KERNEL_LIBS quantized_kernels DEPS + executorch_core ) install( diff --git a/schema/CMakeLists.txt b/schema/CMakeLists.txt index f5bb3ff3ca7..e161f6b983c 100644 --- a/schema/CMakeLists.txt +++ b/schema/CMakeLists.txt @@ -11,7 +11,9 @@ # The include directory that will contain the generated schema headers. set(_program_schema__include_dir "${CMAKE_BINARY_DIR}/schema/include") -set(_program_schema__output_dir "${_program_schema__include_dir}/executorch/schema") +set(_program_schema__output_dir + "${_program_schema__include_dir}/executorch/schema" +) # Source root directory for executorch. if(NOT EXECUTORCH_ROOT) set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..) @@ -21,17 +23,14 @@ function(generate_program_schema _schema_srcs _schema_name) set(_schema_outputs) foreach(fbs_file ${_schema_srcs}) string(REGEX REPLACE "[.]fbs$" "_generated.h" generated "${fbs_file}") - list(APPEND _schema_outputs - "${_program_schema__output_dir}/${generated}" - ) + list(APPEND _schema_outputs "${_program_schema__output_dir}/${generated}") endforeach() # Generate the headers from the .fbs files. add_custom_command( OUTPUT ${_schema_outputs} - COMMAND - flatc --cpp --cpp-std c++11 --gen-mutable --scoped-enums -o - "${_program_schema__output_dir}" ${_schema_srcs} + COMMAND flatc --cpp --cpp-std c++11 --gen-mutable --scoped-enums -o + "${_program_schema__output_dir}" ${_schema_srcs} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS flatc ${_schema_srcs} COMMENT "Generating ${_schema_name} headers" @@ -45,7 +44,8 @@ function(generate_program_schema _schema_srcs _schema_name) # and some users need an alignment larger than the default, which is typically # 32. target_compile_definitions( - ${_schema_name} INTERFACE FLATBUFFERS_MAX_ALIGNMENT=${EXECUTORCH_FLATBUFFERS_MAX_ALIGNMENT} + ${_schema_name} + INTERFACE FLATBUFFERS_MAX_ALIGNMENT=${EXECUTORCH_FLATBUFFERS_MAX_ALIGNMENT} ) target_include_directories( From dff96c8c1ee21b41f337fbd430bbaa1bafc57c74 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 16:49:21 -0700 Subject: [PATCH 07/34] Update [ghstack-poisoned] --- tools/cmake/Utils.cmake | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/tools/cmake/Utils.cmake b/tools/cmake/Utils.cmake index 9fbab17728a..732f5ddd1e7 100644 --- a/tools/cmake/Utils.cmake +++ b/tools/cmake/Utils.cmake @@ -100,8 +100,8 @@ function(extract_sources sources_file) execute_process( COMMAND ${PYTHON_EXECUTABLE} ${executorch_root}/tools/cmake/extract_sources.py - --config=${executorch_root}/tools/cmake/cmake_deps.toml --out=${sources_file} - --buck2=${BUCK2} ${target_platforms_arg} + --config=${executorch_root}/tools/cmake/cmake_deps.toml + --out=${sources_file} --buck2=${BUCK2} ${target_platforms_arg} OUTPUT_VARIABLE gen_srcs_output ERROR_VARIABLE gen_srcs_error RESULT_VARIABLE gen_srcs_exit_code @@ -203,8 +203,8 @@ function(resolve_python_executable) ) elseif(DEFINED ENV{VIRTUAL_ENV}) set(PYTHON_EXECUTABLE - $ENV{VIRTUAL_ENV}/bin/python3 - PARENT_SCOPE + $ENV{VIRTUAL_ENV}/bin/python3 + PARENT_SCOPE ) else() set(PYTHON_EXECUTABLE @@ -217,29 +217,29 @@ endfunction() # find_package(Torch CONFIG REQUIRED) replacement for targets that have a # header-only Torch dependency. # -# Unlike find_package(Torch ...), this will only set -# TORCH_INCLUDE_DIRS in the parent scope. In particular, it will NOT -# set any of the following: -# - TORCH_FOUND -# - TORCH_LIBRARY -# - TORCH_CXX_FLAGS +# Unlike find_package(Torch ...), this will only set TORCH_INCLUDE_DIRS in the +# parent scope. In particular, it will NOT set any of the following: - +# TORCH_FOUND - TORCH_LIBRARY - TORCH_CXX_FLAGS function(find_package_torch_headers) # We implement this way rather than using find_package so that - # cross-compilation can still use the host's installed copy of - # torch, since the headers should be fine. + # cross-compilation can still use the host's installed copy of torch, since + # the headers should be fine. get_torch_base_path(TORCH_BASE_PATH) - set(TORCH_INCLUDE_DIRS "${TORCH_BASE_PATH}/include;${TORCH_BASE_PATH}/include/torch/csrc/api/include" PARENT_SCOPE) + set(TORCH_INCLUDE_DIRS + "${TORCH_BASE_PATH}/include;${TORCH_BASE_PATH}/include/torch/csrc/api/include" + PARENT_SCOPE + ) endfunction() -# Return the base path to the installed Torch Python library in -# outVar. +# Return the base path to the installed Torch Python library in outVar. function(get_torch_base_path outVar) if(NOT PYTHON_EXECUTABLE) resolve_python_executable() endif() execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c - "import importlib.util; print(importlib.util.find_spec('torch').submodule_search_locations[0])" + COMMAND + "${PYTHON_EXECUTABLE}" -c + "import importlib.util; print(importlib.util.find_spec('torch').submodule_search_locations[0])" OUTPUT_VARIABLE _tmp_torch_path ERROR_VARIABLE _tmp_torch_path_error RESULT_VARIABLE _tmp_torch_path_result COMMAND_ECHO STDERR @@ -252,7 +252,10 @@ function(get_torch_base_path outVar) message("Output:\n${_tmp_torch_path}") message(FATAL_ERROR "Error:\n${_tmp_torch_path_error}") endif() - set(${outVar} ${_tmp_torch_path} PARENT_SCOPE) + set(${outVar} + ${_tmp_torch_path} + PARENT_SCOPE + ) endfunction() # Add the Torch CMake configuration to CMAKE_PREFIX_PATH so that find_package From 35d8319e582179e81abd6b87cbbc5d240d4a2781 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 16:49:23 -0700 Subject: [PATCH 08/34] Update [ghstack-poisoned] --- CMakeLists.txt | 63 +++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b19bfac61b1..7af62be9565 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,26 +220,8 @@ endif() if(EXECUTORCH_BUILD_PTHREADPOOL) # --- pthreadpool - set(ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG - ${CMAKE_POSITION_INDEPENDENT_CODE} - ) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(PTHREADPOOL_SOURCE_DIR "backends/xnnpack/third-party/pthreadpool") - set(PTHREADPOOL_BUILD_TESTS - OFF - CACHE BOOL "" - ) - set(PTHREADPOOL_BUILD_BENCHMARKS - OFF - CACHE BOOL "" - ) - set(PTHREADPOOL_LIBRARY_TYPE - "static" - CACHE STRING "" - ) - set(PTHREADPOOL_ALLOW_DEPRECATED_API - ON - CACHE BOOL "" + set(PTHREADPOOL_SOURCE_DIR + "${CMAKE_CURRENT_LIST_DIR}/backends/xnnpack/third-party/pthreadpool" ) if(APPLE) set(PTHREADPOOL_SYNC_PRIMITIVE @@ -247,10 +229,40 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) CACHE STRING "" ) endif() - add_subdirectory("${PTHREADPOOL_SOURCE_DIR}") - set(CMAKE_POSITION_INDEPENDENT_CODE - ${ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG} + include(ExternalProject) + set(PTHREADPOOL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pthreadpool") + set(PTHREADPOOL_LIBRARY + "${PTHREADPOOL_BINARY_DIR}/install/lib/libpthreadpool.a" + ) + get_extra_cmake_args_for_external_project(PTHREADPOOL_EXTRA_CMAKE_ARGS) + ExternalProject_Add( + pthreadpoolExternalProject + SOURCE_DIR "${PTHREADPOOL_SOURCE_DIR}" + BINARY_DIR "${PTHREADPOOL_BINARY_DIR}" + INSTALL_DIR "${PTHREADPOOL_BINARY_DIR}/install" + BUILD_BYPRODUCTS "${PTHREADPOOL_LIBRARY}" + CMAKE_ARGS ${PTHREADPOOL_EXTRA_CMAKE_ARGS} + -D + PTHREADPOOL_BUILD_TESTS=OFF + -D + PTHREADPOOL_BUILD_BENCHMARKS=OFF + -D + PTHREADPOOL_LIBRARY_TYPE=static + -D + PTHREADPOOL_ALLOW_DEPRECATED_API=ON + -D + PTHREADPOOL_SYNC_PRIMITVE=${PTHREADPOOL_SYNC_PRIMITIVE} + -D + CMAKE_POSITION_INDEPENDENT_CODE=ON + -D + CMAKE_INSTALL_PREFIX= ) + add_library(pthreadpool STATIC IMPORTED) + set_property( + TARGET pthreadpool PROPERTY IMPORTED_LOCATION "${PTHREADPOOL_LIBRARY}" + ) + add_dependencies(pthreadpool pthreadpoolExternalProject) + install(FILES ${PTHREADPOOL_LIBRARY} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() # TODO(dbort): Fix these warnings and remove this flag. @@ -737,7 +749,10 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER) endif() set(CMAKE_EXECUTABLE_SUFFIX ".html") - target_link_options(executor_runner PUBLIC -sALLOW_MEMORY_GROWTH --embed-file "${WASM_MODEL_DIR}@/") + target_link_options( + executor_runner PUBLIC -sALLOW_MEMORY_GROWTH --embed-file + "${WASM_MODEL_DIR}@/" + ) endif() endif() From a31187e6e31ba38043032e823ad89d036826cadc Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 15 Jul 2025 11:18:57 -0700 Subject: [PATCH 09/34] Update [ghstack-poisoned] --- .github/workflows/build-wheels-linux.yml | 2 ++ .github/workflows/build-wheels-macos.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml index 4c08968f3d6..8509ba52cb9 100644 --- a/.github/workflows/build-wheels-linux.yml +++ b/.github/workflows/build-wheels-linux.yml @@ -9,6 +9,8 @@ on: - examples/**/* - pyproject.toml - setup.py + tags: + - ciflow/binaries/* push: branches: - nightly diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml index 3a394cff64b..055543adae4 100644 --- a/.github/workflows/build-wheels-macos.yml +++ b/.github/workflows/build-wheels-macos.yml @@ -9,6 +9,8 @@ on: - examples/**/* - pyproject.toml - setup.py + tags: + - ciflow/binaries/* push: branches: - nightly From 29d3999c59d1c09550de70e6f1fc08afcef14bf7 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 15 Jul 2025 11:44:16 -0700 Subject: [PATCH 10/34] Update [ghstack-poisoned] --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca4cf4fe84..d244c2007df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,9 +230,12 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) ) endif() include(ExternalProject) + include(GNUInstallDirs) set(PTHREADPOOL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pthreadpool") set(PTHREADPOOL_INSTALL_DIR "${PTHREADPOOL_BINARY_DIR}/install") - set(PTHREADPOOL_LIBRARY "${PTHREADPOOL_INSTALL_DIR}/lib/libpthreadpool.a") + set(PTHREADPOOL_LIBRARY + "${PTHREADPOOL_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libpthreadpool.a" + ) get_extra_cmake_args_for_external_project(PTHREADPOOL_EXTRA_CMAKE_ARGS) ExternalProject_Add( pthreadpoolExternalProject From 7e4040ad287252aa37b78e97550cb1f5261fc833 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 15 Jul 2025 13:43:18 -0700 Subject: [PATCH 11/34] Update [ghstack-poisoned] --- CMakeLists.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d244c2007df..1954363b165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,12 +223,6 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) set(PTHREADPOOL_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/backends/xnnpack/third-party/pthreadpool" ) - if(APPLE) - set(PTHREADPOOL_SYNC_PRIMITIVE - "condvar" - CACHE STRING "" - ) - endif() include(ExternalProject) include(GNUInstallDirs) set(PTHREADPOOL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pthreadpool") @@ -237,6 +231,11 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) "${PTHREADPOOL_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libpthreadpool.a" ) get_extra_cmake_args_for_external_project(PTHREADPOOL_EXTRA_CMAKE_ARGS) + if(APPLE) + list(APPEND PTHREADPOOL_EXTRA_CMAKE_ARGS -D + PTHREADPOOL_SYNC_PRIMITIVE=condvar + ) + endif() ExternalProject_Add( pthreadpoolExternalProject SOURCE_DIR "${PTHREADPOOL_SOURCE_DIR}" @@ -253,8 +252,6 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) -D PTHREADPOOL_ALLOW_DEPRECATED_API=ON -D - PTHREADPOOL_SYNC_PRIMITVE=${PTHREADPOOL_SYNC_PRIMITIVE} - -D CMAKE_POSITION_INDEPENDENT_CODE=ON -D CMAKE_INSTALL_PREFIX= From 2dacf6f06c7b52576bdc9a8bd08b4844d5e7672c Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 15 Jul 2025 13:43:18 -0700 Subject: [PATCH 12/34] Update [ghstack-poisoned] --- CMakeLists.txt | 70 ++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1954363b165..2f665f39e9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,39 +182,49 @@ endif() if(EXECUTORCH_BUILD_CPUINFO) # --- cpuinfo - set(ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG - ${CMAKE_POSITION_INDEPENDENT_CODE} - ) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CPUINFO_SOURCE_DIR "backends/xnnpack/third-party/cpuinfo") - set(CPUINFO_BUILD_TOOLS - OFF - CACHE BOOL "" - ) - set(CPUINFO_BUILD_UNIT_TESTS - OFF - CACHE BOOL "" - ) - set(CPUINFO_BUILD_MOCK_TESTS - OFF - CACHE BOOL "" - ) - set(CPUINFO_BUILD_BENCHMARKS - OFF - CACHE BOOL "" + set(CPUINFO_SOURCE_DIR + "${CMAKE_CURRENT_LIST_DIR}/backends/xnnpack/third-party/cpuinfo" ) - set(CPUINFO_LIBRARY_TYPE - "static" - CACHE STRING "" + set(CPUINFO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/cpuinfo") + set(CPUINFO_INSTALL_DIR "${CPUINFO_BINARY_DIR}/install") + set(CPUINFO_LIBRARY + "${CPUINFO_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libcpuinfo.a" ) - set(CPUINFO_LOG_LEVEL - "error" - CACHE STRING "" + + get_extra_cmake_args_for_external_project(CPUINFO_EXTRA_CMAKE_ARGS) + ExternalProject_Add( + cpuinfoExternalProject + SOURCE_DIR "${CPUINFO_SOURCE_DIR}" + BINARY_DIR "${CPUINFO_BINARY_DIR}" + INSTALL_DIR "${CPUINFO_INSTALL_DIR}" + BUILD_BYPRODUCTS "${CPUINFO_LIBRARY}" + CMAKE_ARGS "${CPUINFO_EXTRA_CMAKE_ARGS}" + -D + CMAKE_POSITION_INDEPENDENT_CODE=ON + -D + CPUINFO_BUILD_TOOLS=OFF + -D + CPUINFO_BUILD_UNIT_TESTS=OFF + -D + CPUINFO_BUILD_MOCK_TESTS=OFF + -D + CPUINFO_BUILD_BENCHMARKS=OFF + -D + CPUINFO_LIBRARY_TYPE=static + -D + CPUINFO_LOG_LEVEL=error + -D + CMAKE_INSTALL_PREFIX= + -D + CLOG_SOURCE_DIR="${CPUINFO_SOURCE_DIR}/deps/clog" ) - set(CLOG_SOURCE_DIR "${CPUINFO_SOURCE_DIR}/deps/clog") - add_subdirectory("${CPUINFO_SOURCE_DIR}") - set(CMAKE_POSITION_INDEPENDENT_CODE - ${ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG} + add_library(cpuinfo STATIC IMPORTED) + set_property(TARGET cpuinfo PROPERTY IMPORTED_LOCATION "${CPUINFO_LIBRARY}") + add_dependencies(cpuinfo cpuinfoExternalProject) + # Trailing slash matters here! "Move everything from the temporary pthreadpool + # install directory to the proper install directory." + install(DIRECTORY "${CPUINFO_INSTALL_DIR}/" + DESTINATION "${CMAKE_INSTALL_PREFIX}" ) endif() From 41bf26432cc09b0b5a3b5c404dc824df9c2ea772 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 14:05:02 -0700 Subject: [PATCH 13/34] Update [ghstack-poisoned] --- devtools/bundled_program/CMakeLists.txt | 33 +++++++++++-------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/devtools/bundled_program/CMakeLists.txt b/devtools/bundled_program/CMakeLists.txt index ee7fb34e37f..b1b227b3528 100644 --- a/devtools/bundled_program/CMakeLists.txt +++ b/devtools/bundled_program/CMakeLists.txt @@ -4,18 +4,20 @@ # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. -set( - _schema_files - bundled_program_schema.fbs - scalar_type.fbs -) +set(_schema_files bundled_program_schema.fbs scalar_type.fbs) set(_schema_outputs) foreach(schema_file ${_schema_files}) - list(APPEND _bundled_program_schema__srcs "${CMAKE_CURRENT_SOURCE_DIR}/schema/${schema_file}") + list(APPEND _bundled_program_schema__srcs + "${CMAKE_CURRENT_SOURCE_DIR}/schema/${schema_file}" + ) string(REGEX REPLACE "[.]fbs$" "_generated.h" generated "${schema_file}") - list(APPEND _schema_outputs "${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/bundled_program/schema/${generated}") + list( + APPEND + _schema_outputs + "${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/bundled_program/schema/${generated}" + ) endforeach() file(MAKE_DIRECTORY ${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/bundled_program) @@ -32,20 +34,13 @@ add_custom_command( ) add_library( - bundled_program - ${_schema_outputs} - ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program.cpp -) -target_link_libraries( - bundled_program - PUBLIC - executorch + bundled_program ${_schema_outputs} + ${CMAKE_CURRENT_SOURCE_DIR}/bundled_program.cpp ) +target_link_libraries(bundled_program PUBLIC executorch) target_include_directories( - bundled_program - PUBLIC - ${DEVTOOLS_INCLUDE_DIR} - ${PROJECT_SOURCE_DIR}/third-party/flatbuffers/include + bundled_program PUBLIC ${DEVTOOLS_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/third-party/flatbuffers/include ) install( From f54a8ce546d8de9923da09ee730673e20344ad6e Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 14:05:06 -0700 Subject: [PATCH 14/34] Update [ghstack-poisoned] --- CMakeLists.txt | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f665f39e9a..f69b6cff67a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,14 +170,30 @@ endif() add_subdirectory(third-party) if(NOT DEFINED FXDIV_SOURCE_DIR) - set(ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG - ${CMAKE_POSITION_INDEPENDENT_CODE} + include(GNUInstallDirs) + get_extra_cmake_args_for_external_project(FXDIV_EXTRA_CMAKE_ARGS) + set(FXDIV_SOURCE_DIR + "${CMAKE_CURRENT_LIST_DIR}/backends/xnnpack/third-party/FXdiv" ) - set(FXDIV_SOURCE_DIR "backends/xnnpack/third-party/FXdiv") - add_subdirectory("${FXDIV_SOURCE_DIR}") - set(CMAKE_POSITION_INDEPENDENT_CODE - ${ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG} + set(FXDIV_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/fxdiv") + set(FXDIV_INSTALL_DIR "${FXDIV_BINARY_DIR}/install") + set(FXDIV_HEADER "${FXDIV_INSTALL_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/fxdiv.h") + ExternalProject_Add( + fxdivExternalProject + SOURCE_DIR "${FXDIV_SOURCE_DIR}" + BINARY_DIR "${FXDIV_BINARY_DIR}" + INSTALL_DIR "${FXDIV_INSTALL_DIR}" + BUILD_BYPRODUCTS "${FXDIV_HEADER}" + CMAKE_ARGS "${FXDIV_EXTRA_CMAKE_ARGS}" + -D + CMAKE_INSTALL_PREFIX= + -D + FXDIV_BUILD_TESTS=OFF + -D + FXDIV_BUILD_BENCHMARKS=OFF ) + add_library(fxdiv INTERFACE IMPORTED) + set_property(TARGET fxdiv PROPERTY IMPORTED_LOCATION "${FXDIV_HEADER}") endif() if(EXECUTORCH_BUILD_CPUINFO) @@ -233,7 +249,6 @@ if(EXECUTORCH_BUILD_PTHREADPOOL) set(PTHREADPOOL_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/backends/xnnpack/third-party/pthreadpool" ) - include(ExternalProject) include(GNUInstallDirs) set(PTHREADPOOL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pthreadpool") set(PTHREADPOOL_INSTALL_DIR "${PTHREADPOOL_BINARY_DIR}/install") From e48e6cc75e25559a7615fa08297b1024c513de11 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 14:05:11 -0700 Subject: [PATCH 15/34] Update [ghstack-poisoned] --- backends/apple/mps/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends/apple/mps/CMakeLists.txt b/backends/apple/mps/CMakeLists.txt index 7822afdef46..f9185bae79b 100644 --- a/backends/apple/mps/CMakeLists.txt +++ b/backends/apple/mps/CMakeLists.txt @@ -66,8 +66,7 @@ find_library(MPS_GRAPH_FRAMEWORK MetalPerformanceShadersGraph) target_link_libraries( mpsdelegate - PRIVATE bundled_program - mps_schema + PRIVATE mps_schema executorch_core ${FOUNDATION_FRAMEWORK} ${METAL_FRAMEWORK} From a2f14ac85633428bc106774eed82c919e5d2f9bd Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 16:49:42 -0700 Subject: [PATCH 16/34] Update [ghstack-poisoned] --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f69b6cff67a..b5627fd46e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,10 @@ endif() if(EXECUTORCH_BUILD_TESTS) include(CTest) +else() + # It looks like some of our third-party deps will try to turn this + # on if it's not explicitly set, leading to confusing behavior. + set(BUILD_TESTING OFF) endif() add_subdirectory(third-party) From 4ac87e35978412a0c29fdf7c249f605892a51b0a Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 17:50:36 -0700 Subject: [PATCH 17/34] Update [ghstack-poisoned] --- CMakePresets.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 8cb7fce482f..069f93374e9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,7 +12,6 @@ "inherits": ["common"], "generator": "Xcode", "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/third-party/ios-cmake/ios.toolchain.cmake", "EXECUTORCH_BUILD_PRESET_FILE": "${sourceDir}/tools/cmake/preset/macos.cmake", "PLATFORM": "MAC_ARM64", "DEPLOYMENT_TARGET": "12.0" @@ -47,7 +46,7 @@ "generator": "Xcode", "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/third-party/ios-cmake/ios.toolchain.cmake", - "EXECUTORCH_BUILD_PRESET_FILE": "${sourceDir}/tools/cmake/preset/ios.cmake", + "EXECUTORCH_BUILD_PREe SET_FILE": "${sourceDir}/tools/cmake/preset/ios.cmake", "PLATFORM": "SIMULATORARM64", "DEPLOYMENT_TARGET": "17.0" }, From 200b7dda5f86e42b41d6878c5448d41c3b97adc8 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 16 Jul 2025 23:38:48 -0700 Subject: [PATCH 18/34] Update [ghstack-poisoned] --- devtools/CMakeLists.txt | 3 ++- devtools/etdump/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devtools/CMakeLists.txt b/devtools/CMakeLists.txt index feae931da6d..85492075b8c 100644 --- a/devtools/CMakeLists.txt +++ b/devtools/CMakeLists.txt @@ -5,8 +5,9 @@ # LICENSE file in the root directory of this source tree. # The include directory that will contain the generated schema headers. +set(DEVTOOLS_INCLUDE_DIR_NO_BUILD_INTERFACE ${CMAKE_BINARY_DIR}/devtools/include) set(DEVTOOLS_INCLUDE_DIR - $ + $ ) add_subdirectory(etdump) diff --git a/devtools/etdump/CMakeLists.txt b/devtools/etdump/CMakeLists.txt index 847ac9914e9..f653f022f6e 100644 --- a/devtools/etdump/CMakeLists.txt +++ b/devtools/etdump/CMakeLists.txt @@ -21,7 +21,7 @@ foreach(schema_file ${_schema_files}) list(APPEND _schema_outputs "${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/etdump/${generated_builder}") endforeach() -file(MAKE_DIRECTORY ${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/etdump) +file(MAKE_DIRECTORY ${DEVTOOLS_INCLUDE_DIR_NO_BUILD_INTERFACE}/executorch/devtools/etdump) add_custom_command( OUTPUT ${_schema_outputs} COMMAND @@ -29,7 +29,7 @@ add_custom_command( # tree instead of under the binary directory, and there's no way to change # that behavior. flatcc_cli -cwr -o - ${DEVTOOLS_INCLUDE_DIR}/executorch/devtools/etdump + ${DEVTOOLS_INCLUDE_DIR_NO_BUILD_INTERFACE}/executorch/devtools/etdump ${_etdump_schema__srcs} DEPENDS flatcc_cli ${_etdump_schema__srcs} COMMENT "Generating etdump headers" From b85ed41c905b2650c2d312c41ae1c3cfabcf7596 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 17 Jul 2025 09:02:56 -0700 Subject: [PATCH 19/34] Update [ghstack-poisoned] --- tools/cmake/executorch-config.cmake | 70 ++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake index ce68a9b8638..823a562d002 100644 --- a/tools/cmake/executorch-config.cmake +++ b/tools/cmake/executorch-config.cmake @@ -25,14 +25,33 @@ cmake_minimum_required(VERSION 3.24) include("${CMAKE_CURRENT_LIST_DIR}/Utils.cmake") -find_package(tokenizers REQUIRED) +find_package(tokenizers) # not REQUIRED because building it is optional set(_root "${CMAKE_CURRENT_LIST_DIR}/../../..") +set(required_lib_list executorch executorch_core portable_kernels) +set(EXECUTORCH_LIBRARIES) set(EXECUTORCH_INCLUDE_DIRS ${_root}/include ${_root}/include/executorch/runtime/core/portable_type/c10 ${_root}/lib ) -set(non_exported_lib_list XNNPACK xnnpack-microkernels-prod kleidiai pthreadpool cpuinfo) +foreach(lib ${required_lib_list}) + set(lib_var "LIB_${lib}") + find_library( + ${lib_var} ${lib} + HINTS "${_root}/lib" + CMAKE_FIND_ROOT_PATH_BOTH + ) + if(NOT ${lib_var}) + set(EXECUTORCH_FOUND OFF) + return() + endif() + list(APPEND EXECUTORCH_LIBRARIES ${lib}) +endforeach() +set(EXECUTORCH_FOUND ON) + +set(non_exported_lib_list XNNPACK xnnpack-microkernels-prod kleidiai + pthreadpool cpuinfo +) foreach(lib ${non_exported_lib_list}) # Name of the variable which stores result of the find_library search set(lib_var "LIB_${lib}") @@ -48,14 +67,51 @@ foreach(lib ${non_exported_lib_list}) else() add_library(${lib} STATIC IMPORTED) set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION "${${lib_var}}") - target_include_directories( - ${lib} - INTERFACE ${EXECUTORCH_INCLUDE_DIRS} - ) + target_include_directories(${lib} INTERFACE ${EXECUTORCH_INCLUDE_DIRS}) list(APPEND EXECUTORCH_LIBRARIES ${lib}) endif() endforeach() include("${CMAKE_CURRENT_LIST_DIR}/ExecuTorchTargets.cmake") -# TODO: does ExecuTorchTargets.cmake set EXECUTORCH_FOUND? +set(optional_lib_list + flatccrt + etdump + bundled_program + extension_data_loader + extension_flat_tensor + coreml_util + coreml_inmemoryfs + coremldelegate + mpsdelegate + neuron_backend + qnn_executorch_backend + portable_ops_lib + custom_ops + extension_module + extension_module_static + extension_runner_util + extension_tensor + extension_threadpool + extension_training + xnnpack_backend + vulkan_backend + optimized_kernels + optimized_portable_kernels + cpublas + eigen_blas + optimized_ops_lib + optimized_native_cpu_ops_lib + quantized_kernels + quantized_ops_lib + quantized_ops_aot_lib +) +foreach(lib ${optional_lib_list}) + if(TARGET ${lib}) + list(APPEND EXECUTORCH_LIBRARIES ${lib}) + else() + message("${lib} library is not found. + If needed rebuild with the proper options in CMakeLists.txt" + ) + endif() +endforeach() From 60456ca8cf2760a45382e90c467841a16f9db953 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 17 Jul 2025 15:30:13 -0700 Subject: [PATCH 20/34] Update [ghstack-poisoned] --- examples/models/llama/CMakeLists.txt | 2 +- examples/models/llava/CMakeLists.txt | 2 +- examples/models/phi-3-mini/CMakeLists.txt | 2 +- extension/android/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/models/llama/CMakeLists.txt b/examples/models/llama/CMakeLists.txt index b850e4e6c0b..e34fb2e20d4 100644 --- a/examples/models/llama/CMakeLists.txt +++ b/examples/models/llama/CMakeLists.txt @@ -78,7 +78,7 @@ find_package(gflags REQUIRED) # # find `executorch` libraries Same as for gflags -set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch) +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED) target_link_options_shared_lib(executorch) diff --git a/examples/models/llava/CMakeLists.txt b/examples/models/llava/CMakeLists.txt index 5edb4e0b386..f720571cdad 100644 --- a/examples/models/llava/CMakeLists.txt +++ b/examples/models/llava/CMakeLists.txt @@ -76,7 +76,7 @@ find_package(gflags REQUIRED) # # find `executorch` libraries Same as for gflags -set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch) +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED) target_link_options_shared_lib(executorch) diff --git a/examples/models/phi-3-mini/CMakeLists.txt b/examples/models/phi-3-mini/CMakeLists.txt index 53aecffa5c3..d3d9d5b91d3 100644 --- a/examples/models/phi-3-mini/CMakeLists.txt +++ b/examples/models/phi-3-mini/CMakeLists.txt @@ -24,7 +24,7 @@ set(EXECUTORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..") set(_common_include_directories ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type/c10 ) -set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch) +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED) target_link_options_shared_lib(executorch) diff --git a/extension/android/CMakeLists.txt b/extension/android/CMakeLists.txt index e890bd653da..dd6805277d3 100644 --- a/extension/android/CMakeLists.txt +++ b/extension/android/CMakeLists.txt @@ -60,7 +60,7 @@ set_target_properties(fbjni PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni/prefab/modules/fbjni/libs/android.${ANDROID_ABI}/libfbjni.so" ) -set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../lib/cmake/ExecuTorch) +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../..) target_link_options_shared_lib(executorch) add_library(executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp) From 9a5096c068071706b160e75dbb43357c4e242530 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 18 Jul 2025 18:06:59 -0700 Subject: [PATCH 21/34] Update [ghstack-poisoned] --- CMakeLists.txt | 15 +++++++++++++++ extension/llm/runner/CMakeLists.txt | 6 ------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ee191eaba3..73f339ce908 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -587,7 +587,22 @@ if(EXECUTORCH_BUILD_EXTENSION_MODULE) endif() if(EXECUTORCH_BUILD_EXTENSION_LLM) + if(EXECUTORCH_BUILD_EXTENSION_LLM_RUNNER) + set(SUPPORT_REGEX_LOOKAHEAD ON) + # llama/runner/CMakeLists.txt builds a shared library libllama_runner.so + # that transitively depends on tokenizers. Need to build tokenizers with + # -fPIC. + set(ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG + ${CMAKE_POSITION_INDEPENDENT_CODE} + ) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + endif() add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/llm/tokenizers) + if(EXECUTORCH_BUILD_EXTENSION_LLM_RUNNER) + set(CMAKE_POSITION_INDEPENDENT_CODE + ${ORIGINAL_CMAKE_POSITION_INDEPENDENT_CODE_FLAG} + ) + endif() endif() if(EXECUTORCH_BUILD_EXTENSION_LLM_RUNNER) diff --git a/extension/llm/runner/CMakeLists.txt b/extension/llm/runner/CMakeLists.txt index 6e1dcdc3b46..c0f3c81a4ea 100644 --- a/extension/llm/runner/CMakeLists.txt +++ b/extension/llm/runner/CMakeLists.txt @@ -39,12 +39,6 @@ list(TRANSFORM _extension_llm_runner__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(extension_llm_runner STATIC ${_extension_llm_runner__srcs}) -# add tokenizers -set(SUPPORT_REGEX_LOOKAHEAD ON) -# llama/runner/CMakeLists.txt builds a shared library libllama_runner.so that -# transitively depends on tokenizers. Need to build tokenizers with -fPIC. -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(runner_deps executorch_core extension_module extension_tensor tokenizers) target_link_libraries(extension_llm_runner PUBLIC ${runner_deps}) From 2e21d9ab48aecb561a98d2446646d26937d324e1 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 18 Jul 2025 20:55:22 -0700 Subject: [PATCH 22/34] Update [ghstack-poisoned] --- .ci/scripts/build_llama_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/build_llama_android.sh b/.ci/scripts/build_llama_android.sh index 1b22051533d..16b7290af81 100644 --- a/.ci/scripts/build_llama_android.sh +++ b/.ci/scripts/build_llama_android.sh @@ -19,7 +19,7 @@ install_executorch_and_backend_lib() { echo "Installing executorch and xnnpack backend" clean_executorch_install_folders mkdir cmake-android-out - ANDROID_NDK=/opt/ndk + ANDROID_NDK=${ANDROID_NDK:-/opt/ndk} BUCK2=buck2 ANDROID_ABI=arm64-v8a cmake --preset llm \ From 0d164ce033324293887a2143024b94e54f9e8f28 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 20 Jul 2025 18:37:17 -0700 Subject: [PATCH 23/34] Update [ghstack-poisoned] --- CMakeLists.txt | 4 ++-- backends/apple/coreml/CMakeLists.txt | 4 ++-- backends/apple/mps/CMakeLists.txt | 2 +- backends/cadence/CMakeLists.txt | 4 ++-- backends/mediatek/CMakeLists.txt | 2 +- backends/openvino/CMakeLists.txt | 2 +- backends/qualcomm/CMakeLists.txt | 2 +- backends/xnnpack/CMakeLists.txt | 2 +- .../kernel-library-custom-aten-kernel.md | 4 ++-- examples/devtools/CMakeLists.txt | 4 ++-- examples/models/llama/CMakeLists.txt | 24 +++++++++---------- examples/models/llava/CMakeLists.txt | 18 +++++++------- examples/models/phi-3-mini/CMakeLists.txt | 2 +- examples/models/yolo12/CMakeLists.txt | 8 +++---- .../qualcomm/oss_scripts/llama/CMakeLists.txt | 4 ++-- examples/selective_build/CMakeLists.txt | 2 +- extension/android/CMakeLists.txt | 12 +++++----- runtime/executor/test/CMakeLists.txt | 2 +- test/CMakeLists.txt | 4 ++-- tools/cmake/Codegen.cmake | 4 ++-- tools/cmake/Utils.cmake | 18 +++++++------- tools/cmake/executorch-config.cmake | 4 ++-- 22 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c48378d2270..8c7d255a5f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -416,7 +416,7 @@ target_link_libraries(executorch PRIVATE executorch_core) target_include_directories(executorch PUBLIC ${_common_include_directories}) target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS) target_compile_options(executorch PUBLIC ${_common_compile_options}) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) # # portable_ops_lib: A library to register core ATen ops using portable kernels, @@ -690,7 +690,7 @@ endif() if(EXECUTORCH_BUILD_KERNELS_QUANTIZED) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/kernels/quantized) - target_link_options_shared_lib(quantized_ops_lib) + executorch_target_link_options_shared_lib(quantized_ops_lib) endif() if(EXECUTORCH_BUILD_EXECUTOR_RUNNER) diff --git a/backends/apple/coreml/CMakeLists.txt b/backends/apple/coreml/CMakeLists.txt index 96684a50dce..d0013fb1a5f 100644 --- a/backends/apple/coreml/CMakeLists.txt +++ b/backends/apple/coreml/CMakeLists.txt @@ -199,7 +199,7 @@ if(APPLE) ${CMAKE_CURRENT_SOURCE_DIR}/third-party/coremltools/deps/protobuf/cmake ) - target_link_options_shared_lib(libprotobuf-lite) + executorch_target_link_options_shared_lib(libprotobuf-lite) target_link_libraries(coremldelegate PRIVATE libprotobuf-lite) endif() @@ -210,7 +210,7 @@ if(APPLE) ${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY} ) - target_link_options_shared_lib(coremldelegate) + executorch_target_link_options_shared_lib(coremldelegate) if(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER) target_link_libraries( diff --git a/backends/apple/mps/CMakeLists.txt b/backends/apple/mps/CMakeLists.txt index 90f75ffdbb9..af18c3dec06 100644 --- a/backends/apple/mps/CMakeLists.txt +++ b/backends/apple/mps/CMakeLists.txt @@ -70,7 +70,7 @@ target_link_libraries( ${MPS_FRAMEWORK} ${MPS_GRAPH_FRAMEWORK} ) -target_link_options_shared_lib(mpsdelegate) +executorch_target_link_options_shared_lib(mpsdelegate) target_compile_options(mpsdelegate PUBLIC ${_common_compile_options}) target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc") diff --git a/backends/cadence/CMakeLists.txt b/backends/cadence/CMakeLists.txt index 17c88af8e11..d541fafe957 100644 --- a/backends/cadence/CMakeLists.txt +++ b/backends/cadence/CMakeLists.txt @@ -35,8 +35,8 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER) # Find prebuilt libraries. executorch package should contain portable_ops_lib, # etdump, bundled_program. find_package(executorch CONFIG REQUIRED) - target_link_options_shared_lib(executorch) - target_link_options_shared_lib(portable_ops_lib) + executorch_target_link_options_shared_lib(executorch) + executorch_target_link_options_shared_lib(portable_ops_lib) target_include_directories(executorch INTERFACE ${_common_include_directories}) diff --git a/backends/mediatek/CMakeLists.txt b/backends/mediatek/CMakeLists.txt index 128faa70cc6..b87dcdd9325 100644 --- a/backends/mediatek/CMakeLists.txt +++ b/backends/mediatek/CMakeLists.txt @@ -40,6 +40,6 @@ target_sources( ${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronExecutor.cpp ${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronBufferAllocator.cpp ) -target_link_options_shared_lib(neuron_backend) +executorch_target_link_options_shared_lib(neuron_backend) install(TARGETS neuron_backend DESTINATION lib) diff --git a/backends/openvino/CMakeLists.txt b/backends/openvino/CMakeLists.txt index 8d07cd9a366..bf5fc3b217e 100644 --- a/backends/openvino/CMakeLists.txt +++ b/backends/openvino/CMakeLists.txt @@ -46,7 +46,7 @@ target_link_libraries(openvino_backend PRIVATE openvino::runtime executorch_core # Add source files for OpenVINO backend target_sources(openvino_backend PRIVATE ${CMAKE_CURRENT_LIST_DIR}/runtime/OpenvinoBackend.cpp) -target_link_options_shared_lib(openvino_backend) +executorch_target_link_options_shared_lib(openvino_backend) if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER) # Build executor runner binary for openvino backend diff --git a/backends/qualcomm/CMakeLists.txt b/backends/qualcomm/CMakeLists.txt index 9f353a50782..0b0836ca744 100644 --- a/backends/qualcomm/CMakeLists.txt +++ b/backends/qualcomm/CMakeLists.txt @@ -209,7 +209,7 @@ target_link_libraries( # # add linker option # -target_link_options_shared_lib(qnn_executorch_backend) +executorch_target_link_options_shared_lib(qnn_executorch_backend) # # add sources diff --git a/backends/xnnpack/CMakeLists.txt b/backends/xnnpack/CMakeLists.txt index b6ba211ecb3..0a5ec815542 100644 --- a/backends/xnnpack/CMakeLists.txt +++ b/backends/xnnpack/CMakeLists.txt @@ -116,7 +116,7 @@ target_include_directories( PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cpuinfo/include ) target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options}) -target_link_options_shared_lib(xnnpack_backend) +executorch_target_link_options_shared_lib(xnnpack_backend) install( TARGETS xnnpack_backend diff --git a/docs/source/kernel-library-custom-aten-kernel.md b/docs/source/kernel-library-custom-aten-kernel.md index 3eca9405aa9..6c54384127d 100644 --- a/docs/source/kernel-library-custom-aten-kernel.md +++ b/docs/source/kernel-library-custom-aten-kernel.md @@ -266,7 +266,7 @@ Link it into ExecuTorch runtime: In our `CMakeLists.txt` that builds the binary/ Here's an example to do it: ```cmake -# For target_link_options_shared_lib +# For executorch_target_link_options_shared_lib include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) # Add a custom op library @@ -282,7 +282,7 @@ target_link_libraries(custom_op_lib PUBLIC executorch) add_executable(custom_op_runner PUBLIC main.cpp) # Link this library with --whole-archive !! IMPORTANT !! this is to avoid the operators being stripped by linker -target_link_options_shared_lib(custom_op_lib) +executorch_target_link_options_shared_lib(custom_op_lib) # Link custom op lib target_link_libraries(custom_op_runner PUBLIC custom_op_lib) diff --git a/examples/devtools/CMakeLists.txt b/examples/devtools/CMakeLists.txt index 74cbf5e78e6..e9aa683f1fe 100644 --- a/examples/devtools/CMakeLists.txt +++ b/examples/devtools/CMakeLists.txt @@ -37,8 +37,8 @@ set(_common_include_directories ${EXECUTORCH_ROOT}/..) # Find prebuilt libraries. executorch package should contain portable_ops_lib, # etdump, bundled_program. find_package(executorch CONFIG REQUIRED) -target_link_options_shared_lib(executorch) -target_link_options_shared_lib(portable_ops_lib) +executorch_target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(portable_ops_lib) target_include_directories(executorch INTERFACE ${_common_include_directories}) diff --git a/examples/models/llama/CMakeLists.txt b/examples/models/llama/CMakeLists.txt index 5f56e111e3d..efa9c8e4009 100644 --- a/examples/models/llama/CMakeLists.txt +++ b/examples/models/llama/CMakeLists.txt @@ -82,7 +82,7 @@ find_package(gflags REQUIRED) # cross-compiling (e.g., to Android) to work as well. list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) # llama_runner library add_subdirectory(runner) @@ -100,18 +100,18 @@ if(TARGET optimized_native_cpu_ops_lib) cpublas eigen_blas ) - target_link_options_shared_lib(optimized_native_cpu_ops_lib) + executorch_target_link_options_shared_lib(optimized_native_cpu_ops_lib) else() list(APPEND link_libraries portable_ops_lib portable_kernels) - target_link_options_shared_lib(portable_ops_lib) + executorch_target_link_options_shared_lib(portable_ops_lib) endif() # quantized_ops_lib: Register quantized op kernels into the runtime -target_link_options_shared_lib(quantized_ops_lib) +executorch_target_link_options_shared_lib(quantized_ops_lib) list(APPEND link_libraries quantized_kernels quantized_ops_lib) if(TARGET custom_ops) - target_link_options_shared_lib(custom_ops) + executorch_target_link_options_shared_lib(custom_ops) list(APPEND link_libraries custom_ops) endif() @@ -126,13 +126,13 @@ if(EXECUTORCH_BUILD_TORCHAO) ${CMAKE_CURRENT_SOURCE_DIR}/../../../third-party/ao/torchao/experimental ${CMAKE_CURRENT_BINARY_DIR}/../../../third-party/ao/torchao/experimental ) - target_link_options_shared_lib(torchao_ops_executorch) + executorch_target_link_options_shared_lib(torchao_ops_executorch) list(APPEND link_libraries torchao_ops_executorch) if(EXECUTORCH_BUILD_MPS) add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/../../../third-party/ao/torchao/experimental/ops/mps ${CMAKE_CURRENT_BINARY_DIR}/../../../third-party/ao/torchao/experimental/ops/mps) - target_link_options_shared_lib(torchao_ops_mps_executorch) + executorch_target_link_options_shared_lib(torchao_ops_mps_executorch) list(APPEND link_libraries torchao_ops_mps_executorch) endif() endif() @@ -162,19 +162,19 @@ if(TARGET xnnpack_backend) list(APPEND xnnpack_backend_libs kleidiai) endif() list(APPEND link_libraries ${xnnpack_backend_libs}) - target_link_options_shared_lib(xnnpack_backend) + executorch_target_link_options_shared_lib(xnnpack_backend) endif() # Vulkan backend if(TARGET vulkan_backend) list(APPEND link_libraries vulkan_backend) - target_link_options_shared_lib(vulkan_backend) + executorch_target_link_options_shared_lib(vulkan_backend) endif() # Qnn backend if(TARGET qnn_executorch_backend) list(APPEND link_libraries qnn_executorch_backend) - target_link_options_shared_lib(qnn_executorch_backend) + executorch_target_link_options_shared_lib(qnn_executorch_backend) endif() # MPS backend @@ -188,7 +188,7 @@ if(TARGET mpsdelegate) "-weak_framework MetalPerformanceShadersGraph" "-weak_framework Metal" ) - target_link_options_shared_lib(mpsdelegate) + executorch_target_link_options_shared_lib(mpsdelegate) endif() if(TARGET coremldelegate) @@ -202,7 +202,7 @@ if(TARGET coremldelegate) "-framework CoreML" "-framework Accelerate" ) - target_link_options_shared_lib(coremldelegate) + executorch_target_link_options_shared_lib(coremldelegate) endif() # This one is needed for cpuinfo where it uses android specific log lib diff --git a/examples/models/llava/CMakeLists.txt b/examples/models/llava/CMakeLists.txt index c988be028d0..500265cbb77 100644 --- a/examples/models/llava/CMakeLists.txt +++ b/examples/models/llava/CMakeLists.txt @@ -78,7 +78,7 @@ find_package(gflags REQUIRED) # find `executorch` libraries Same as for gflags list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) # llava_runner library add_subdirectory(runner) @@ -97,14 +97,14 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED) cpublas eigen_blas ) - target_link_options_shared_lib(optimized_native_cpu_ops_lib) + executorch_target_link_options_shared_lib(optimized_native_cpu_ops_lib) else() list(APPEND link_libraries portable_ops_lib portable_kernels) - target_link_options_shared_lib(portable_ops_lib) + executorch_target_link_options_shared_lib(portable_ops_lib) endif() # quantized_ops_lib: Register quantized op kernels into the runtime -target_link_options_shared_lib(quantized_ops_lib) +executorch_target_link_options_shared_lib(quantized_ops_lib) list(APPEND link_libraries quantized_kernels quantized_ops_lib) if(EXECUTORCH_BUILD_KERNELS_LLM) @@ -135,19 +135,19 @@ if(TARGET xnnpack_backend) list(APPEND xnnpack_backend_libs kleidiai) endif() list(APPEND link_libraries ${xnnpack_backend_libs}) - target_link_options_shared_lib(xnnpack_backend) + executorch_target_link_options_shared_lib(xnnpack_backend) endif() # Vulkan backend if(TARGET vulkan_backend) list(APPEND link_libraries vulkan_backend) - target_link_options_shared_lib(vulkan_backend) + executorch_target_link_options_shared_lib(vulkan_backend) endif() # Qnn backend if(TARGET qnn_executorch_backend) list(APPEND link_libraries qnn_executorch_backend) - target_link_options_shared_lib(qnn_executorch_backend) + executorch_target_link_options_shared_lib(qnn_executorch_backend) endif() # MPS backend @@ -161,7 +161,7 @@ if(TARGET mpsdelegate) "-weak_framework MetalPerformanceShadersGraph" "-weak_framework Metal" ) - target_link_options_shared_lib(mpsdelegate) + executorch_target_link_options_shared_lib(mpsdelegate) endif() if(TARGET coremldelegate) @@ -175,7 +175,7 @@ if(TARGET coremldelegate) "-framework CoreML" "-framework Accelerate" ) - target_link_options_shared_lib(coremldelegate) + executorch_target_link_options_shared_lib(coremldelegate) endif() # This one is needed for cpuinfo where it uses android specific log lib diff --git a/examples/models/phi-3-mini/CMakeLists.txt b/examples/models/phi-3-mini/CMakeLists.txt index 0814476f6f9..930301fdd63 100644 --- a/examples/models/phi-3-mini/CMakeLists.txt +++ b/examples/models/phi-3-mini/CMakeLists.txt @@ -27,7 +27,7 @@ set(_common_include_directories list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) set(BUILD_TESTING OFF) add_subdirectory( diff --git a/examples/models/yolo12/CMakeLists.txt b/examples/models/yolo12/CMakeLists.txt index dd0fcf4f5ef..9c92e5eaeae 100644 --- a/examples/models/yolo12/CMakeLists.txt +++ b/examples/models/yolo12/CMakeLists.txt @@ -30,18 +30,18 @@ set(_common_include_directories ${EXECUTORCH_ROOT}/..) # find `executorch` libraries Same as for gflags find_package(executorch CONFIG REQUIRED PATHS ${EXECUTORCH_ROOT}/cmake-out) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) add_subdirectory(${EXECUTORCH_ROOT}/third-party/gflags gflags) set(link_libraries gflags) list(APPEND link_libraries portable_ops_lib portable_kernels) -target_link_options_shared_lib(portable_ops_lib) +executorch_target_link_options_shared_lib(portable_ops_lib) if(USE_XNNPACK_BACKEND) set(xnnpack_backend_libs xnnpack_backend XNNPACK microkernels-prod) list(APPEND link_libraries ${xnnpack_backend_libs}) - target_link_options_shared_lib(xnnpack_backend) + executorch_target_link_options_shared_lib(xnnpack_backend) endif() if(USE_OPENVINO_BACKEND) @@ -54,7 +54,7 @@ if(USE_OPENVINO_BACKEND) ${CMAKE_CURRENT_BINARY_DIR}/../../lib ) list(APPEND link_libraries openvino_backend) - target_link_options_shared_lib(openvino_backend) + executorch_target_link_options_shared_lib(openvino_backend) endif() list(APPEND link_libraries extension_threadpool pthreadpool) diff --git a/examples/qualcomm/oss_scripts/llama/CMakeLists.txt b/examples/qualcomm/oss_scripts/llama/CMakeLists.txt index dadf51bf298..aee40fd3f18 100644 --- a/examples/qualcomm/oss_scripts/llama/CMakeLists.txt +++ b/examples/qualcomm/oss_scripts/llama/CMakeLists.txt @@ -16,7 +16,7 @@ target_include_directories( custom_ops PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../include" ) target_link_libraries(custom_ops PUBLIC full_portable_ops_lib) -target_link_options_shared_lib(custom_ops) +executorch_target_link_options_shared_lib(custom_ops) # preprocess qnn runner src files for llama set(_llama_runner__srcs ${_llama_runner__srcs}) @@ -55,7 +55,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../../../extension/llm/tokenizers/include ) -target_link_options_shared_lib(quantized_ops_lib) +executorch_target_link_options_shared_lib(quantized_ops_lib) target_link_libraries( qnn_llama_runner diff --git a/examples/selective_build/CMakeLists.txt b/examples/selective_build/CMakeLists.txt index faa3cf568a6..d52ba00f3a4 100644 --- a/examples/selective_build/CMakeLists.txt +++ b/examples/selective_build/CMakeLists.txt @@ -157,5 +157,5 @@ endif() target_link_libraries( selective_build_test PRIVATE executorch_core gflags select_build_lib ) -target_link_options_shared_lib(select_build_lib) +executorch_target_link_options_shared_lib(select_build_lib) target_compile_options(selective_build_test PUBLIC ${_common_compile_options}) diff --git a/extension/android/CMakeLists.txt b/extension/android/CMakeLists.txt index d9d2c982d39..f2b4fe522b0 100644 --- a/extension/android/CMakeLists.txt +++ b/extension/android/CMakeLists.txt @@ -60,7 +60,7 @@ set_target_properties(fbjni PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni/prefab/modules/fbjni/libs/android.${ANDROID_ABI}/libfbjni.so" ) -target_link_options_shared_lib(executorch) +executorch_target_link_options_shared_lib(executorch) add_library(executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp) @@ -94,15 +94,15 @@ if(TARGET optimized_native_cpu_ops_lib) link_libraries optimized_native_cpu_ops_lib ) - target_link_options_shared_lib(optimized_native_cpu_ops_lib) + executorch_target_link_options_shared_lib(optimized_native_cpu_ops_lib) else() list(APPEND link_libraries portable_ops_lib portable_kernels) - target_link_options_shared_lib(portable_ops_lib) + executorch_target_link_options_shared_lib(portable_ops_lib) endif() if(TARGET quantized_kernels) list(APPEND link_libraries quantized_kernels quantized_ops_lib) - target_link_options_shared_lib(quantized_ops_lib) + executorch_target_link_options_shared_lib(quantized_ops_lib) endif() if(TARGET qnn_executorch_backend) @@ -110,12 +110,12 @@ if(TARGET qnn_executorch_backend) endif() if(TARGET xnnpack_backend) - target_link_options_shared_lib(xnnpack_backend) + executorch_target_link_options_shared_lib(xnnpack_backend) list(APPEND link_libraries xnnpack_backend XNNPACK pthreadpool cpuinfo xnnpack-microkernels-prod) endif() if(TARGET vulkan_backend) - target_link_options_shared_lib(vulkan_backend) + executorch_target_link_options_shared_lib(vulkan_backend) list(APPEND link_libraries vulkan_backend) endif() diff --git a/runtime/executor/test/CMakeLists.txt b/runtime/executor/test/CMakeLists.txt index c0b9c6c90c9..da0198975b4 100644 --- a/runtime/executor/test/CMakeLists.txt +++ b/runtime/executor/test/CMakeLists.txt @@ -172,7 +172,7 @@ target_link_libraries( executorch_core ) -target_link_options_shared_lib(test_backend_compiler_lib) +executorch_target_link_options_shared_lib(test_backend_compiler_lib) install( TARGETS test_backend_compiler_lib diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 28f7b110483..797dc4c50e8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -60,7 +60,7 @@ endif() # size_test_all_ops: binary with portable ops and no delegate backend # add_executable(size_test_all_ops ${_size_test__srcs}) -target_link_options_shared_lib(portable_ops_lib) +executorch_target_link_options_shared_lib(portable_ops_lib) target_link_libraries( size_test_all_ops executorch portable_ops_lib portable_kernels ) @@ -73,7 +73,7 @@ endif() # if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED) add_executable(size_test_all_optimized_ops ${_size_test__srcs}) - target_link_options_shared_lib(optimized_native_cpu_ops_lib) + 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 ) diff --git a/tools/cmake/Codegen.cmake b/tools/cmake/Codegen.cmake index 93331c7ed89..f4005b4a696 100644 --- a/tools/cmake/Codegen.cmake +++ b/tools/cmake/Codegen.cmake @@ -195,7 +195,7 @@ function(gen_custom_ops_aot_lib) include_directories(${TORCH_INCLUDE_DIRS}) target_link_libraries(${GEN_LIB_NAME} PRIVATE torch) - target_link_options_shared_lib(${GEN_LIB_NAME}) + executorch_target_link_options_shared_lib(${GEN_LIB_NAME}) if(TARGET portable_lib) target_link_libraries(${GEN_LIB_NAME} PRIVATE portable_lib) else() @@ -279,7 +279,7 @@ function(gen_operators_lib) endif() endif() - target_link_options_shared_lib(${GEN_LIB_NAME}) + executorch_target_link_options_shared_lib(${GEN_LIB_NAME}) set(_generated_headers ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h) if(GEN_DTYPE_SELECTIVE_BUILD) list(APPEND _generated_headers ${_opvariant_h}) diff --git a/tools/cmake/Utils.cmake b/tools/cmake/Utils.cmake index 732f5ddd1e7..b4ce6d3edcb 100644 --- a/tools/cmake/Utils.cmake +++ b/tools/cmake/Utils.cmake @@ -21,7 +21,7 @@ # This is the funtion to use -Wl, --whole-archive to link static library NB: # target_link_options is broken for this case, it only append the interface link # options of the first library. -function(kernel_link_options target_name) +function(executorch_kernel_link_options target_name) # target_link_options(${target_name} INTERFACE # "$") target_link_options( @@ -31,16 +31,16 @@ function(kernel_link_options target_name) ) endfunction() -# Same as kernel_link_options but it's for MacOS linker -function(macos_kernel_link_options target_name) +# Same as executorch_kernel_link_options but it's for MacOS linker +function(executorch_macos_kernel_link_options target_name) target_link_options( ${target_name} INTERFACE "SHELL:LINKER:-force_load,$" ) endfunction() -# Same as kernel_link_options but it's for MSVC linker -function(msvc_kernel_link_options target_name) +# Same as executorch_kernel_link_options but it's for MSVC linker +function(executorch_msvc_kernel_link_options target_name) target_link_options( ${target_name} INTERFACE "SHELL:LINKER:/WHOLEARCHIVE:$" @@ -49,13 +49,13 @@ endfunction() # Ensure that the load-time constructor functions run. By default, the linker # would remove them since there are no other references to them. -function(target_link_options_shared_lib target_name) +function(executorch_target_link_options_shared_lib target_name) if(APPLE) - macos_kernel_link_options(${target_name}) + executorch_macos_kernel_link_options(${target_name}) elseif(MSVC) - msvc_kernel_link_options(${target_name}) + executorch_msvc_kernel_link_options(${target_name}) else() - kernel_link_options(${target_name}) + executorch_kernel_link_options(${target_name}) endif() endfunction() diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake index 6472648786c..c3a0ca0b48f 100644 --- a/tools/cmake/executorch-config.cmake +++ b/tools/cmake/executorch-config.cmake @@ -183,7 +183,7 @@ set(shared_lib_list ) foreach(lib ${shared_lib_list}) if(TARGET ${lib}) - target_link_options_shared_lib(${lib}) + executorch_target_link_options_shared_lib(${lib}) endif() endforeach() @@ -196,5 +196,5 @@ if(TARGET xnnpack_backend) set_target_properties( xnnpack_backend PROPERTIES INTERFACE_LINK_LIBRARIES "${_deps}" ) - target_link_options_shared_lib(xnnpack_backend) + executorch_target_link_options_shared_lib(xnnpack_backend) endif() From 5d1580930e424c64c802c11e4e3d6642a79a0fdd Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 20 Jul 2025 23:03:45 -0700 Subject: [PATCH 24/34] fix unittest, bump size test threshold to account for op registration now showing up in the test [ghstack-poisoned] --- .github/workflows/pull.yml | 4 ++-- backends/vulkan/CMakeLists.txt | 6 +++--- backends/vulkan/cmake/ShaderLibrary.cmake | 4 ++-- backends/vulkan/test/CMakeLists.txt | 6 +++--- backends/vulkan/test/op_tests/CMakeLists.txt | 6 +++--- examples/models/phi-3-mini/CMakeLists.txt | 2 -- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 9e621329049..3ca2eb06d65 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -371,7 +371,7 @@ jobs: size=${arr[4]} # threshold=48120 on devserver with gcc11.4 # todo(lfq): update once binary size is below 50kb. - threshold="55584" + threshold="63776" if [[ "$size" -le "$threshold" ]]; then echo "Success $size <= $threshold" else @@ -406,7 +406,7 @@ jobs: output=$(ls -la cmake-out/test/size_test) arr=($output) size=${arr[4]} - threshold="51728" + threshold="51744" if [[ "$size" -le "$threshold" ]]; then echo "Success $size <= $threshold" else diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt index 58688f2fe6c..da0d6b7145d 100644 --- a/backends/vulkan/CMakeLists.txt +++ b/backends/vulkan/CMakeLists.txt @@ -24,8 +24,8 @@ if(NOT RUNTIME_PATH) set(RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime) endif() -# Include this file to access target_link_options_shared_lib This is required to -# provide access to target_link_options_shared_lib which allows libraries to be +# Include this file to access executorch_target_link_options_shared_lib This is required to +# provide access to executorch_target_link_options_shared_lib which allows libraries to be # linked with the --whole-archive flag. This is required for libraries that # perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) @@ -113,7 +113,7 @@ target_include_directories( target_link_libraries(vulkan_backend PRIVATE vulkan_schema executorch_core) target_compile_options(vulkan_backend PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic backend registration -target_link_options_shared_lib(vulkan_backend) +executorch_target_link_options_shared_lib(vulkan_backend) set_property(TARGET vulkan_backend PROPERTY CXX_STANDARD 17) diff --git a/backends/vulkan/cmake/ShaderLibrary.cmake b/backends/vulkan/cmake/ShaderLibrary.cmake index 9d92de9114e..c06a9d7097c 100644 --- a/backends/vulkan/cmake/ShaderLibrary.cmake +++ b/backends/vulkan/cmake/ShaderLibrary.cmake @@ -81,7 +81,7 @@ function(vulkan_shader_lib library_name generated_spv_cpp) target_link_libraries(${library_name} vulkan_backend) target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic shader registrations - target_link_options_shared_lib(${library_name}) + executorch_target_link_options_shared_lib(${library_name}) endfunction() # Convenience macro to generate a SPIR-V shader library target. Given the path @@ -105,7 +105,7 @@ macro(vulkan_shader_library shaders_path library_name) target_link_libraries(${library_name} vulkan_backend) target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic shader registrations - target_link_options_shared_lib(${library_name}) + executorch_target_link_options_shared_lib(${library_name}) unset(VULKAN_SHADERGEN_ENV) unset(VULKAN_SHADERGEN_OUT_PATH) diff --git a/backends/vulkan/test/CMakeLists.txt b/backends/vulkan/test/CMakeLists.txt index 0b3f22875ad..da25b6e88d1 100644 --- a/backends/vulkan/test/CMakeLists.txt +++ b/backends/vulkan/test/CMakeLists.txt @@ -35,8 +35,8 @@ if(TARGET vulkan_backend) set(PYTHON_EXECUTABLE python3) endif() - # Include this file to access target_link_options_shared_lib This is required - # to provide access to target_link_options_shared_lib which allows libraries + # Include this file to access executorch_target_link_options_shared_lib This is required + # to provide access to executorch_target_link_options_shared_lib which allows libraries # to be linked with the --whole-archive flag. This is required for libraries # that perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) @@ -75,7 +75,7 @@ if(TARGET vulkan_backend) ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_compute_api_test.cpp ) - target_link_options_shared_lib(vulkan_backend) + executorch_target_link_options_shared_lib(vulkan_backend) add_executable( vulkan_compute_api_test ${COMPUTE_API_TEST_CPP} ${TEST_UTILS_CPP} diff --git a/backends/vulkan/test/op_tests/CMakeLists.txt b/backends/vulkan/test/op_tests/CMakeLists.txt index 59baafe3cef..c19e818f63d 100644 --- a/backends/vulkan/test/op_tests/CMakeLists.txt +++ b/backends/vulkan/test/op_tests/CMakeLists.txt @@ -29,8 +29,8 @@ if(NOT EXECUTORCH_ROOT) set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../..) endif() -# Include this file to access target_link_options_shared_lib This is required to -# provide access to target_link_options_shared_lib which allows libraries to be +# Include this file to access executorch_target_link_options_shared_lib This is required to +# provide access to executorch_target_link_options_shared_lib which allows libraries to be # linked with the --whole-archive flag. This is required for libraries that # perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) @@ -66,7 +66,7 @@ set(COMMON_INCLUDES ${TORCH_BASE_PATH}/include/torch/csrc/api/include ) -target_link_options_shared_lib(vulkan_backend) +executorch_target_link_options_shared_lib(vulkan_backend) function(vulkan_op_test test_name test_src) set(extra_deps ${ARGN}) diff --git a/examples/models/phi-3-mini/CMakeLists.txt b/examples/models/phi-3-mini/CMakeLists.txt index 4c7ccbc8d5c..4e55d4f9cb0 100644 --- a/examples/models/phi-3-mini/CMakeLists.txt +++ b/examples/models/phi-3-mini/CMakeLists.txt @@ -27,8 +27,6 @@ set(_common_include_directories list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..) find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH) -executorch_target_link_options_shared_lib(executorch) - set(BUILD_TESTING OFF) if(NOT TARGET extension_llm_runner) message( From 980279b1c53b4e7857743e25e87784a261fec615 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 21 Jul 2025 09:28:05 -0700 Subject: [PATCH 25/34] Update [ghstack-poisoned] --- CMakeLists.txt | 6 ++++++ backends/vulkan/CMakeLists.txt | 22 +++++++++++++--------- test/CMakeLists.txt | 7 +++---- test/build_size_test.sh | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0c246bdc0b..bb145da5836 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -570,6 +570,12 @@ endif() if(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader) + install( + DIRECTORY extension/data_loader/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/extension/data_loader + FILES_MATCHING + PATTERN "*.h" + ) endif() if(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR) diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt index da0d6b7145d..cb1b8a06afd 100644 --- a/backends/vulkan/CMakeLists.txt +++ b/backends/vulkan/CMakeLists.txt @@ -24,10 +24,10 @@ if(NOT RUNTIME_PATH) set(RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime) endif() -# Include this file to access executorch_target_link_options_shared_lib This is required to -# provide access to executorch_target_link_options_shared_lib which allows libraries to be -# linked with the --whole-archive flag. This is required for libraries that -# perform dynamic registration via static initialization. +# Include this file to access executorch_target_link_options_shared_lib This is +# required to provide access to executorch_target_link_options_shared_lib which +# allows libraries to be linked with the --whole-archive flag. This is required +# for libraries that perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) include(cmake/ShaderLibrary.cmake) @@ -40,8 +40,10 @@ set(VULKAN_HEADERS_PATH ${VULKAN_THIRD_PARTY_PATH}/Vulkan-Headers) set(VOLK_PATH ${VULKAN_THIRD_PARTY_PATH}/volk) set(VMA_PATH ${VULKAN_THIRD_PARTY_PATH}/VulkanMemoryAllocator) -set(COMMON_INCLUDES ${EXECUTORCH_ROOT}/.. ${VULKAN_HEADERS_PATH}/include - ${VOLK_PATH} ${VMA_PATH} +set(COMMON_INCLUDES + $ + $ + $ $ ) # Compile settings @@ -96,8 +98,10 @@ add_library(vulkan_schema INTERFACE ${GENERATED_HEADER}) set_target_properties(vulkan_schema PROPERTIES LINKER_LANGUAGE CXX) target_include_directories( - vulkan_schema INTERFACE ${SCHEMA_INCLUDE_DIR} - ${EXECUTORCH_ROOT}/third-party/flatbuffers/include + vulkan_schema + INTERFACE + ${SCHEMA_INCLUDE_DIR} + $ ) # vulkan_backend @@ -134,7 +138,7 @@ endif() # Test targets install( - TARGETS vulkan_backend + TARGETS vulkan_backend vulkan_schema EXPORT ExecuTorchTargets DESTINATION lib INCLUDES diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0e2f94bde19..68a641e9f6f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -26,11 +26,12 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..) include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) # Find prebuilt executorch library -find_package(executorch CONFIG REQUIRED) + +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../) +find_package(executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH) # Let files say "include ". set(_common_include_directories ${EXECUTORCH_ROOT}/..) -target_include_directories(executorch INTERFACE ${_common_include_directories}) # # The `__srcs` lists are defined by including ${EXECUTORCH_SRCS_FILE}. @@ -60,7 +61,6 @@ endif() # size_test_all_ops: binary with portable ops and no delegate backend # 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 ) @@ -73,7 +73,6 @@ endif() # 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 ) diff --git a/test/build_size_test.sh b/test/build_size_test.sh index cccd42431c7..37612b5154c 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" @@ -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} \ @@ -37,7 +38,6 @@ cmake_install_executorch_lib() { test_cmake_size_test() { CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=cmake-out \ -DCMAKE_INSTALL_PREFIX=cmake-out \ ${EXTRA_BUILD_ARGS} \ -Bcmake-out/test test From 5be4b7ba67f3b706cb06b71d46145638c8dc9ce8 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 21 Jul 2025 10:41:46 -0700 Subject: [PATCH 26/34] Update [ghstack-poisoned] --- extension/llm/tokenizers | 2 +- test/build_size_test.sh | 1 + tools/cmake/preset/default.cmake | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extension/llm/tokenizers b/extension/llm/tokenizers index ea8691c6200..93be043017b 160000 --- 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 index baeef5a849e..ab61069cca4 100644 --- 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 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 ) From 719bb4f9f33c5f4ca23fb42563856259877182a3 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 21 Jul 2025 15:32:14 -0700 Subject: [PATCH 27/34] Update [ghstack-poisoned] --- CMakeLists.txt | 23 +++++++++++++-- examples/apple/mps/CMakeLists.txt | 2 ++ examples/apple/mps/test_mps.sh | 2 ++ .../qualcomm/executor_runner/CMakeLists.txt | 10 +++++-- extension/evalue_util/CMakeLists.txt | 29 +++++++++++++++++++ tools/cmake/cmake_deps.toml | 17 +++++++++++ tools/cmake/preset/default.cmake | 17 ++++++++--- 7 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 extension/evalue_util/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c7d255a5f7..9e6e3f1b727 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -548,6 +548,16 @@ if(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader) endif() +if(EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/evalue_util) + install( + DIRECTORY extension/evalue_util/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/extension/evalue_util + FILES_MATCHING + PATTERN "*.h" + ) +endif() + if(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/flat_tensor) endif() @@ -576,6 +586,12 @@ endif() if(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/runner_util) + install( + DIRECTORY extension/runner_util/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/extension/runner_util + FILES_MATCHING + PATTERN "*.h" + ) endif() if(EXECUTORCH_BUILD_EXTENSION_TENSOR) @@ -651,8 +667,7 @@ if(EXECUTORCH_BUILD_PYBIND) # util lib add_library( - util ${CMAKE_CURRENT_SOURCE_DIR}/extension/evalue_util/print_evalue.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/extension/aten_util/aten_bridge.cpp + util ${CMAKE_CURRENT_SOURCE_DIR}/extension/aten_util/aten_bridge.cpp ) target_include_directories( util PUBLIC ${_common_include_directories} ${TORCH_INCLUDE_DIRS} @@ -695,7 +710,9 @@ endif() if(EXECUTORCH_BUILD_EXECUTOR_RUNNER) # Baseline libraries that executor_runner will link against. - set(_executor_runner_libs executorch gflags) + set(_executor_runner_libs executorch extension_evalue_util + extension_runner_util gflags + ) if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED) list(APPEND _executor_runner_libs optimized_native_cpu_ops_lib) diff --git a/examples/apple/mps/CMakeLists.txt b/examples/apple/mps/CMakeLists.txt index 9bad0b4b206..3f61cedec8e 100644 --- a/examples/apple/mps/CMakeLists.txt +++ b/examples/apple/mps/CMakeLists.txt @@ -105,6 +105,8 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$") mps_executor_runner bundled_program executorch + extension_evalue_util + extension_runner_util gflags etdump flatccrt diff --git a/examples/apple/mps/test_mps.sh b/examples/apple/mps/test_mps.sh index 555161dd3f7..bca28628473 100755 --- a/examples/apple/mps/test_mps.sh +++ b/examples/apple/mps/test_mps.sh @@ -19,6 +19,8 @@ cmake_install_executorch_devtools_lib() { -DCMAKE_INSTALL_PREFIX=cmake-out \ -DCMAKE_BUILD_TYPE=Release \ -DEXECUTORCH_BUILD_DEVTOOLS=ON \ + -DEXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL=ON \ + -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \ -DEXECUTORCH_BUILD_MPS=ON \ -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \ -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \ diff --git a/examples/qualcomm/executor_runner/CMakeLists.txt b/examples/qualcomm/executor_runner/CMakeLists.txt index 479d0a248be..1d7f6b718f2 100644 --- a/examples/qualcomm/executor_runner/CMakeLists.txt +++ b/examples/qualcomm/executor_runner/CMakeLists.txt @@ -19,8 +19,14 @@ target_include_directories( qnn_executor_runner PUBLIC ${_common_include_directories} ) target_link_libraries( - qnn_executor_runner qnn_executorch_backend full_portable_ops_lib etdump - flatccrt gflags + qnn_executor_runner + qnn_executorch_backend + extension_evalue_util + extension_runner_util + full_portable_ops_lib + etdump + flatccrt + gflags ) set_target_properties( qnn_executor_runner PROPERTIES LINK_FLAGS "-Wl,-rpath='$ORIGIN'" diff --git a/extension/evalue_util/CMakeLists.txt b/extension/evalue_util/CMakeLists.txt new file mode 100644 index 00000000000..21b89bb2b7b --- /dev/null +++ b/extension/evalue_util/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# All rights reserved. +# +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. + +# Please this file formatted by running: +# ~~~ +# cmake-format -i CMakeLists.txt +# ~~~ +# Source root directory for executorch. +if(NOT EXECUTORCH_ROOT) + set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) +endif() +list(TRANSFORM _extension_evalue_util__srcs PREPEND "${EXECUTORCH_ROOT}/") +add_library(extension_evalue_util ${_extension_evalue_util__srcs}) +target_link_libraries(extension_evalue_util executorch_core) +target_include_directories( + extension_evalue_util PUBLIC ${_common_include_directories} +) +target_compile_options(extension_evalue_util PUBLIC ${_common_compile_options}) + +# Install libraries +install( + TARGETS extension_evalue_util + DESTINATION ${CMAKE_BINARY_DIR}/lib + INCLUDES + DESTINATION ${_common_include_directories} +) diff --git a/tools/cmake/cmake_deps.toml b/tools/cmake/cmake_deps.toml index f29d9257d18..50c37ec431c 100644 --- a/tools/cmake/cmake_deps.toml +++ b/tools/cmake/cmake_deps.toml @@ -198,6 +198,17 @@ deps = [ "executorch_core", ] +[targets.extension_evalue_util] +buck_targets = [ + "//extension/evalue_util:print_evalue", +] +filters = [ + ".cpp$", +] +deps = [ + "executorch_core", +] + [targets.extension_flat_tensor_schema] buck_targets = [ "//extension/flat_tensor/serialize:generated_headers", @@ -340,6 +351,8 @@ excludes = [ deps = [ "executorch", "executorch_core", + "extension_evalue_util", + "extension_runner_util", "extension_threadpool", "kernels_util_all_deps", "portable_kernels", @@ -376,6 +389,8 @@ excludes = [ deps = [ "executorch", "executorch_core", + "extension_evalue_util", + "extension_runner_util", "extension_threadpool", "kernels_util_all_deps", "portable_kernels", @@ -417,6 +432,8 @@ excludes = [ deps = [ "executorch", "executorch_core", + "extension_evalue_util", + "extension_runner_util", "extension_threadpool", "kernels_util_all_deps", "xnnpack_backend", diff --git a/tools/cmake/preset/default.cmake b/tools/cmake/preset/default.cmake index e2bef0113ff..b6626f0a513 100644 --- a/tools/cmake/preset/default.cmake +++ b/tools/cmake/preset/default.cmake @@ -82,10 +82,6 @@ define_overridable_option( define_overridable_option( EXECUTORCH_BUILD_EXTENSION_MODULE "Build the Module extension" BOOL OFF ) -define_overridable_option( - EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL "Build the Runner Util extension" BOOL - OFF -) define_overridable_option( EXECUTORCH_BUILD_EXTENSION_TENSOR "Build the Tensor extension" BOOL OFF ) @@ -177,6 +173,14 @@ define_overridable_option( EXECUTORCH_BUILD_EXECUTOR_RUNNER "Build the executor_runner executable" BOOL ${_default_executorch_build_executor_runner} ) +define_overridable_option( + EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL "Build the EValue util extension" BOOL + ${_default_executorch_build_executor_runner} +) +define_overridable_option( + EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL "Build the Runner Util extension" BOOL + ${_default_executorch_build_executor_runner} +) # NB: Enabling this will serialize execution of delegate instances Keeping this # OFF by default to maintain existing behavior, to be revisited. @@ -213,6 +217,11 @@ check_required_options_on( IF_ON EXECUTORCH_ENABLE_EVENT_TRACER REQUIRES EXECUTORCH_BUILD_DEVTOOLS ) +check_required_options_on( + IF_ON EXECUTORCH_BUILD_EXECUTOR_RUNNER REQUIRES + EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL + EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL +) check_required_options_on( IF_ON EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR REQUIRES EXECUTORCH_BUILD_EXTENSION_DATA_LOADER From a342614665ce5c37ea536247e6020dab39923f4a Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 21 Jul 2025 16:05:17 -0700 Subject: [PATCH 28/34] Update [ghstack-poisoned] --- backends/vulkan/CMakeLists.txt | 10 +++++----- backends/vulkan/cmake/ShaderLibrary.cmake | 4 ++-- backends/vulkan/test/CMakeLists.txt | 6 +++--- backends/vulkan/test/op_tests/CMakeLists.txt | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt index e4fd991858e..68fec49a57a 100644 --- a/backends/vulkan/CMakeLists.txt +++ b/backends/vulkan/CMakeLists.txt @@ -24,10 +24,10 @@ if(NOT RUNTIME_PATH) set(RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime) endif() -# Include this file to access target_link_options_shared_lib This is required to -# provide access to target_link_options_shared_lib which allows libraries to be -# linked with the --whole-archive flag. This is required for libraries that -# perform dynamic registration via static initialization. +# Include this file to access executorch_target_link_options_shared_lib This is +# required to provide access to executorch_target_link_options_shared_lib which +# allows libraries to be linked with the --whole-archive flag. This is required +# for libraries that perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) include(cmake/ShaderLibrary.cmake) @@ -113,7 +113,7 @@ target_include_directories( target_link_libraries(vulkan_backend PRIVATE vulkan_schema executorch_core) target_compile_options(vulkan_backend PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic backend registration -target_link_options_shared_lib(vulkan_backend) +executorch_target_link_options_shared_lib(vulkan_backend) set_property(TARGET vulkan_backend PROPERTY CXX_STANDARD 17) diff --git a/backends/vulkan/cmake/ShaderLibrary.cmake b/backends/vulkan/cmake/ShaderLibrary.cmake index 9d92de9114e..c06a9d7097c 100644 --- a/backends/vulkan/cmake/ShaderLibrary.cmake +++ b/backends/vulkan/cmake/ShaderLibrary.cmake @@ -81,7 +81,7 @@ function(vulkan_shader_lib library_name generated_spv_cpp) target_link_libraries(${library_name} vulkan_backend) target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic shader registrations - target_link_options_shared_lib(${library_name}) + executorch_target_link_options_shared_lib(${library_name}) endfunction() # Convenience macro to generate a SPIR-V shader library target. Given the path @@ -105,7 +105,7 @@ macro(vulkan_shader_library shaders_path library_name) target_link_libraries(${library_name} vulkan_backend) target_compile_options(${library_name} PRIVATE ${VULKAN_CXX_FLAGS}) # Link this library with --whole-archive due to dynamic shader registrations - target_link_options_shared_lib(${library_name}) + executorch_target_link_options_shared_lib(${library_name}) unset(VULKAN_SHADERGEN_ENV) unset(VULKAN_SHADERGEN_OUT_PATH) diff --git a/backends/vulkan/test/CMakeLists.txt b/backends/vulkan/test/CMakeLists.txt index 0b3f22875ad..da25b6e88d1 100644 --- a/backends/vulkan/test/CMakeLists.txt +++ b/backends/vulkan/test/CMakeLists.txt @@ -35,8 +35,8 @@ if(TARGET vulkan_backend) set(PYTHON_EXECUTABLE python3) endif() - # Include this file to access target_link_options_shared_lib This is required - # to provide access to target_link_options_shared_lib which allows libraries + # Include this file to access executorch_target_link_options_shared_lib This is required + # to provide access to executorch_target_link_options_shared_lib which allows libraries # to be linked with the --whole-archive flag. This is required for libraries # that perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) @@ -75,7 +75,7 @@ if(TARGET vulkan_backend) ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_compute_api_test.cpp ) - target_link_options_shared_lib(vulkan_backend) + executorch_target_link_options_shared_lib(vulkan_backend) add_executable( vulkan_compute_api_test ${COMPUTE_API_TEST_CPP} ${TEST_UTILS_CPP} diff --git a/backends/vulkan/test/op_tests/CMakeLists.txt b/backends/vulkan/test/op_tests/CMakeLists.txt index 59baafe3cef..c19e818f63d 100644 --- a/backends/vulkan/test/op_tests/CMakeLists.txt +++ b/backends/vulkan/test/op_tests/CMakeLists.txt @@ -29,8 +29,8 @@ if(NOT EXECUTORCH_ROOT) set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../..) endif() -# Include this file to access target_link_options_shared_lib This is required to -# provide access to target_link_options_shared_lib which allows libraries to be +# Include this file to access executorch_target_link_options_shared_lib This is required to +# provide access to executorch_target_link_options_shared_lib which allows libraries to be # linked with the --whole-archive flag. This is required for libraries that # perform dynamic registration via static initialization. include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake) @@ -66,7 +66,7 @@ set(COMMON_INCLUDES ${TORCH_BASE_PATH}/include/torch/csrc/api/include ) -target_link_options_shared_lib(vulkan_backend) +executorch_target_link_options_shared_lib(vulkan_backend) function(vulkan_op_test test_name test_src) set(extra_deps ${ARGN}) From 9e9373a616a098d220a0ed7582945baa6b878dd1 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 21 Jul 2025 16:59:33 -0700 Subject: [PATCH 29/34] Update [ghstack-poisoned] --- examples/portable/custom_ops/CMakeLists.txt | 3 ++- examples/selective_build/CMakeLists.txt | 20 +++++++++++++------- extension/evalue_util/print_evalue.cpp | 15 +++++++-------- tools/cmake/executorch-config.cmake | 1 + 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/examples/portable/custom_ops/CMakeLists.txt b/examples/portable/custom_ops/CMakeLists.txt index 5a9a9a11fe6..c4a00e47991 100644 --- a/examples/portable/custom_ops/CMakeLists.txt +++ b/examples/portable/custom_ops/CMakeLists.txt @@ -123,7 +123,8 @@ list(TRANSFORM _executor_runner__srcs PREPEND "${EXECUTORCH_ROOT}/") add_executable(custom_ops_executor_runner ${_executor_runner__srcs}) target_link_libraries( - custom_ops_executor_runner custom_ops_lib executorch gflags + custom_ops_executor_runner custom_ops_lib executorch extension_evalue_util + extension_runner_util gflags ) target_compile_options( custom_ops_executor_runner PUBLIC ${_common_compile_options} diff --git a/examples/selective_build/CMakeLists.txt b/examples/selective_build/CMakeLists.txt index d52ba00f3a4..3cc5e759ac4 100644 --- a/examples/selective_build/CMakeLists.txt +++ b/examples/selective_build/CMakeLists.txt @@ -33,7 +33,9 @@ if(NOT CMAKE_CXX_STANDARD) # Can't set to 11 due to executor_runner.cpp make_unique endif() -set(_common_compile_options -Wno-deprecated-declarations -fPIC -ffunction-sections -fdata-sections) +set(_common_compile_options -Wno-deprecated-declarations -fPIC + -ffunction-sections -fdata-sections +) # Let files say "include ". set(_common_include_directories ${EXECUTORCH_ROOT}/..) @@ -43,7 +45,9 @@ find_package( gflags REQUIRED PATHS ${CMAKE_CURRENT_BINARY_DIR}/../../third-party ) -target_include_directories(executorch_core INTERFACE ${_common_include_directories}) +target_include_directories( + executorch_core INTERFACE ${_common_include_directories} +) # ------------------------------ OPTIONS BEGIN ------------------------------- @@ -63,12 +67,13 @@ option(EXECUTORCH_SELECT_ALL_OPS ) # Option to enable parsing ops and dtypes directly from model pte file -option(EXECUTORCH_SELECT_OPS_FROM_MODEL "Enable op selection from pte during build." OFF +option(EXECUTORCH_SELECT_OPS_FROM_MODEL + "Enable op selection from pte during build." OFF ) -# Option to enable dtype selective build. Note: must be using selective build model API. -option(EXECUTORCH_DTYPE_SELECTIVE_BUILD "Enable dtype selective build." OFF -) +# Option to enable dtype selective build. Note: must be using selective build +# model API. +option(EXECUTORCH_DTYPE_SELECTIVE_BUILD "Enable dtype selective build." OFF) # ------------------------------- OPTIONS END -------------------------------- # @@ -155,7 +160,8 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") target_link_options_gc_sections(selective_build_test) endif() target_link_libraries( - selective_build_test PRIVATE executorch_core gflags select_build_lib + selective_build_test PRIVATE executorch_core extension_evalue_util + extension_runner_util gflags select_build_lib ) executorch_target_link_options_shared_lib(select_build_lib) target_compile_options(selective_build_test PUBLIC ${_common_compile_options}) diff --git a/extension/evalue_util/print_evalue.cpp b/extension/evalue_util/print_evalue.cpp index 192b51fee5a..32009011012 100644 --- a/extension/evalue_util/print_evalue.cpp +++ b/extension/evalue_util/print_evalue.cpp @@ -39,8 +39,8 @@ int get_edge_items_xalloc() { /// Returns the number of "edge items" to print at the beginning and end of /// lists when using the provided stream. -long get_stream_edge_items(std::ostream& os) { - long edge_items = os.iword(get_edge_items_xalloc()); +size_t get_stream_edge_items(std::ostream& os) { + size_t edge_items = os.iword(get_edge_items_xalloc()); return edge_items <= 0 ? kDefaultEdgeItems : edge_items; } @@ -78,8 +78,8 @@ void print_scalar_list( executorch::aten::ArrayRef list, bool print_length = true, bool elide_inner_items = true) { - long edge_items = elide_inner_items ? get_stream_edge_items(os) - : std::numeric_limits::max(); + size_t edge_items = elide_inner_items ? get_stream_edge_items(os) + : std::numeric_limits::max(); if (print_length) { os << "(len=" << list.size() << ")"; } @@ -87,12 +87,11 @@ void print_scalar_list( // See if we'll be printing enough elements to cause us to wrap. bool wrapping = false; { - long num_printed_items; + size_t num_printed_items; if (elide_inner_items) { - num_printed_items = - std::min(static_cast(list.size()), edge_items * 2); + num_printed_items = std::min(list.size(), edge_items * 2); } else { - num_printed_items = static_cast(list.size()); + num_printed_items = list.size(); } wrapping = num_printed_items > kItemsPerLine; } diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake index c3a0ca0b48f..5a92dcbf2ec 100644 --- a/tools/cmake/executorch-config.cmake +++ b/tools/cmake/executorch-config.cmake @@ -71,6 +71,7 @@ set(lib_list qnn_executorch_backend portable_ops_lib custom_ops + extension_evalue_util extension_module extension_module_static extension_runner_util From 8627bbbf97edfc3530c2ca729a2041842a6ba5d6 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 22 Jul 2025 09:17:11 -0700 Subject: [PATCH 30/34] Update [ghstack-poisoned] --- .ci/scripts/unittest-linux.sh | 2 +- .ci/scripts/unittest-macos.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/unittest-linux.sh b/.ci/scripts/unittest-linux.sh index d0f107ed338..c6d596eb08a 100755 --- a/.ci/scripts/unittest-linux.sh +++ b/.ci/scripts/unittest-linux.sh @@ -22,7 +22,7 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then # We need the runner to test the built library. PYTHON_EXECUTABLE=python \ - CMAKE_ARGS="-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON" \ + CMAKE_ARGS="-DEXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL=ON -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON" \ .ci/scripts/setup-linux.sh "$@" .ci/scripts/unittest-linux-cmake.sh diff --git a/.ci/scripts/unittest-macos.sh b/.ci/scripts/unittest-macos.sh index 602685117d5..74d1f594207 100755 --- a/.ci/scripts/unittest-macos.sh +++ b/.ci/scripts/unittest-macos.sh @@ -22,7 +22,7 @@ trap 'rm -rfv ${TMP_DIR}' EXIT # Setup MacOS dependencies as there is no Docker support on MacOS atm # We need the runner to test the built library. PYTHON_EXECUTABLE=python \ -CMAKE_ARGS="-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON" \ +CMAKE_ARGS="-DEXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL=ON -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON" \ ${CONDA_RUN} --no-capture-output \ .ci/scripts/setup-macos.sh "$@" From 8af5beb925d4d36b5977f1f2299908f5767569f6 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 22 Jul 2025 10:07:04 -0700 Subject: [PATCH 31/34] Update [ghstack-poisoned] --- examples/portable/custom_ops/test_custom_ops.sh | 2 +- extension/evalue_util/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/portable/custom_ops/test_custom_ops.sh b/examples/portable/custom_ops/test_custom_ops.sh index 5d21d393686..58a7de3a5f2 100644 --- a/examples/portable/custom_ops/test_custom_ops.sh +++ b/examples/portable/custom_ops/test_custom_ops.sh @@ -9,7 +9,7 @@ # EXIR to capture and export a model file. Then use `executor_runner` demo C++ # binary to run the model. -set -e +set -ex # shellcheck source=/dev/null source "$(dirname "${BASH_SOURCE[0]}")/../../../.ci/scripts/utils.sh" diff --git a/extension/evalue_util/CMakeLists.txt b/extension/evalue_util/CMakeLists.txt index 21b89bb2b7b..90546b4abae 100644 --- a/extension/evalue_util/CMakeLists.txt +++ b/extension/evalue_util/CMakeLists.txt @@ -23,6 +23,7 @@ target_compile_options(extension_evalue_util PUBLIC ${_common_compile_options}) # Install libraries install( TARGETS extension_evalue_util + EXPORT ExecuTorchTargets DESTINATION ${CMAKE_BINARY_DIR}/lib INCLUDES DESTINATION ${_common_include_directories} From 783c39d932d18d14bc664496b566ca3215001543 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 22 Jul 2025 21:23:30 -0700 Subject: [PATCH 32/34] Update [ghstack-poisoned] --- extension/data_loader/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extension/data_loader/CMakeLists.txt b/extension/data_loader/CMakeLists.txt index 6779160bcaf..43128087457 100644 --- a/extension/data_loader/CMakeLists.txt +++ b/extension/data_loader/CMakeLists.txt @@ -16,6 +16,14 @@ if(NOT EXECUTORCH_ROOT) set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) endif() +include(CheckIncludeFile) +check_include_file(sys/mman.h ET_HAVE_SYS_MMAN_H) + +if(NOT ET_HAVE_SYS_MMAN_H AND NOT WIN32) + list(REMOVE_ITEM _extension_data_loader__srcs + "extension/data_loader/mmap_data_loader.cpp" + ) +endif() list(TRANSFORM _extension_data_loader__srcs PREPEND "${EXECUTORCH_ROOT}/") add_library(extension_data_loader ${_extension_data_loader__srcs}) target_link_libraries(extension_data_loader executorch_core) From 08d9f80bedf9f9fb65c16198a072c7d275dacafc Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Tue, 22 Jul 2025 21:23:34 -0700 Subject: [PATCH 33/34] Update [ghstack-poisoned] --- test/CMakeLists.txt | 8 +++++--- tools/cmake/cmake_deps.toml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) 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/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 ---------------------------------- From ef42dd025af187e287aa18236461603689b08d57 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Wed, 23 Jul 2025 11:24:48 -0700 Subject: [PATCH 34/34] forgot to restore tokenizers bump. format a CMake file [ghstack-poisoned] --- backends/apple/coreml/CMakeLists.txt | 15 +++++++++------ examples/qualcomm/CMakeLists.txt | 9 --------- extension/llm/tokenizers | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/backends/apple/coreml/CMakeLists.txt b/backends/apple/coreml/CMakeLists.txt index 22cdbcd6817..157a305818b 100644 --- a/backends/apple/coreml/CMakeLists.txt +++ b/backends/apple/coreml/CMakeLists.txt @@ -105,17 +105,17 @@ endif() add_library(coreml_util ${UTIL_SOURCES}) target_include_directories( - coreml_util PUBLIC $ $ + coreml_util + PUBLIC + $ + $ ) if(APPLE) target_link_libraries(coreml_util PRIVATE ${FOUNDATION_FRAMEWORK}) endif() target_compile_options(coreml_util PUBLIC -fPIC) -install( - TARGETS coreml_util - DESTINATION lib -) +install(TARGETS coreml_util DESTINATION lib) install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util @@ -139,7 +139,10 @@ endif() add_library(coreml_inmemoryfs ${INMEMORYFS_SOURCES}) target_include_directories( - coreml_inmemoryfs PUBLIC $ $ + coreml_inmemoryfs + PUBLIC + $ + $ ) if(APPLE) target_link_libraries( diff --git a/examples/qualcomm/CMakeLists.txt b/examples/qualcomm/CMakeLists.txt index 3161d7def37..d33d666b9c0 100644 --- a/examples/qualcomm/CMakeLists.txt +++ b/examples/qualcomm/CMakeLists.txt @@ -59,15 +59,6 @@ gen_operators_lib( target_compile_options( full_portable_ops_lib INTERFACE -DET_EVENT_TRACER_ENABLED ) -# target_include_directories( -# full_portable_ops_lib -# PUBLIC -# ${_common_include_directories} -# ${CMAKE_CURRENT_SOURCE_DIR}/../../extension/llm/tokenizers/include -# ${CMAKE_CURRENT_SOURCE_DIR}/../../extension/llm/tokenizers/third-party/json/single_include -# ${CMAKE_CURRENT_SOURCE_DIR}/../../extension/llm/tokenizers/third-party/llama.cpp-unicode/include -# ${CMAKE_CURRENT_SOURCE_DIR}/../../extension/llm/tokenizers/third-party/llama.cpp-unicode/src -# ) # Let files say "include ". set(_common_include_directories diff --git a/extension/llm/tokenizers b/extension/llm/tokenizers index ea8691c6200..f09feca1584 160000 --- a/extension/llm/tokenizers +++ b/extension/llm/tokenizers @@ -1 +1 @@ -Subproject commit ea8691c6200c702cf28dd2aa2da902e9299b6bb3 +Subproject commit f09feca15849a790c05b3b7855e7c62ce26ba94b