Skip to content

Commit 43d0083

Browse files
XuehaiPanXuehaiPan
committed
[BE][4/4] format shell scripts with SHFMT in scripts/
ghstack-source-id: e8fce30 Pull-Request: #157689
1 parent 769ae13 commit 43d0083

22 files changed

+277
-237
lines changed

‎.lintrunner.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,9 +1484,6 @@ exclude_patterns = [
14841484
'fb/**',
14851485
'**/fb/**',
14861486
'third_party/**/*.sh',
1487-
# These files are all grandfathered in, feel free to remove from this list
1488-
# as necessary
1489-
"scripts/**/*.sh",
14901487
]
14911488
init_command = [
14921489
'python3',

‎scripts/add_apache_header.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cat apache_header.txt $1 > _add_apache_header.txt && mv _add_apache_header.txt $1
1+
cat apache_header.txt $1 >_add_apache_header.txt && mv _add_apache_header.txt $1

‎scripts/analysis/run_test_csv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
set -x
88

99
if getent hosts fwdproxy; then
10-
export https_proxy=http://fwdproxy:8080 http_proxy=http://fwdproxy:8080 no_proxy=.fbcdn.net,.facebook.com,.thefacebook.com,.tfbnw.net,.fb.com,.fburl.com,.facebook.net,.sb.fbsbx.com,localhost
10+
export https_proxy=http://fwdproxy:8080 http_proxy=http://fwdproxy:8080 no_proxy=.fbcdn.net,.facebook.com,.thefacebook.com,.tfbnw.net,.fb.com,.fburl.com,.facebook.net,.sb.fbsbx.com,localhost
1111
fi
1212
TEST_FILE="$1"
13-
TEST_ARGS="$*" # includes file name
13+
TEST_ARGS="$*" # includes file name
1414
shift
1515
pytest --csv "$TEST_FILE.csv" -v "$TEST_FILE" "$@" 2>&1 | tee "$TEST_FILE.log"
1616
LOG_URL="$(gh gist create -d "Test logs for $TEST_ARGS" "$TEST_FILE.log")"

‎scripts/build_android.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ fi
2828
ANDROID_NATIVE_API_LEVEL="21"
2929
echo "Build with ANDROID_ABI[$ANDROID_ABI], ANDROID_NATIVE_API_LEVEL[$ANDROID_NATIVE_API_LEVEL]"
3030

31-
CAFFE2_ROOT="$( cd "$(dirname "$0")"/.. ; pwd -P)"
31+
CAFFE2_ROOT="$(
32+
cd "$(dirname "$0")"/..
33+
pwd -P
34+
)"
3235
if [ -z "$ANDROID_NDK" ]; then
3336
echo "ANDROID_NDK not set; please set it to the Android NDK directory"
3437
exit 1
@@ -66,7 +69,10 @@ CMAKE_ARGS+=("-DBUILD_CUSTOM_PROTOBUF=OFF")
6669

6770
# custom build with selected ops
6871
if [ -n "${SELECTED_OP_LIST}" ]; then
69-
SELECTED_OP_LIST="$(cd $(dirname $SELECTED_OP_LIST); pwd -P)/$(basename $SELECTED_OP_LIST)"
72+
SELECTED_OP_LIST="$(
73+
cd $(dirname $SELECTED_OP_LIST)
74+
pwd -P
75+
)/$(basename $SELECTED_OP_LIST)"
7076
echo "Choose SELECTED_OP_LIST file: $SELECTED_OP_LIST"
7177
if [ ! -r ${SELECTED_OP_LIST} ]; then
7278
echo "Error: SELECTED_OP_LIST file ${SELECTED_OP_LIST} not found."
@@ -118,7 +124,7 @@ CMAKE_ARGS+=("-DBUILD_MOBILE_BENCHMARK=$BUILD_MOBILE_BENCHMARK")
118124
CMAKE_ARGS+=("-DBUILD_MOBILE_TEST=$BUILD_MOBILE_TEST")
119125
CMAKE_ARGS+=("-DBUILD_PYTHON=OFF")
120126
CMAKE_ARGS+=("-DBUILD_SHARED_LIBS=OFF")
121-
if (( "${ANDROID_NDK_VERSION:-0}" < 18 )); then
127+
if (("${ANDROID_NDK_VERSION:-0}" < 18)); then
122128
CMAKE_ARGS+=("-DANDROID_TOOLCHAIN=gcc")
123129
else
124130
CMAKE_ARGS+=("-DANDROID_TOOLCHAIN=clang")
@@ -171,9 +177,9 @@ INSTALL_PREFIX=${BUILD_ROOT}/install
171177
mkdir -p $BUILD_ROOT
172178
cd $BUILD_ROOT
173179
cmake "$CAFFE2_ROOT" \
174-
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
175-
-DCMAKE_BUILD_TYPE=Release \
176-
"${CMAKE_ARGS[@]}"
180+
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
181+
-DCMAKE_BUILD_TYPE=Release \
182+
"${CMAKE_ARGS[@]}"
177183

