Skip to content

Commit ba22ffb

Browse files
larryliu0820facebook-github-bot
authored andcommitted
Fix failing CI jobs caused by #2934
Summary: Fix these 3 CI job failures caused by #2934 (D55907752): * Apple / build-frameworks-ios / macos-job * trunk / test-arm-backend-delegation / linux-job * trunk / test-coreml-delegate / macos-job Differential Revision: D55950023
1 parent 564c276 commit ba22ffb

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

backends/apple/coreml/scripts/build_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ cmake --build "$CMAKE_PROTOBUF_BUILD_DIR_PATH" -j9 -t libprotobuf-lite
5959
echo "ExecuTorch: Copying libraries"
6060
mkdir "$LIBRARIES_DIR_PATH"
6161
cp -f "$CMAKE_EXECUTORCH_BUILD_DIR_PATH/libexecutorch.a" "$LIBRARIES_DIR_PATH"
62+
cp -f "$CMAKE_EXECUTORCH_BUILD_DIR_PATH/libexecutorch_no_prim_ops.a" "$LIBRARIES_DIR_PATH"
6263
cp -f "$CMAKE_PROTOBUF_BUILD_DIR_PATH/libprotobuf-lite.a" "$LIBRARIES_DIR_PATH"
6364

6465
#Copy ExecuTorch headers

build/build_apple_frameworks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PORTABLE=OFF
2525
QUANTIZED=OFF
2626
XNNPACK=OFF
2727
HEADERS_PATH="include"
28-
EXECUTORCH_FRAMEWORK="executorch:libexecutorch.a,libextension_apple.a,libextension_data_loader.a,libextension_module.a:$HEADERS_PATH"
28+
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:"
3030
CUSTOM_FRAMEWORK="custom_backend:libcustom_ops.a,libcustom_ops_lib.a:"
3131
MPS_FRAMEWORK="mps_backend:libmpsdelegate.a:"

examples/apple/coreml/scripts/build_executor_runner.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ cp -rf "$COREML_DIR_PATH/runtime/include/" "$INCLUDE_DIR_PATH"
6161
echo "ExecuTorch: Copying libraries"
6262
mkdir "$LIBRARIES_DIR_PATH"
6363
find "$CMAKE_BUILD_DIR_PATH/" -name 'libexecutorch.a' -exec cp -f "{}" "$LIBRARIES_DIR_PATH" \;
64+
find "$CMAKE_BUILD_DIR_PATH/" -name 'libexecutorch_no_prim_ops.a' -exec cp -f "{}" "$LIBRARIES_DIR_PATH" \;
6465
find "$CMAKE_BUILD_DIR_PATH/" -name 'libetdump.a' -exec cp -f "{}" "$LIBRARIES_DIR_PATH" \;
6566
find "$CMAKE_BUILD_DIR_PATH/" -name 'libcoremldelegate.a' -exec cp -f "{}" "$LIBRARIES_DIR_PATH" \;
6667
find "$CMAKE_BUILD_DIR_PATH/" -name 'libprotobuf-lite.a' -exec cp -f "{}" "$LIBRARIES_DIR_PATH" \;

examples/arm/executor_runner/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ add_library(executorch STATIC IMPORTED)
4343
set_property(TARGET executorch PROPERTY IMPORTED_LOCATION
4444
"${ET_BUILD_DIR_PATH}/libexecutorch.a")
4545

46+
add_library(executorch_no_prim_ops STATIC IMPORTED)
47+
set_property(TARGET executorch_no_prim_ops PROPERTY IMPORTED_LOCATION
48+
"${ET_BUILD_DIR_PATH}/libexecutorch_no_prim_ops.a")
49+
target_link_libraries(executorch INTERFACE executorch_no_prim_ops)
50+
4651
add_library(executorch_delegate_ethos_u STATIC IMPORTED)
4752
set_property(TARGET executorch_delegate_ethos_u PROPERTY IMPORTED_LOCATION
4853
"${ET_BUILD_DIR_PATH}/backends/arm/libexecutorch_delegate_ethos_u.a")

0 commit comments

Comments
 (0)