Skip to content

Commit bf4f0a3

Browse files
authored
Clean up apparently-unnecessary mentions of BUCK2 in scripts (#13394)
We no longer require buck2 in the top-level ExecuTorch build as of previous PRs in this stack.
1 parent bba378c commit bf4f0a3

File tree

11 files changed

+11
-26
lines changed

11 files changed

+11
-26
lines changed

.ci/scripts/utils.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ build_executorch_runner_cmake() {
131131
else
132132
CXXFLAGS=""
133133
fi
134-
# This command uses buck2 to gather source files and buck2 could crash flakily
135-
# on MacOS
136134
CXXFLAGS="$CXXFLAGS" retry cmake -DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" -DCMAKE_BUILD_TYPE="${1:-Release}" ..
137135
popd || return
138136

backends/cadence/build_cadence_fusionG3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if $STEPWISE_BUILD; then
3636
-Bcmake-out .
3737

3838
echo "Building any Cadence-specific binaries on top"
39-
CXXFLAGS="-fno-exceptions -fno-rtti" cmake -DBUCK2="$BUCK" \
39+
CXXFLAGS="-fno-exceptions -fno-rtti" cmake \
4040
-DCMAKE_TOOLCHAIN_FILE=/home/zonglinpeng/ws/zonglinpeng/executorch/backends/cadence/cadence.cmake \
4141
-DCMAKE_INSTALL_PREFIX=cmake-out \
4242
-DCMAKE_BUILD_TYPE=Release \
@@ -57,7 +57,7 @@ if $STEPWISE_BUILD; then
5757
else
5858
echo "Building Cadence toolchain with ExecuTorch packages"
5959
cmake_prefix_path="${PWD}/cmake-out/lib/cmake/ExecuTorch;${PWD}/cmake-out/third-party/gflags"
60-
CXXFLAGS="-fno-exceptions -fno-rtti" cmake -DBUCK2="$BUCK" \
60+
CXXFLAGS="-fno-exceptions -fno-rtti" cmake \
6161
-DCMAKE_PREFIX_PATH="${cmake_prefix_path}" \
6262
-DHAVE_SYS_STAT_H=ON \
6363
-DCMAKE_TOOLCHAIN_FILE=./backends/cadence/cadence.cmake \

backends/cadence/build_cadence_hifi4.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if $STEPWISE_BUILD; then
3535
-Bcmake-out .
3636

3737
echo "Building any Cadence-specific binaries on top"
38-
CXXFLAGS="-fno-exceptions -fno-rtti" cmake -DBUCK2="$BUCK" \
38+
CXXFLAGS="-fno-exceptions -fno-rtti" cmake \
3939
-DCMAKE_TOOLCHAIN_FILE=./backends/cadence/cadence.cmake \
4040
-DCMAKE_INSTALL_PREFIX=cmake-out \
4141
-DCMAKE_BUILD_TYPE=Release \
@@ -56,7 +56,7 @@ if $STEPWISE_BUILD; then
5656
else
5757
echo "Building Cadence toolchain with ExecuTorch packages"
5858
cmake_prefix_path="${PWD}/cmake-out/lib/cmake/ExecuTorch;${PWD}/cmake-out/third-party/gflags"
59-
CXXFLAGS="-fno-exceptions -fno-rtti" cmake -DBUCK2="$BUCK" \
59+
CXXFLAGS="-fno-exceptions -fno-rtti" cmake \
6060
-DCMAKE_PREFIX_PATH="${cmake_prefix_path}" \
6161
-DCMAKE_TOOLCHAIN_FILE=./backends/cadence/cadence.cmake \
6262
-DCMAKE_INSTALL_PREFIX=cmake-out \

examples/apple/mps/scripts/build_mps_executor_runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ done
3838

3939
rm -rf "$OUTPUT"
4040

41-
cmake -DBUCK2="$BUCK" \
41+
cmake \
4242
-DCMAKE_INSTALL_PREFIX=cmake-out \
4343
-DCMAKE_BUILD_TYPE="$MODE" \
4444
-DEXECUTORCH_BUILD_DEVTOOLS=ON \

examples/apple/mps/test_mps.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_install_executorch_devtools_lib() {
1515
echo "Installing libexecutorch.a, libportable_kernels.a, libetdump.a, libbundled_program.a"
1616
rm -rf cmake-out
1717

18-
retry cmake -DBUCK2="$BUCK" \
18+
retry cmake \
1919
-DCMAKE_INSTALL_PREFIX=cmake-out \
2020
-DCMAKE_BUILD_TYPE=Release \
2121
-DEXECUTORCH_BUILD_DEVTOOLS=ON \
@@ -56,11 +56,5 @@ then
5656
PYTHON_EXECUTABLE=python3
5757
fi
5858

59-
if [[ -z $BUCK ]];
60-
then
61-
BUCK=buck2
62-
fi
63-
64-
6559
cmake_install_executorch_devtools_lib
6660
test_cmake_mps

examples/demo-apps/android/LlamaDemo/docs/delegates/mediatek_README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ zstd -cdq "<downloaded_buck2_file>.zst" > "<path_to_store_buck2>/buck2" && chmod
5454

5555
### Set Environment Variables
5656
```
57-
export BUCK2=path_to_buck/buck2 # Download BUCK2 and create BUCK2 executable
5857
export ANDROID_NDK=path_to_android_ndk
5958
export NEURON_BUFFER_ALLOCATOR_LIB=path_to_buffer_allocator/libneuron_buffer_allocator.so
6059
export NEURON_USDK_ADAPTER_LIB=path_to_usdk_adapter/libneuronusdk_adapter.mtk.so

examples/demo-apps/apple_ios/LLaMA/docs/delegates/xnnpack_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Go to Project Navigator, click on LLaMA. `Project --> LLaMA --> Package Dependen
127127

128128
Note: You should only use this step if the prebuilt package doesn't work for your usecase (For example, you require the latest PRs from main, where there are no pre-built package yet)
129129

130-
If you need to manually build the package, run the following command in your terminal
130+
If you need to manually build the package, run the following command in your terminal:
131131
```
132132
# Install a compatible version of Buck2
133133
BUCK2_RELEASE_DATE="2024-12-16"

examples/qualcomm/test_qualcomm.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cmake_install_executorch_qnn_lib() {
1515
echo "Installing libexecutorch.a, libqnn_executorch_backend.a"
1616
rm -rf cmake-out
1717

18-
retry cmake -DBUCK2="$BUCK" \
18+
retry cmake \
1919
-DCMAKE_INSTALL_PREFIX=cmake-out \
2020
-DCMAKE_BUILD_TYPE=Release \
2121
-DEXECUTORCH_BUILD_QNN=ON \
@@ -55,11 +55,5 @@ then
5555
PYTHON_EXECUTABLE=python3
5656
fi
5757

58-
if [[ -z $BUCK ]];
59-
then
60-
BUCK=buck2
61-
fi
62-
63-
6458
cmake_install_executorch_qnn_lib
6559
test_cmake_qualcomm

extension/llm/export/quantizer_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def check_embedding_byte_registered():
108108
"Need to specify shared library path to register quantized ops (and their out variants) into EXIR.\n"
109109
"Follow the following steps to build the needed lib via cmake.\n"
110110
"Then from root executorch dir do the following:\n"
111-
"rm -rf cmake-out && mkdir cmake-out && (cd cmake-out && cmake -DBUCK2=<path-to-buck2> -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON ..) && cmake --build . -j16\n"
111+
"rm -rf cmake-out && mkdir cmake-out && (cd cmake-out && cmake -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON ..) && cmake --build . -j16\n"
112112
'To find the location of the lib: find cmake-out -name "libquantized_ops_aot_lib*"\n'
113113
"Then specify the said library via -s <path to libquantized_ops_aot_lib.so\n"
114114
)

test/build_optimized_size_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cmake_install_executorch_lib() {
2121
echo "Installing libexecutorch.a"
2222
clean_executorch_install_folders
2323
update_tokenizers_git_submodule
24-
CXXFLAGS="-g" retry cmake -DBUCK2="$BUCK2" \
24+
CXXFLAGS="-g" retry cmake \
2525
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
2626
-DCMAKE_INSTALL_PREFIX=cmake-out \
2727
-DCMAKE_BUILD_TYPE=MinSizeRel \

0 commit comments

Comments
 (0)