Skip to content

Commit 287b2ee

Browse files
larryliu0820pytorchbot
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 (cherry picked from commit 5b7c4ba)
1 parent 281134d commit 287b2ee

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

CMakeLists.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,38 @@ if(EXECUTORCH_BUILD_PYBIND)
527527
find_library(TORCH_PYTHON_LIBRARY torch_python
528528
PATHS "${TORCH_INSTALL_PREFIX}/lib")
529529

530+
set(_dep_libs
531+
${TORCH_PYTHON_LIBRARY}
532+
bundled_program
533+
etdump
534+
executorch
535+
extension_data_loader
536+
portable_ops_lib
537+
util
538+
torch)
539+
540+
if(EXECUTORCH_BUILD_COREML)
541+
list(APPEND _dep_libs coremldelegate)
542+
endif()
543+
544+
if(EXECUTORCH_BUILD_MPS)
545+
list(APPEND _dep_libs mpsdelegate)
546+
endif()
547+
548+
if(EXECUTORCH_BUILD_XNNPACK)
549+
# need to explicitly specify XNNPACK here otherwise uses XNNPACK symbols
550+
# from libtorch_cpu
551+
list(APPEND _dep_libs xnnpack_backend XNNPACK)
552+
endif()
553+
554+
if(EXECUTORCH_BUILD_CUSTOM)
555+
list(APPEND _dep_libs custom_ops)
556+
endif()
557+
558+
# TODO(larryliu): Fix macOS 2 dylibs having 2 sets of static variables issue
559+
if(EXECUTORCH_BUILD_CUSTOM_OPS_AOT AND NOT APPLE)
560+
list(APPEND _dep_libs custom_ops_aot_lib)
561+
endif()
530562
# compile options for pybind
531563

532564
set(_pybind_compile_options -Wno-deprecated-declarations -fPIC -frtti

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)