178184
# Cross-platform parallel build
179185
if [ -z "$MAX_JOBS" ]; then

‎scripts/build_android_gradle.sh

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ export GRADLE_HOME=/opt/gradle/gradle-$GRADLE_VERSION
1515
export GRADLE_PATH=$GRADLE_HOME/bin/gradle
1616

1717
# touch gradle cache files to prevent expiration
18-
while IFS= read -r -d '' file
19-
do
18+
while IFS= read -r -d '' file; do
2019
touch "$file" || true
2120
done < <(find /var/lib/jenkins/.gradle -type f -print0)
2221

@@ -27,11 +26,11 @@ fi
2726

2827
export GRADLE_LOCAL_PROPERTIES=~/workspace/android/local.properties
2928
rm -f $GRADLE_LOCAL_PROPERTIES
30-
echo "sdk.dir=/opt/android/sdk" >> $GRADLE_LOCAL_PROPERTIES
31-
echo "ndk.dir=/opt/ndk" >> $GRADLE_LOCAL_PROPERTIES
32-
echo "cmake.dir=/usr/local" >> $GRADLE_LOCAL_PROPERTIES
29+
echo "sdk.dir=/opt/android/sdk" >>$GRADLE_LOCAL_PROPERTIES
30+
echo "ndk.dir=/opt/ndk" >>$GRADLE_LOCAL_PROPERTIES
31+
echo "cmake.dir=/usr/local" >>$GRADLE_LOCAL_PROPERTIES
3332

34-
retry () {
33+
retry() {
3534
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
3635
}
3736

@@ -68,31 +67,30 @@ ln -s ${BUILD_ANDROID_INCLUDE_DIR_x86} ${JNI_INCLUDE_DIR}/x86
6867
ln -s ${BUILD_ANDROID_LIB_DIR_x86} ${JNI_LIBS_DIR}/x86
6968

7069
if [[ "${BUILD_ENVIRONMENT}" != *-gradle-build-only-x86_32* ]]; then
71-
ln -s ${BUILD_ANDROID_INCLUDE_DIR_x86_64} ${JNI_INCLUDE_DIR}/x86_64
72-
ln -s ${BUILD_ANDROID_LIB_DIR_x86_64} ${JNI_LIBS_DIR}/x86_64
70+
ln -s ${BUILD_ANDROID_INCLUDE_DIR_x86_64} ${JNI_INCLUDE_DIR}/x86_64
71+
ln -s ${BUILD_ANDROID_LIB_DIR_x86_64} ${JNI_LIBS_DIR}/x86_64
7372

74-
ln -s ${BUILD_ANDROID_INCLUDE_DIR_arm_v7a} ${JNI_INCLUDE_DIR}/armeabi-v7a
75-
ln -s ${BUILD_ANDROID_LIB_DIR_arm_v7a} ${JNI_LIBS_DIR}/armeabi-v7a
73+
ln -s ${BUILD_ANDROID_INCLUDE_DIR_arm_v7a} ${JNI_INCLUDE_DIR}/armeabi-v7a
74+
ln -s ${BUILD_ANDROID_LIB_DIR_arm_v7a} ${JNI_LIBS_DIR}/armeabi-v7a
7675

77-
ln -s ${BUILD_ANDROID_INCLUDE_DIR_arm_v8a} ${JNI_INCLUDE_DIR}/arm64-v8a
78-
ln -s ${BUILD_ANDROID_LIB_DIR_arm_v8a} ${JNI_LIBS_DIR}/arm64-v8a
76+
ln -s ${BUILD_ANDROID_INCLUDE_DIR_arm_v8a} ${JNI_INCLUDE_DIR}/arm64-v8a
77+
ln -s ${BUILD_ANDROID_LIB_DIR_arm_v8a} ${JNI_LIBS_DIR}/arm64-v8a
7978
fi
8079

8180
GRADLE_PARAMS="-p android assembleRelease --debug --stacktrace"
8281
if [[ "${BUILD_ENVIRONMENT}" == *-gradle-build-only-x86_32* ]]; then
83-
GRADLE_PARAMS+=" -PABI_FILTERS=x86"
82+
GRADLE_PARAMS+=" -PABI_FILTERS=x86"
8483
fi
8584

8685
if [ -n "${GRADLE_OFFLINE:-}" ]; then
87-
GRADLE_PARAMS+=" --offline"
86+
GRADLE_PARAMS+=" --offline"
8887
fi
8988

9089
$GRADLE_PATH $GRADLE_PARAMS
9190

9291
find . -type f -name "*.a" -exec ls -lh {} \;
9392

94-
while IFS= read -r -d '' file
95-
do
93+
while IFS= read -r -d '' file; do
9694
echo
9795
echo "$file"
9896
ls -lah "$file"

‎scripts/build_host_protoc.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313

1414
set -e
1515

16-
CAFFE2_ROOT="$( cd "$(dirname -- "$0")"/.. ; pwd -P)"
16+
CAFFE2_ROOT="$(
17+
cd "$(dirname -- "$0")"/..
18+
pwd -P
19+
)"
1720
BUILD_ROOT=${BUILD_ROOT:-"$CAFFE2_ROOT/build_host_protoc"}
1821
mkdir -p $BUILD_ROOT/build
1922
cd $BUILD_ROOT/build
@@ -28,17 +31,20 @@ if [ -x "$(command -v ninja)" ]; then
2831
fi
2932

