Skip to content

Commit dcd5c44

Browse files
huydhnlarryliu0820
andauthored
Cherry pick #3006 (#3190)
* Fix build-framework-ios CI job (#2996) Summary: As titled. `build_apple_frameworks.sh` is copying all the exported headers out and in #2934 `//executorch/schema:program` is being moved to `exported_deps` and causing `build_apple_frameworks.sh` to not able to copy generated headers `program_generated.h` and `scalar_type_generated.h`. This PR fixes it by moving it back to `deps`. Pull Request resolved: #2996 Reviewed By: kirklandsign Differential Revision: D56028952 Pulled By: larryliu0820 fbshipit-source-id: 2cd4999154877b0ac7b49cd1f54d518cba34b2f2 * 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 * Revert "Fix build-framework-ios CI job (#2996)" This reverts commit e365c5b. --------- Co-authored-by: Mengwei Liu <[email protected]>
1 parent 281134d commit dcd5c44

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CMakeLists.txt

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

530+
# TODO(larryliu): Fix macOS 2 dylibs having 2 sets of static variables issue
531+
if(EXECUTORCH_BUILD_CUSTOM_OPS_AOT AND NOT APPLE)
532+
list(APPEND _dep_libs custom_ops_aot_lib)
533+
endif()
530534
# compile options for pybind
531535

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