Skip to content

Commit 24e131a

Browse files
committed
fix lint warnings
1 parent 0e01d0f commit 24e131a

File tree

4 files changed

+13
-40
lines changed

4 files changed

+13
-40
lines changed

tools/ci_build/github/linux/build_linux_python_package.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ echo "EXTRA_ARG:"
6161
echo "$EXTRA_ARG"
6262

6363
if [ "$EXTRA_ARG" != "" ]; then
64-
# Shall not quote $EXTRA_ARG here to allow multiple arguments passed in.
64+
# SC2206: This is intentionally unquoted to allow multiple arguments.
65+
# shellcheck disable=SC2206
6566
BUILD_ARGS+=($EXTRA_ARG)
6667
fi
6768

@@ -71,7 +72,8 @@ if [ "$ARCH" == "x86_64" ]; then
7172
fi
7273

7374
if [ "$BUILD_DEVICE" == "GPU" ]; then
74-
SHORT_CUDA_VERSION=$(echo $CUDA_VERSION | sed 's/\([[:digit:]]\+\.[[:digit:]]\+\)\.[[:digit:]]\+/\1/')
75+
# Fix SC2086: Quote $CUDA_VERSION
76+
SHORT_CUDA_VERSION=$(echo "$CUDA_VERSION" | sed 's/\([[:digit:]]\+\.[[:digit:]]\+\)\.[[:digit:]]\+/\1/')
7577
#Enable CUDA and TRT EPs.
7678
BUILD_ARGS+=("--use_cuda" "--use_tensorrt" "--cuda_version=$SHORT_CUDA_VERSION" "--tensorrt_home=/usr" "--cuda_home=/usr/local/cuda-$SHORT_CUDA_VERSION" "--cudnn_home=/usr/local/cuda-$SHORT_CUDA_VERSION" "--nvcc_threads=1" "--cmake_extra_defines" "CMAKE_CUDA_ARCHITECTURES=60-real;70-real;75-real;80-real;86-real;90a-real;90-virtual" "onnxruntime_USE_FPA_INTB_GEMM=OFF")
7779
fi

tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm

Lines changed: 0 additions & 26 deletions
This file was deleted.

tools/ci_build/github/linux/docker/scripts/install_python_deps.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
#!/bin/bash
22
set -e -x
33

4-
INSTALL_DEPS_TRAINING=false
5-
INSTALL_DEPS_DISTRIBUTED_SETUP=false
64
USE_CONDA=false
75

8-
while getopts p:d:v:tmuc parameter_Option
6+
while getopts p:d:c parameter_Option
97
do case "${parameter_Option}"
108
in
119
p) PYTHON_VER=${OPTARG};;
1210
d) DEVICE_TYPE=${OPTARG};;
13-
v) CU_VER=${OPTARG};;
14-
t) INSTALL_DEPS_TRAINING=true;;
15-
m) INSTALL_DEPS_DISTRIBUTED_SETUP=true;;
1611
c) USE_CONDA=true;;
12+
*) echo "Invalid option: -${OPTARG}" >&2; exit 1 ;;
1713
esac
1814
done
1915

@@ -45,4 +41,4 @@ if [[ "$PYTHON_VER" = "3.14" ]]; then
4541
${PYTHON_EXE} -m pip install onnxscript ml_dtypes onnx_ir onnx_weekly typing_extensions packaging numpy --no-deps
4642
fi
4743

48-
${PYTHON_EXE} -m pip install -r ${0/%install_python_deps\.sh/requirements\.txt}
44+
${PYTHON_EXE} -m pip install -r "${0/%install_python_deps\.sh/requirements\.txt}"

tools/ci_build/github/linux/run_python_dockerbuild.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ esac
1616
done
1717

1818
mkdir -p "${HOME}/.onnx"
19-
DOCKER_SCRIPT_OPTIONS="-d ${DEVICE} -c ${BUILD_CONFIG}"
19+
20+
DOCKER_SCRIPT_OPTIONS=("-d" "${DEVICE}" "-c" "${BUILD_CONFIG}")
2021

2122
if [ "${PYTHON_EXES}" != "" ] ; then
22-
DOCKER_SCRIPT_OPTIONS+=" -p ${PYTHON_EXES}"
23+
DOCKER_SCRIPT_OPTIONS+=("-p" "${PYTHON_EXES}")
2324
fi
2425

2526
if [ "${BUILD_EXTR_PAR}" != "" ] ; then
26-
DOCKER_SCRIPT_OPTIONS+=" -x \"${BUILD_EXTR_PAR}\""
27+
DOCKER_SCRIPT_OPTIONS+=("-x" "${BUILD_EXTR_PAR}")
2728
fi
2829

2930
docker run -e SYSTEM_COLLECTIONURI --rm \
@@ -38,10 +39,10 @@ docker run -e SYSTEM_COLLECTIONURI --rm \
3839
-e ORT_DISABLE_PYTHON_PACKAGE_LOCAL_VERSION \
3940
-e DEFAULT_TRAINING_PACKAGE_DEVICE \
4041
$ADDITIONAL_DOCKER_PARAMETER \
41-
$DOCKER_IMAGE tools/ci_build/github/linux/build_linux_python_package.sh $DOCKER_SCRIPT_OPTIONS
42+
"$DOCKER_IMAGE" tools/ci_build/github/linux/build_linux_python_package.sh "${DOCKER_SCRIPT_OPTIONS[@]}"
4243

4344
sudo rm -rf "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/onnxruntime" "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/pybind11" \
4445
"${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/models" "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/_deps" \
4546
"${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/CMakeFiles"
4647
cd "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}"
47-
find -executable -type f > "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/perms.txt"
48+
find . -executable -type f > "${BUILD_BINARIESDIRECTORY}/${BUILD_CONFIG}/perms.txt"

0 commit comments

Comments
 (0)