3033
while true; do
31-
case "$1" in
32-
--other-flags)
33-
shift;
34-
CMAKE_ARGS+=("$@")
35-
break ;;
36-
"")
37-
break ;;
38-
*)
39-
echo "Unknown option passed as argument: $1"
40-
break ;;
41-
esac
34+
case "$1" in
35+
--other-flags)
36+
shift
37+
CMAKE_ARGS+=("$@")
38+
break
39+
;;
40+
"")
41+
break
42+
;;
43+
*)
44+
echo "Unknown option passed as argument: $1"
45+
break
46+
;;
47+
esac
4248
done
4349

4450
# Use ccache if available (this path is where Homebrew installs ccache symlinks)

‎scripts/build_ios.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
# using ios-cmake. This is very similar to the android-cmake - see
88
# build_android.sh for more details.
99

10-
CAFFE2_ROOT="$( cd "$(dirname "$0")"/.. ; pwd -P)"
10+
CAFFE2_ROOT="$(
11+
cd "$(dirname "$0")"/..
12+
pwd -P
13+
)"
1114

1215
if [ -z "$PYTHON" ]; then
1316
PYTHON=python
@@ -31,7 +34,10 @@ CMAKE_ARGS+=("-DBUILD_CUSTOM_PROTOBUF=OFF")
3134

3235
# custom build with selected ops
3336
if [ -n "${SELECTED_OP_LIST}" ]; then
34-
SELECTED_OP_LIST="$(cd $(dirname $SELECTED_OP_LIST); pwd -P)/$(basename $SELECTED_OP_LIST)"
37+
SELECTED_OP_LIST="$(
38+
cd $(dirname $SELECTED_OP_LIST)
39+
pwd -P
40+
)/$(basename $SELECTED_OP_LIST)"
3541
echo "Choose SELECTED_OP_LIST file: $SELECTED_OP_LIST"
3642
if [ ! -r ${SELECTED_OP_LIST} ]; then
3743
echo "Error: SELECTED_OP_LIST file ${SELECTED_OP_LIST} not found."
@@ -63,11 +69,11 @@ fi
6369
if [ -n "${IOS_PLATFORM:-}" ]; then
6470
CMAKE_ARGS+=("-DIOS_PLATFORM=${IOS_PLATFORM}")
6571
if [ "${IOS_PLATFORM}" == "WATCHOS" ]; then
66-
# enable bitcode by default for watchos
67-
CMAKE_ARGS+=("-DCMAKE_C_FLAGS=-fembed-bitcode")
68-
CMAKE_ARGS+=("-DCMAKE_CXX_FLAGS=-fembed-bitcode")
69-
# disable the QNNPACK
70-
CMAKE_ARGS+=("-DUSE_PYTORCH_QNNPACK=OFF")
72+
# enable bitcode by default for watchos
73+
CMAKE_ARGS+=("-DCMAKE_C_FLAGS=-fembed-bitcode")
74+
CMAKE_ARGS+=("-DCMAKE_CXX_FLAGS=-fembed-bitcode")
75+
# disable the QNNPACK
76+
CMAKE_ARGS+=("-DUSE_PYTORCH_QNNPACK=OFF")
7177
fi
7278
else
7379
# IOS_PLATFORM is not set, default to OS, which builds iOS.
@@ -141,11 +147,11 @@ INSTALL_PREFIX=${BUILD_ROOT}/install
141147
mkdir -p $BUILD_ROOT
142148
cd $BUILD_ROOT
143149
cmake "$CAFFE2_ROOT" \
144-
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
145-
-DCMAKE_BUILD_TYPE=MinSizeRel \
146-
-DBUILD_SHARED_LIBS=OFF \
147-
${CMAKE_ARGS[@]} \
148-
$@
150+
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
151+
-DCMAKE_BUILD_TYPE=MinSizeRel \
152+
-DBUILD_SHARED_LIBS=OFF \
153+
${CMAKE_ARGS[@]} \
154+
$@
149155

