Skip to content

Commit 33aaf83

Browse files
authored
Revert "Avoid duplicate ops registration in macOS executor_runner (#19804)"
This reverts commit f2252a6.
1 parent 1076894 commit 33aaf83

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

backends/apple/coreml/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ if(APPLE)
230230

231231
executorch_target_link_options_shared_lib(coremldelegate)
232232

233+
if(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER)
234+
target_link_libraries(
235+
coremldelegate PRIVATE portable_ops_lib portable_kernels
236+
)
237+
endif()
238+
233239
target_compile_options(
234240
coremldelegate PRIVATE -fobjc-arc -fno-exceptions -x objective-c++
235241
-Wno-null-character -Wno-receiver-expr

tools/cmake/preset/default.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ define_overridable_option(
194194
define_overridable_option(
195195
EXECUTORCH_BUILD_VGF "Build the Arm VGF backend" BOOL OFF
196196
)
197+
define_overridable_option(
198+
EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER "Build CoreML executor runner." BOOL
199+
OFF
200+
)
197201
define_overridable_option(
198202
EXECUTORCH_BUILD_WASM "Build the ExecuTorch JavaScript API" BOOL OFF
199203
)

tools/cmake/preset/macos.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ include(${PROJECT_SOURCE_DIR}/tools/cmake/preset/apple_common.cmake)
99
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_EVALUE_UTIL ON)
1010
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL ON)
1111
set_overridable_option(EXECUTORCH_BUILD_EXECUTOR_RUNNER ON)
12+
set_overridable_option(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER ON)

0 commit comments

Comments
 (0)