Skip to content

Cherry pick #3006 #3190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huydhn merged 3 commits into from
Apr 22, 2024
Merged

Cherry pick #3006 #3190

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e365c5b
Fix build-framework-ios CI job (#2996)
larryliu0820 Apr 11, 2024
4120df4
Fix 3 CI jobs (#3006)
larryliu0820 Apr 12, 2024
c75f7c7
Revert "Fix build-framework-ios CI job (#2996)"
huydhn Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,10 @@ if(EXECUTORCH_BUILD_PYBIND)
find_library(TORCH_PYTHON_LIBRARY torch_python
PATHS "${TORCH_INSTALL_PREFIX}/lib")

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

set(_pybind_compile_options -Wno-deprecated-declarations -fPIC -frtti
Expand Down
2 changes: 1 addition & 1 deletion build/build_apple_frameworks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ XNNPACK=OFF
HEADERS_PATH="include"
EXECUTORCH_FRAMEWORK="executorch:libexecutorch.a,libexecutorch_no_prim_ops.a,libextension_apple.a,libextension_data_loader.a,libextension_module.a:$HEADERS_PATH"
COREML_FRAMEWORK="coreml_backend:libcoremldelegate.a:"
CUSTOM_FRAMEWORK="custom_backend:libcustom_ops.a,libcustom_ops_lib.a:"
CUSTOM_FRAMEWORK="custom_backend:libcustom_ops.a:"
MPS_FRAMEWORK="mps_backend:libmpsdelegate.a:"
OPTIMIZED_FRAMEWORK="optimized_backend:liboptimized_kernels.a,liboptimized_ops_lib.a:"
PORTABLE_FRAMEWORK="portable_backend:libportable_kernels.a,libportable_ops_lib.a:"
Expand Down
2 changes: 2 additions & 0 deletions runtime/executor/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def define_common_targets():
"//executorch/runtime/kernel:operator_registry",
"//executorch/runtime/platform:platform",
"//executorch/schema:extended_header",
],
deps = [
"//executorch/schema:program",
],
visibility = [
Expand Down