Skip to content

Commit a1e9c7a

Browse files
robellfacebook-github-bot
authored andcommitted
remove old buck2 setup code (#3870)
Summary: now fetching the tool is part of the buildsystem proper, we can just expunge references to buck2. Only bit I couldn't fully test is the github workflow which will happen in CI now. Pull Request resolved: #3870 Reviewed By: kirklandsign Differential Revision: D58368002 Pulled By: digantdesai fbshipit-source-id: 7e37e70f68c688ec0ae55e1b95443d1fba7ee9c5
1 parent 1547bcf commit a1e9c7a

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

.github/workflows/trunk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
sudo sysctl fs.inotify.max_user_watches=1048576 # 1024 * 1024
153153
154154
# Test ethos-u delegate examples with run.sh
155-
PYTHON_EXECUTABLE=python bash examples/arm/run.sh examples/arm/ethos-u-scratch/ buck2
155+
PYTHON_EXECUTABLE=python bash examples/arm/run.sh examples/arm/ethos-u-scratch/
156156
157157
test-arm-reference-delegation:
158158
name: test-arm-reference-delegation

docs/source/executorch-arm-delegate-tutorial.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ cd <executorch_source_root_dir>
404404
toolchain_cmake=<executorch_source_root_dir>/examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
405405

406406
cmake \
407-
-DBUCK2=${buck2} \
408407
-DCMAKE_INSTALL_PREFIX=<executorch_build_dir> \
409408
-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
410409
-DCMAKE_BUILD_TYPE=Release \

examples/arm/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ There are two main scripts, setup.sh and run.sh. Each takes one optional,
1818
positional argument. It is a path to a scratch dir to download and generate
1919
build artifacts. If supplied, the same argument must be supplied to both the scripts.
2020

21-
run.sh also takes a second optional positional arg to specify a buck2 command.
22-
2321
To run these scripts. On a Linux system, in a terminal, with a working internet connection,
2422
```
2523
# Step [1] - setup necessary tools

examples/arm/run.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
set -eu
1111

1212
if [[ "${1:-'.'}" == "-h" || "${#}" -gt 2 ]]; then
13-
echo "Usage: $(basename $0) [path-to-a-scratch-dir] [buck2 binary]"
13+
echo "Usage: $(basename $0) [path-to-a-scratch-dir]"
1414
echo "Supplied args: $*"
1515
exit 1
1616
fi
@@ -23,8 +23,6 @@ script_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
2323
# Ethos-u
2424
root_dir=${1:-"${script_dir}/ethos-u-scratch"}
2525
root_dir=$(realpath ${root_dir})
26-
buck2=${2:-"/tmp/buck2"}
27-
[[ -x ${buck2} ]] || buck2=`which buck2`
2826

2927
ethos_u_root_dir="$(cd ${root_dir}/ethos-u && pwd)"
3028
ethos_u_build_dir=${ethos_u_root_dir}/core_platform/build
@@ -70,14 +68,14 @@ function build_quantization_aot_lib()
7068

7169
cd $et_root_dir
7270
mkdir -p cmake-out-aot-lib
73-
cmake -DBUCK2=${buck2} \
71+
cmake \
7472
-DCMAKE_BUILD_TYPE=Release \
7573
-DEXECUTORCH_BUILD_XNNPACK=OFF \
7674
-DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
7775
-DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON \
7876
-DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
7977
-DPYTHON_EXECUTABLE=python3 \
80-
-Bcmake-out-aot-lib \
78+
-Bcmake-out-aot-lib \
8179
"${et_root_dir}"
8280

8381
n=$(nproc)
@@ -95,7 +93,6 @@ function build_executorch() {
9593

9694
cd "${et_root_dir}"
9795
cmake \
98-
-DBUCK2=${buck2} \
9996
-DCMAKE_INSTALL_PREFIX=${et_build_dir} \
10097
-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
10198
-DCMAKE_BUILD_TYPE=Release \
@@ -192,9 +189,6 @@ hash arm-none-eabi-gcc \
192189
[[ -f ${et_root_dir}/CMakeLists.txt ]] \
193190
|| { echo "Executorch repo doesn't contain CMakeLists.txt file at root level"; exit 1; }
194191

195-
type ${buck2} 2>&1 > /dev/null \
196-
|| { echo "Need a functioning buck2. Got ${buck2}."; exit 1; }
197-
198192
# build executorch libraries
199193
build_executorch
200194
build_quantization_aot_lib

0 commit comments

Comments
 (0)