Skip to content

Commit 4a89327

Browse files
authored
Remove EXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT (#10860)
### Summary I forgot to do this in #10855. But since we build flatcc for the host now, we don't need this variable. ### Test plan CI ``` $ rg EXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT --hidden -g '!.git/' ``` cc @larryliu0820
1 parent b20419d commit 4a89327

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

.ci/scripts/build-qnn-sdk.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ set_up_aot() {
3939
-DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
4040
-DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
4141
-DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
42-
-DPYTHON_EXECUTABLE=python3 \
43-
-DEXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT=OFF
42+
-DPYTHON_EXECUTABLE=python3
4443
cmake --build $PWD --target "PyQnnManagerAdaptor" "PyQnnWrapperAdaptor" -j$(nproc)
4544
# install Python APIs to correct import path
4645
# The filename might vary depending on your Python and host version.

backends/arm/scripts/build_executorch.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ if [ "$build_with_etdump" = true ] ; then
8282
-DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \
8383
-DEXECUTORCH_BUILD_DEVTOOLS=ON \
8484
-DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
85-
-DEXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT=ON \
8685
-DFLATCC_ALLOW_WERROR=OFF \
8786
-B"${et_build_host_dir}" \
8887
"${et_root_dir}"
@@ -111,7 +110,6 @@ if [ "$build_with_etdump" = true ] ; then
111110
# Add DevTools flags use in the Target build below
112111
build_with_etdump_flags="-DEXECUTORCH_BUILD_DEVTOOLS=ON \
113112
-DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
114-
-DEXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT=OFF \
115113
-DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=OFF \
116114
-DFLATCC_ALLOW_WERROR=OFF \
117115
-DFLATCC_EXECUTABLE=${et_build_host_dir}/bin/flatcc "

docs/source/backends-qualcomm.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ cmake .. \
143143
-DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
144144
-DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
145145
-DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
146-
-DPYTHON_EXECUTABLE=python3 \
147-
-DEXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT=OFF
146+
-DPYTHON_EXECUTABLE=python3
148147

149148
# nproc is used to detect the number of available CPU.
150149
# If it is not applicable, please feel free to use the number you want.

setup.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,6 @@ def run(self): # noqa C901
714714
"-DEXECUTORCH_ENABLE_LOGGING=ON",
715715
"-DEXECUTORCH_LOG_LEVEL=Info",
716716
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15",
717-
# The separate host project is only required when cross-compiling,
718-
# and it can cause build race conditions (libflatcc.a errors) when
719-
# enabled. TODO(dbort): Remove this override once this option is
720-
# managed by cmake itself.
721-
"-DEXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT=OFF",
722717
"-DEXECUTORCH_BUILD_TESTS=ON",
723718
]
724719

0 commit comments

Comments
 (0)