Skip to content

Commit 5b7c4ba

Browse files
larryliu0820facebook-github-bot
authored andcommitted
Fix 3 CI jobs (#3006)
Summary: * Apple / build-frameworks-ios / macos-job We removed libcustom_ops_lib.a in #2916 so need to remove it from `build_apple_frameworks.sh`. * Lint / lintrunner / linux-job Remove extra line in backends/qualcomm/quantizer/utils.py * pull / unittest / macos (buck2) / macos-job Fix it by using `executorch_no_prim_ops` instead of `executorch` in MPS and CoreML. Pull Request resolved: #3006 Reviewed By: lucylq Differential Revision: D56048430 Pulled By: larryliu0820 fbshipit-source-id: 9dcb476eea446ea3aba566d595167c691fb00eec
1 parent 6acc86f commit 5b7c4ba

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ if(EXECUTORCH_BUILD_PYBIND)
562562
list(APPEND _dep_libs custom_ops)
563563
endif()
564564

565-
if(EXECUTORCH_BUILD_CUSTOM_OPS_AOT)
565+
# TODO(larryliu): Fix macOS 2 dylibs having 2 sets of static variables issue
566+
if(EXECUTORCH_BUILD_CUSTOM_OPS_AOT AND NOT APPLE)
566567
list(APPEND _dep_libs custom_ops_aot_lib)
567568
endif()
568569
# compile options for pybind

backends/apple/coreml/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ target_include_directories(
144144
)
145145
target_link_libraries(
146146
coremldelegate PRIVATE
147-
executorch
147+
executorch_no_prim_ops
148148
)
149149

150150
if(EXECUTORCH_BUILD_SDK)
@@ -174,7 +174,7 @@ find_library(SQLITE_LIBRARY sqlite3)
174174

175175
target_link_libraries(coremldelegate
176176
PRIVATE
177-
executorch
177+
executorch_no_prim_ops
178178
${ACCELERATE_FRAMEWORK}
179179
${COREML_FRAMEWORK}
180180
${FOUNDATION_FRAMEWORK}
@@ -185,7 +185,7 @@ target_compile_options(coremldelegate PRIVATE "-fobjc-arc")
185185
target_compile_options(coremldelegate PRIVATE "-fno-exceptions")
186186

187187
if(EXECUTORCH_BUILD_SDK)
188-
target_compile_options(executorch PUBLIC -DET_EVENT_TRACER_ENABLED)
188+
target_compile_options(executorch_no_prim_ops PUBLIC -DET_EVENT_TRACER_ENABLED)
189189
target_compile_options(coremldelegate PRIVATE "-frtti")
190190
target_compile_options(libprotobuf-lite PRIVATE "-frtti")
191191
else()

backends/apple/mps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ target_link_libraries(mpsdelegate
7070
PRIVATE
7171
bundled_program
7272
mps_schema
73-
${_executor_runner_libs}
73+
executorch_no_prim_ops
7474
${FOUNDATION_FRAMEWORK}
7575
${METAL_FRAMEWORK}
7676
${MPS_FRAMEWORK}

backends/qualcomm/quantizer/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def decorator(annotator: Callable):
4242

4343
return decorator
4444

45+
4546
def _is_input_float_tensor(node: Node):
4647
"""Check if the input is not a float tensor, so that we can skip quantization for the node
4748
since observers only works with float Tensors

build/build_apple_frameworks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ XNNPACK=OFF
2727
HEADERS_PATH="include"
2828
EXECUTORCH_FRAMEWORK="executorch:libexecutorch.a,libexecutorch_no_prim_ops.a,libextension_apple.a,libextension_data_loader.a,libextension_module.a:$HEADERS_PATH"
2929
COREML_FRAMEWORK="coreml_backend:libcoremldelegate.a:"
30-
CUSTOM_FRAMEWORK="custom_backend:libcustom_ops.a,libcustom_ops_lib.a:"
30+
CUSTOM_FRAMEWORK="custom_backend:libcustom_ops.a:"
3131
MPS_FRAMEWORK="mps_backend:libmpsdelegate.a:"
3232
OPTIMIZED_FRAMEWORK="optimized_backend:liboptimized_kernels.a,liboptimized_ops_lib.a:"
3333
PORTABLE_FRAMEWORK="portable_backend:libportable_kernels.a,libportable_ops_lib.a:"

0 commit comments

Comments
 (0)