Update

[ghstack-poisoned]

Author: GregoryComer

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)

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(

backends/apple/coreml/test/tester.py

@@ -21,6 +21,16 @@
 from executorch.exir.backend.partitioner import Partitioner
 
 
+def _create_default_partitioner(
+    minimum_deployment_target: Any = ct.target.iOS15,
+) -> CoreMLPartitioner:
+    return CoreMLPartitioner(
+        compile_specs=CoreMLBackend.generate_compile_specs(
+            minimum_deployment_target=minimum_deployment_target
+        )
+    )
+
+
 def _get_static_int8_linear_qconfig():
     return ct.optimize.torch.quantization.LinearQuantizerConfig(
         global_config=ct.optimize.torch.quantization.ModuleLinearQuantizerConfig(
@@ -43,7 +53,9 @@ def __init__(
     ):
         super().__init__(
             quantizer=quantizer
-            or CoreMLQuantizer(quantization_config or _get_static_int8_linear_qconfig()),
+            or CoreMLQuantizer(
+                quantization_config or _get_static_int8_linear_qconfig()
+            ),
             calibrate=calibrate,
             calibration_samples=calibration_samples,
             is_qat=is_qat,
@@ -58,11 +70,7 @@ def __init__(
     ):
         super().__init__(
             partitioner=partitioner
-            or CoreMLPartitioner(
-                compile_specs=CoreMLBackend.generate_compile_specs(
-                    minimum_deployment_target=minimum_deployment_target
-                )
-            ),
+            or _create_default_partitioner(minimum_deployment_target),
         )
 
 
@@ -74,10 +82,8 @@ def __init__(
         minimum_deployment_target: Optional[Any] = ct.target.iOS15,
     ):
         super().__init__(
-            default_partitioner_cls=lambda: CoreMLPartitioner(
-                compile_specs=CoreMLBackend.generate_compile_specs(
-                    minimum_deployment_target=minimum_deployment_target
-                )
+            default_partitioner_cls=lambda: _create_default_partitioner(
+                minimum_deployment_target
             ),
             partitioners=partitioners,
             edge_compile_config=edge_compile_config,

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")
 

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})
 

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)

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

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

backends/test/suite/flows/xnnpack.py

@@ -38,8 +38,12 @@ def create_quantize_stage() -> Quantize:
             quantization_config=qparams,
         )
 
-    return _create_xnnpack_flow_base("xnnpack_static_int8_per_channel", create_quantize_stage)
+    return _create_xnnpack_flow_base(
+        "xnnpack_static_int8_per_channel", create_quantize_stage
+    )
 
 
 XNNPACK_TEST_FLOW = _create_xnnpack_flow()
-XNNPACK_STATIC_INT8_PER_CHANNEL_TEST_FLOW = _create_xnnpack_static_int8_per_channel_flow()
+XNNPACK_STATIC_INT8_PER_CHANNEL_TEST_FLOW = (
+    _create_xnnpack_static_int8_per_channel_flow()
+)

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)