Skip to content

[BE][1/4] format shell scripts with SHFMT #157686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: gh/XuehaiPan/357/base
Choose a base branch
from
+208 −238
Open

[BE][1/4] format shell scripts with SHFMT #157686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0caa28d
Update
XuehaiPan Jul 7, 2025
3843fce
Update
XuehaiPan Jul 7, 2025
b3906da
Update
XuehaiPan Jul 8, 2025
061bfb2
Update
XuehaiPan Jul 12, 2025
39ab6ca
Update
XuehaiPan Jul 15, 2025
3b4977b
Update
XuehaiPan Jul 21, 2025
442c57c
Update
XuehaiPan Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .lintrunner.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,6 @@ exclude_patterns = [
'third_party/**/*.sh',
# These files are all grandfathered in, feel free to remove from this list
# as necessary
"**/*.sh",
".*/**/*.sh",
".ci/**/*.sh",
".github/**/*.sh",
Expand Down
7 changes: 3 additions & 4 deletions android/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ if [ -z "$PYTORCH_DIR" ]; then
exit 1
fi

retry () {
"$@" || (sleep 10 && "$@") || (sleep 20 && "$@") || (sleep 40 && "$@")
retry() {
"$@" || (sleep 10 && "$@") || (sleep 20 && "$@") || (sleep 40 && "$@")
}

check_android_sdk() {
Expand Down Expand Up @@ -57,8 +57,7 @@ build_android() {
rm -rf "$LIB_DIR" && mkdir -p "$LIB_DIR"
rm -rf "$INCLUDE_DIR" && mkdir -p "$INCLUDE_DIR"

for abi in $(echo "$ABIS_LIST" | tr ',' '\n')
do
for abi in $(echo "$ABIS_LIST" | tr ',' '\n'); do
echo "abi:$abi"
ANDROID_BUILD_ROOT="$BUILD_ROOT/build_android_$abi"
ANDROID_ABI="$abi" \
Expand Down
7 changes: 5 additions & 2 deletions android/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#!/bin/bash
set -eux

PYTORCH_DIR="$(cd $(dirname $0)/..; pwd -P)"
PYTORCH_DIR="$(
cd $(dirname $0)/..
pwd -P
)"
PYTORCH_ANDROID_DIR=$PYTORCH_DIR/android

source "$PYTORCH_ANDROID_DIR/common.sh"
Expand All @@ -21,7 +24,7 @@ echo "DEVICES_COUNT:$DEVICES_COUNT"

if [ "$DEVICES_COUNT" -eq 1 ]; then
echo "Unable to found connected android emulators"
cat <<- EOF
cat <<-EOF
To start android emulator:
1. Install android sdkmanager packages
$ANDROID_HOME/tools/bin/sdkmanager "system-images;android-25;google_apis;x86"
Expand Down
14 changes: 5 additions & 9 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-android-arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$ANDROID_NDK" ]
then
if [ -z "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not set; please set it to the Android NDK directory"
exit 1
fi

if [ ! -d "$ANDROID_NDK" ]
then
if [ ! -d "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not a directory; did you install it under ${ANDROID_NDK}?"
exit 1
fi
Expand All @@ -30,8 +28,7 @@ CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
CMAKE_ARGS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

# If Ninja is installed, prefer it to Make
if [ -x "$(command -v ninja)" ]
then
if [ -x "$(command -v ninja)" ]; then
CMAKE_ARGS+=("-GNinja")
fi

Expand All @@ -57,11 +54,10 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
CMAKE_ARGS+=($@)

cd build/android/arm64-v8a && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
14 changes: 5 additions & 9 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-android-armv7.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$ANDROID_NDK" ]
then
if [ -z "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not set; please set it to the Android NDK directory"
exit 1
fi

if [ ! -d "$ANDROID_NDK" ]
then
if [ ! -d "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not a directory; did you install it under ${ANDROID_NDK}?"
exit 1
fi
Expand All @@ -30,8 +28,7 @@ CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
CMAKE_ARGS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

# If Ninja is installed, prefer it to Make
if [ -x "$(command -v ninja)" ]
then
if [ -x "$(command -v ninja)" ]; then
CMAKE_ARGS+=("-GNinja")
fi

Expand All @@ -57,11 +54,10 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
CMAKE_ARGS+=($@)

cd build/android/armeabi-v7a && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
14 changes: 5 additions & 9 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-android-x86.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$ANDROID_NDK" ]
then
if [ -z "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not set; please set it to the Android NDK directory"
exit 1
fi

if [ ! -d "$ANDROID_NDK" ]
then
if [ ! -d "$ANDROID_NDK" ]; then
echo "ANDROID_NDK not a directory; did you install it under ${ANDROID_NDK}?"
exit 1
fi
Expand All @@ -30,8 +28,7 @@ CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
CMAKE_ARGS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

# If Ninja is installed, prefer it to Make
if [ -x "$(command -v ninja)" ]
then
if [ -x "$(command -v ninja)" ]; then
CMAKE_ARGS+=("-GNinja")
fi

Expand All @@ -57,11 +54,10 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
CMAKE_ARGS+=($@)

cd build/android/x86 && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -44,11 +42,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/arm64 && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-arm64e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -44,11 +42,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/arm64e && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-armv7.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -44,11 +42,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/armv7 && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-armv7s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -44,11 +42,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/armv7s && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-i386.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -44,11 +42,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/i386 && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
11 changes: 4 additions & 7 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-ios-x86_64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

set -e

if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ -z "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not set; please set it to path of CMake toolchain file for iOS"
exit 1
fi

if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]
then
if [ ! -f "$IOS_CMAKE_TOOLCHAIN_FILE" ]; then
echo "IOS_CMAKE_TOOLCHAIN_FILE not a file path; did you properly setup ${IOS_CMAKE_TOOLCHAIN_FILE}?"
exit 1
fi
Expand Down Expand Up @@ -49,11 +47,10 @@ CMAKE_ARGS+=("-DENABLE_ARC=OFF")
CMAKE_ARGS+=($@)

cd build/ios/x86_64 && cmake ../../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
8 changes: 3 additions & 5 deletions aten/src/ATen/native/quantized/cpu/qnnpack/scripts/build-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
CMAKE_ARGS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

# If Ninja is installed, prefer it to Make
if [ -x "$(command -v ninja)" ]
then
if [ -x "$(command -v ninja)" ]; then
CMAKE_ARGS+=("-GNinja")
fi

Expand All @@ -31,11 +30,10 @@ CMAKE_ARGS+=("-DPYTORCH_QNNPACK_BUILD_TESTS=ON")
CMAKE_ARGS+=($@)

cd build/local && cmake ../.. \
"${CMAKE_ARGS[@]}"
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
if [ "$(uname)" == "Darwin" ]; then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
Expand Down
Loading
Loading