Update

swolchok · swolchok · commit 2e1d1e41c2a3 · 2025-07-20T18:37:23.000-07:00
[ghstack-poisoned]
diff --git a/.ci/scripts/test_llava.sh b/.ci/scripts/test_llava.sh
@@ -38,6 +38,8 @@ EXECUTORCH_COMMON_CMAKE_ARGS="                      \
         -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON      \
         -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
         -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
+        -DEXECUTORCH_BUILD_EXTENSION_LLM=ON \
+        -DEXECUTORCH_BUILD_EXTENSION_LLM_RUNNER=ON \
         -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON      \
         -DEXECUTORCH_BUILD_KERNELS_LLM=ON        \
         -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON     \
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -439,7 +439,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,
@@ -516,7 +516,7 @@ install(
   INCLUDES
   DESTINATION include
 )
-install(FILES tools/cmake/Utils.cmake tools/cmake/executorch-config.cmake
+install(FILES tools/cmake/executorch-config.cmake
         DESTINATION lib/cmake/ExecuTorch
 )
 
@@ -731,7 +731,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
@@ -211,7 +211,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()
 
@@ -222,7 +222,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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ 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
diff --git 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
@@ -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
@@ -116,7 +116,7 @@ target_include_directories(
   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)
+executorch_target_link_options_shared_lib(xnnpack_backend)
 
 move_interface_include_directories_to_build_time_only(XNNPACK)
 install(
diff --git 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
@@ -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
@@ -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
@@ -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/llava/runner/CMakeLists.txt b/examples/models/llava/runner/CMakeLists.txt
@@ -38,6 +38,7 @@ if(NOT TARGET extension_llm_runner)
 endif()
 
 add_library(llava_runner STATIC ${_llava_runner__srcs})
+target_include_directories(llava_runner PRIVATE ${_common_include_directories})
 
 set(llava_runner_deps executorch_core extension_data_loader extension_llm_runner
                       extension_module extension_tensor extension_flat_tensor
diff --git 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)
 if(NOT TARGET extension_llm_runner)
diff --git 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
@@ -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
@@ -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
diff --git a/runtime/executor/test/CMakeLists.txt b/runtime/executor/test/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
diff --git a/tools/cmake/Codegen.cmake b/tools/cmake/Codegen.cmake
diff --git a/tools/cmake/Utils.cmake b/tools/cmake/Utils.cmake
diff --git a/tools/cmake/executorch-config.cmake b/tools/cmake/executorch-config.cmake

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ if(APPLE)`
`211`	`211`	`${CMAKE_CURRENT_SOURCE_DIR}/third-party/coremltools/deps/protobuf/cmake`
`212`	`212`	`)`
`213`	`213`
`214`		`- target_link_options_shared_lib(libprotobuf-lite)`
	`214`	`+ executorch_target_link_options_shared_lib(libprotobuf-lite)`
`215`	`215`	`target_link_libraries(coremldelegate PRIVATE libprotobuf-lite)`
`216`	`216`	`endif()`
`217`	`217`
`@@ -222,7 +222,7 @@ if(APPLE)`
`222`	`222`	`${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY}`
`223`	`223`	`)`
`224`	`224`
`225`		`- target_link_options_shared_lib(coremldelegate)`
	`225`	`+ executorch_target_link_options_shared_lib(coremldelegate)`
`226`	`226`
`227`	`227`	`if(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER)`
`228`	`228`	`target_link_libraries(`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ target_link_libraries(`
`70`	`70`	`${MPS_FRAMEWORK} ${MPS_GRAPH_FRAMEWORK}`
`71`	`71`	`)`
`72`	`72`
`73`		`-target_link_options_shared_lib(mpsdelegate)`
	`73`	`+executorch_target_link_options_shared_lib(mpsdelegate)`
`74`	`74`	`target_compile_options(mpsdelegate PUBLIC ${_common_compile_options})`
`75`	`75`	`target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc")`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ target_sources(`
`40`	`40`	`${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronExecutor.cpp`
`41`	`41`	`${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronBufferAllocator.cpp`
`42`	`42`	`)`
`43`		`-target_link_options_shared_lib(neuron_backend)`
	`43`	`+executorch_target_link_options_shared_lib(neuron_backend)`
`44`	`44`
`45`	`45`	`install(`
`46`	`46`	`TARGETS neuron_backend`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ target_link_libraries(`
`209`	`209`	`#`
`210`	`210`	`# add linker option`
`211`	`211`	`#`
`212`		`-target_link_options_shared_lib(qnn_executorch_backend)`
	`212`	`+executorch_target_link_options_shared_lib(qnn_executorch_backend)`
`213`	`213`
`214`	`214`	`#`
`215`	`215`	`# add sources`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ target_include_directories(`
`116`	`116`	`PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cpuinfo/include`
`117`	`117`	`)`
`118`	`118`	`target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})`
`119`		`-target_link_options_shared_lib(xnnpack_backend)`
	`119`	`+executorch_target_link_options_shared_lib(xnnpack_backend)`
`120`	`120`
`121`	`121`	`move_interface_include_directories_to_build_time_only(XNNPACK)`
`122`	`122`	`install(`