150156
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
151157

‎scripts/build_local.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
set -ex
99

10-
CAFFE2_ROOT="$( cd "$(dirname "$0")"/.. ; pwd -P)"
10+
CAFFE2_ROOT="$(
11+
cd "$(dirname "$0")"/..
12+
pwd -P
13+
)"
1114

1215
CMAKE_ARGS=()
1316

@@ -61,20 +64,20 @@ else
6164
echo "Building Caffe2 in: $BUILD_ROOT"
6265

6366
cmake "$CAFFE2_ROOT" \
64-
-DCMAKE_BUILD_TYPE=Release \
65-
"${CMAKE_ARGS[@]}" \
66-
"$@"
67+
-DCMAKE_BUILD_TYPE=Release \
68+
"${CMAKE_ARGS[@]}" \
69+
"$@"
6770

6871
# Determine the number of CPUs to build with.
6972
# If the `CAFFE_MAKE_NCPUS` variable is not specified, use them all.
7073
if [ -n "${MAX_JOBS}" ]; then
71-
CAFFE_MAKE_NCPUS="$MAX_JOBS"
74+
CAFFE_MAKE_NCPUS="$MAX_JOBS"
7275
elif [ -n "${CAFFE_MAKE_NCPUS}" ]; then
73-
CAFFE_MAKE_NCPUS="$CAFFE_MAKE_NCPUS"
76+
CAFFE_MAKE_NCPUS="$CAFFE_MAKE_NCPUS"
7477
elif [ "$(uname)" == 'Darwin' ]; then
75-
CAFFE_MAKE_NCPUS="$(sysctl -n hw.ncpu)"
78+
CAFFE_MAKE_NCPUS="$(sysctl -n hw.ncpu)"
7679
else
77-
CAFFE_MAKE_NCPUS="$(nproc)"
80+
CAFFE_MAKE_NCPUS="$(nproc)"
7881
fi
7982

8083
# Now, actually build the target.

‎scripts/build_mobile.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
set -e
1010

1111
export BUILD_PYTORCH_MOBILE_WITH_HOST_TOOLCHAIN=1
12-
CAFFE2_ROOT="$( cd "$(dirname "$0")"/.. ; pwd -P)"
12+
CAFFE2_ROOT="$(
13+
cd "$(dirname "$0")"/..
14+
pwd -P
15+
)"
1316

1417
echo "Bash: $(/bin/bash --version | head -1)"
1518
echo "Caffe2 path: $CAFFE2_ROOT"
@@ -22,7 +25,10 @@ CMAKE_ARGS+=("-DBUILD_SHARED_LIBS=OFF")
2225

2326
# custom build with selected ops
2427
if [ -n "${SELECTED_OP_LIST}" ]; then
25-
SELECTED_OP_LIST="$(cd $(dirname $SELECTED_OP_LIST); pwd -P)/$(basename $SELECTED_OP_LIST)"
28+
SELECTED_OP_LIST="$(
29+
cd $(dirname $SELECTED_OP_LIST)
30+
pwd -P
31+
)/$(basename $SELECTED_OP_LIST)"
2632
echo "Choose SELECTED_OP_LIST file: $SELECTED_OP_LIST"
2733
if [ ! -r ${SELECTED_OP_LIST} ]; then
2834
echo "Error: SELECTED_OP_LIST file ${SELECTED_OP_LIST} not found."
@@ -89,9 +95,9 @@ INSTALL_PREFIX=${BUILD_ROOT}/install
8995
mkdir -p $BUILD_ROOT
9096
cd $BUILD_ROOT
9197
cmake "$CAFFE2_ROOT" \
92-
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
93-
-DCMAKE_BUILD_TYPE=Release \
94-
"${CMAKE_ARGS[@]}"
98+
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
99+
-DCMAKE_BUILD_TYPE=Release \
100+
"${CMAKE_ARGS[@]}"
95101

96102
# Cross-platform parallel build
97103
if [ -z "$MAX_JOBS" ]; then

‎scripts/build_pytorch_android.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ set -eux
2222
# 3. Runs pyotrch_android gradle build:
2323
# gradle assembleRelease
2424

25-
PYTORCH_DIR="$(cd $(dirname $0)/..; pwd -P)"
25+
PYTORCH_DIR="$(
26+
cd $(dirname $0)/..
27+
pwd -P
28+
)"
2629
PYTORCH_ANDROID_DIR=$PYTORCH_DIR/android
2730

2831
echo "PYTORCH_DIR:$PYTORCH_DIR"

0 commit comments

Comments
 (0)