[CI][BugFix] ShellCheck cleanup to remove baseline and preserve runtime behavior (#34514)
Signed-off-by: junuxyz <216036880+junuxyz@users.noreply.github.com>
This commit is contained in:
@@ -23,7 +23,7 @@ while getopts "w:n" opt; do
|
||||
done
|
||||
|
||||
if [ ! -d "$WORKSPACE" ]; then
|
||||
mkdir -p $WORKSPACE
|
||||
mkdir -p "$WORKSPACE"
|
||||
fi
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ fi
|
||||
pip3 install cmake torch ninja
|
||||
|
||||
# build nvshmem
|
||||
pushd $WORKSPACE
|
||||
pushd "$WORKSPACE"
|
||||
# Reset NVSHMEM build if requested
|
||||
if [ "$INSTALL_NVSHMEM" = true ]; then
|
||||
mkdir -p nvshmem_src
|
||||
@@ -69,15 +69,15 @@ export NVSHMEM_BUILD_HYDRA_LAUNCHER=0
|
||||
export NVSHMEM_BUILD_TXZ_PACKAGE=0
|
||||
export NVSHMEM_TIMEOUT_DEVICE_POLLING=0
|
||||
|
||||
cmake -G Ninja -S . -B $WORKSPACE/nvshmem_build/ -DCMAKE_INSTALL_PREFIX=$WORKSPACE/nvshmem_install
|
||||
cmake --build $WORKSPACE/nvshmem_build/ --target install
|
||||
cmake -G Ninja -S . -B "$WORKSPACE"/nvshmem_build/ -DCMAKE_INSTALL_PREFIX="$WORKSPACE"/nvshmem_install
|
||||
cmake --build "$WORKSPACE"/nvshmem_build/ --target install
|
||||
|
||||
popd
|
||||
|
||||
export CMAKE_PREFIX_PATH=$WORKSPACE/nvshmem_install:$CMAKE_PREFIX_PATH
|
||||
|
||||
# build and install pplx, require pytorch installed
|
||||
pushd $WORKSPACE
|
||||
pushd "$WORKSPACE"
|
||||
git clone https://github.com/ppl-ai/pplx-kernels
|
||||
cd pplx-kernels
|
||||
# see https://github.com/pypa/pip/issues/9955#issuecomment-838065925
|
||||
|
||||
@@ -14,7 +14,7 @@ DEEPEP_COMMIT_HASH=${DEEPEP_COMMIT_HASH:-"73b6ea4"}
|
||||
NVSHMEM_VER=${NVSHMEM_VER:-"3.3.24"} # Default supports both CUDA 12 and 13
|
||||
WORKSPACE=${WORKSPACE:-$(pwd)/ep_kernels_workspace}
|
||||
MODE=${MODE:-install}
|
||||
CUDA_VERSION_MAJOR=$(${CUDA_HOME}/bin/nvcc --version | egrep -o "release [0-9]+" | cut -d ' ' -f 2)
|
||||
CUDA_VERSION_MAJOR=$("${CUDA_HOME}"/bin/nvcc --version | grep -E -o "release [0-9]+" | cut -d ' ' -f 2)
|
||||
|
||||
# Parse arguments
|
||||
while [[ $# -gt 0 ]]; do
|
||||
|
||||
@@ -5,8 +5,6 @@ set -ex
|
||||
|
||||
# FlashInfer configuration
|
||||
FLASHINFER_GIT_REPO="https://github.com/flashinfer-ai/flashinfer.git"
|
||||
FLASHINFER_GIT_REF="${FLASHINFER_GIT_REF}"
|
||||
CUDA_VERSION="${CUDA_VERSION}"
|
||||
BUILD_WHEEL="${BUILD_WHEEL:-true}"
|
||||
|
||||
if [[ -z "${FLASHINFER_GIT_REF}" ]]; then
|
||||
@@ -23,7 +21,7 @@ echo "🏗️ Building FlashInfer ${FLASHINFER_GIT_REF} for CUDA ${CUDA_VERSION
|
||||
|
||||
# Clone FlashInfer
|
||||
git clone --depth 1 --recursive --shallow-submodules \
|
||||
--branch ${FLASHINFER_GIT_REF} \
|
||||
--branch "${FLASHINFER_GIT_REF}" \
|
||||
${FLASHINFER_GIT_REPO} flashinfer
|
||||
|
||||
# Set CUDA arch list based on CUDA version
|
||||
@@ -44,7 +42,7 @@ echo "🏗️ Building FlashInfer AOT for arches: ${FI_TORCH_CUDA_ARCH_LIST}"
|
||||
|
||||
pushd flashinfer
|
||||
# Make sure the wheel is built for the correct CUDA version
|
||||
export UV_TORCH_BACKEND=cu$(echo $CUDA_VERSION | cut -d. -f1,2 | tr -d '.')
|
||||
export UV_TORCH_BACKEND=cu$(echo "$CUDA_VERSION" | cut -d. -f1,2 | tr -d '.')
|
||||
|
||||
# Build AOT kernels
|
||||
export TORCH_CUDA_ARCH_LIST="${FI_TORCH_CUDA_ARCH_LIST}"
|
||||
@@ -63,4 +61,4 @@ pushd flashinfer
|
||||
popd
|
||||
|
||||
# Cleanup
|
||||
rm -rf flashinfer
|
||||
rm -rf flashinfer
|
||||
|
||||
@@ -65,7 +65,7 @@ fi
|
||||
|
||||
# Extract major and minor version numbers
|
||||
CUDA_MAJOR="${CUDA_VERSION%%.*}"
|
||||
CUDA_MINOR="${CUDA_VERSION#${CUDA_MAJOR}.}"
|
||||
CUDA_MINOR="${CUDA_VERSION#"${CUDA_MAJOR}".}"
|
||||
CUDA_MINOR="${CUDA_MINOR%%.*}"
|
||||
echo "CUDA version: $CUDA_VERSION (major: $CUDA_MAJOR, minor: $CUDA_MINOR)"
|
||||
|
||||
@@ -92,7 +92,7 @@ git checkout "$DEEPGEMM_GIT_REF"
|
||||
|
||||
# Clean previous build artifacts
|
||||
# (Based on https://github.com/deepseek-ai/DeepGEMM/blob/main/install.sh)
|
||||
rm -rf build dist *.egg-info
|
||||
rm -rf -- build dist *.egg-info 2>/dev/null || true
|
||||
|
||||
# Build wheel
|
||||
echo "🏗️ Building DeepGEMM wheel..."
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
benchmarks/auto_tune/auto_tune.sh:SC2034
|
||||
benchmarks/auto_tune/auto_tune.sh:SC2086
|
||||
benchmarks/auto_tune/batch_auto_tune.sh:SC2086
|
||||
benchmarks/run_structured_output_benchmark.sh:SC2028
|
||||
benchmarks/run_structured_output_benchmark.sh:SC2034
|
||||
benchmarks/run_structured_output_benchmark.sh:SC2086
|
||||
.buildkite/image_build/image_build_cpu_arm64.sh:SC2086
|
||||
.buildkite/image_build/image_build_cpu.sh:SC2086
|
||||
.buildkite/image_build/image_build_hpu.sh:SC2086
|
||||
.buildkite/lm-eval-harness/run-lm-eval-chartqa-vllm-vlm-baseline.sh:SC2086
|
||||
.buildkite/lm-eval-harness/run-lm-eval-mmlupro-vllm-baseline.sh:SC2034
|
||||
.buildkite/performance-benchmarks/scripts/run-performance-benchmarks.sh:SC2027
|
||||
.buildkite/performance-benchmarks/scripts/run-performance-benchmarks.sh:SC2086
|
||||
.buildkite/performance-benchmarks/scripts/run-performance-benchmarks.sh:SC2126
|
||||
.buildkite/scripts/annotate-rocm-release.sh:SC2086
|
||||
.buildkite/scripts/cache-rocm-base-wheels.sh:SC2012
|
||||
.buildkite/scripts/cherry-pick-from-milestone.sh:SC2064
|
||||
.buildkite/scripts/hardware_ci/run-cpu-test-ppc64le.sh:SC2086
|
||||
.buildkite/scripts/hardware_ci/run-cpu-test.sh:SC2086
|
||||
.buildkite/scripts/hardware_ci/run-hpu-test.sh:SC2086
|
||||
.buildkite/scripts/hardware_ci/run-npu-test.sh:SC1090
|
||||
.buildkite/scripts/hardware_ci/run-npu-test.sh:SC2006
|
||||
.buildkite/scripts/hardware_ci/run-npu-test.sh:SC2086
|
||||
.buildkite/scripts/hardware_ci/run-npu-test.sh:SC2181
|
||||
.buildkite/scripts/hardware_ci/run-xpu-test.sh:SC2086
|
||||
.buildkite/scripts/push-nightly-builds.sh:SC2086
|
||||
.buildkite/scripts/run-multi-node-test.sh:SC2086
|
||||
.buildkite/scripts/run-multi-node-test.sh:SC2089
|
||||
.buildkite/scripts/run-multi-node-test.sh:SC2090
|
||||
.buildkite/scripts/run-prime-rl-test.sh:SC2086
|
||||
.buildkite/scripts/scheduled_integration_test/deepseek_v2_lite_ep_eplb.sh:SC2086
|
||||
.buildkite/scripts/scheduled_integration_test/qwen30b_a3b_fp8_block_ep_eplb.sh:SC2086
|
||||
.buildkite/scripts/scheduled_integration_test/qwen3_next_mtp_async_eplb.sh:SC2086
|
||||
.buildkite/scripts/tpu/docker_run_bm.sh:SC1090
|
||||
.buildkite/scripts/tpu/docker_run_bm.sh:SC2086
|
||||
.buildkite/scripts/tpu/run_bm.sh:SC2034
|
||||
.buildkite/scripts/tpu/run_bm.sh:SC2086
|
||||
.buildkite/scripts/upload-nightly-wheels.sh:SC2086
|
||||
.buildkite/scripts/upload-nightly-wheels.sh:SC2115
|
||||
.buildkite/scripts/upload-nightly-wheels.sh:SC2236
|
||||
.buildkite/scripts/upload-release-wheels-pypi.sh:SC2086
|
||||
.buildkite/scripts/upload-rocm-wheels.sh:SC2012
|
||||
examples/online_serving/disaggregated_encoder/disagg_1e1p1d_example.sh:SC2086
|
||||
examples/online_serving/disaggregated_encoder/disagg_1e1pd_example.sh:SC2086
|
||||
examples/online_serving/disaggregated_prefill.sh:SC2086
|
||||
examples/online_serving/disaggregated_serving/kv_events.sh:SC2086
|
||||
examples/online_serving/disaggregated_serving/mooncake_connector/run_mooncake_connector.sh:SC2046
|
||||
examples/online_serving/disaggregated_serving/mooncake_connector/run_mooncake_connector.sh:SC2086
|
||||
examples/online_serving/disaggregated_serving/mooncake_connector/run_mooncake_connector.sh:SC2317
|
||||
examples/online_serving/disaggregated_serving_p2p_nccl_xpyd/disagg_example_p2p_nccl_xpyd.sh:SC2046
|
||||
examples/online_serving/disaggregated_serving_p2p_nccl_xpyd/disagg_example_p2p_nccl_xpyd.sh:SC2086
|
||||
examples/online_serving/disaggregated_serving_p2p_nccl_xpyd/disagg_example_p2p_nccl_xpyd.sh:SC2317
|
||||
examples/online_serving/elastic_ep/bench.sh:SC2086
|
||||
examples/online_serving/elastic_ep/serve_deepseek_v2.sh:SC2086
|
||||
examples/online_serving/multi-node-serving.sh:SC2006
|
||||
examples/online_serving/multi-node-serving.sh:SC2086
|
||||
examples/online_serving/multi-node-serving.sh:SC2181
|
||||
examples/others/lmcache/disagg_prefill_lmcache_v1/disagg_example_nixl.sh:SC2046
|
||||
examples/others/lmcache/disagg_prefill_lmcache_v1/disagg_example_nixl.sh:SC2126
|
||||
examples/others/lmcache/disagg_prefill_lmcache_v1/disagg_example_nixl.sh:SC2181
|
||||
examples/others/lmcache/disagg_prefill_lmcache_v1/disagg_example_nixl.sh:SC2206
|
||||
examples/others/lmcache/disagg_prefill_lmcache_v1/disagg_vllm_launcher.sh:SC2086
|
||||
examples/pooling/embed/openai_embedding_long_text/service.sh:SC2086
|
||||
tests/standalone_tests/python_only_compile.sh:SC2086
|
||||
tests/v1/ec_connector/integration/run_epd_correctness_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/config_sweep_accuracy_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/run_accuracy_test.sh:SC2005
|
||||
tests/v1/kv_connector/nixl_integration/run_accuracy_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/run_accuracy_test.sh:SC2124
|
||||
tests/v1/kv_connector/nixl_integration/run_accuracy_test.sh:SC2126
|
||||
tests/v1/kv_connector/nixl_integration/run_accuracy_test.sh:SC2206
|
||||
tests/v1/kv_connector/nixl_integration/run_edge_case_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/run_edge_case_test.sh:SC2153
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_disagg_accuracy_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_disagg_accuracy_test.sh:SC2089
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_disagg_accuracy_test.sh:SC2090
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_edge_case_test.sh:SC2086
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_edge_case_test.sh:SC2089
|
||||
tests/v1/kv_connector/nixl_integration/run_tpu_edge_case_test.sh:SC2090
|
||||
tools/ep_kernels/elastic_ep/install_eep_libraries.sh:SC2086
|
||||
tools/ep_kernels/install_python_libraries.sh:SC2086
|
||||
tools/ep_kernels/install_python_libraries.sh:SC2196
|
||||
tools/flashinfer-build.sh:SC2086
|
||||
tools/flashinfer-build.sh:SC2269
|
||||
tools/install_deepgemm.sh:SC2035
|
||||
tools/install_deepgemm.sh:SC2295
|
||||
tools/pre_commit/shellcheck.sh:SC2016
|
||||
tools/vllm-rocm/generate-rocm-wheels-root-index.sh:SC2295
|
||||
tools/vllm-tpu/build.sh:SC2145
|
||||
@@ -2,7 +2,6 @@
|
||||
set -euo pipefail
|
||||
|
||||
scversion="stable"
|
||||
baseline="tools/pre_commit/shellcheck.baseline"
|
||||
|
||||
if [ -d "shellcheck-${scversion}" ]; then
|
||||
export PATH="$PATH:$(pwd)/shellcheck-${scversion}"
|
||||
@@ -20,38 +19,6 @@ if ! [ -x "$(command -v shellcheck)" ]; then
|
||||
fi
|
||||
|
||||
# TODO - fix warnings in .buildkite/scripts/hardware_ci/run-amd-test.sh
|
||||
# collects warnings as "file:SCcode" pairs for baseline comparison.
|
||||
collect() {
|
||||
find . -path ./.git -prune -o -name "*.sh" \
|
||||
-not -path "./.buildkite/scripts/hardware_ci/run-amd-test.sh" -print0 | \
|
||||
xargs -0 sh -c 'for f in "$@"; do git check-ignore -q "$f" || shellcheck -s bash -f gcc "$f" || true; done' -- | \
|
||||
sed -nE 's|^\./||; s|^([^:]+):[0-9]+:[0-9]+:.*\[(SC[0-9]+)\]$|\1:\2|p' | \
|
||||
sort -u
|
||||
}
|
||||
|
||||
if [[ "${1:-}" == "--generate-baseline" ]]; then
|
||||
collect > "$baseline"
|
||||
echo "Wrote baseline to $baseline"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ ! -f "$baseline" ]]; then
|
||||
echo "Baseline not found: $baseline (run: $0 --generate-baseline)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
current="$(mktemp)"
|
||||
trap 'rm -f "$current"' EXIT
|
||||
collect > "$current"
|
||||
|
||||
# finds new warnings not in baseline
|
||||
new_errors="$(comm -23 "$current" <(sort -u "$baseline") || true)"
|
||||
if [ -n "$new_errors" ]; then
|
||||
echo "$new_errors" | cut -d: -f1 | sort -u | while IFS= read -r file; do
|
||||
if [[ -f "$file" ]]; then
|
||||
codes=$(echo "$new_errors" | awk -F: -v f="$file" '$1==f {print $2}' | paste -sd ',' -)
|
||||
shellcheck -s bash --include="$codes" "$file" 2>&1 || true
|
||||
fi
|
||||
done
|
||||
exit 1
|
||||
fi
|
||||
find . -path ./.git -prune -o -name "*.sh" \
|
||||
-not -path "./.buildkite/scripts/hardware_ci/run-amd-test.sh" -print0 | \
|
||||
xargs -0 sh -c "for f in \"\$@\"; do git check-ignore -q \"\$f\" || shellcheck -s bash \"\$f\"; done" --
|
||||
|
||||
@@ -190,7 +190,7 @@ echo ""
|
||||
# List what would be uploaded
|
||||
echo "Files to upload:"
|
||||
find "$WORK_DIR/output" -name "*.html" -type f | while read -r file; do
|
||||
rel_path="${file#$WORK_DIR/output/}"
|
||||
rel_path="${file#"$WORK_DIR"/output/}"
|
||||
echo " rocm/$rel_path"
|
||||
done
|
||||
echo ""
|
||||
|
||||
@@ -38,7 +38,7 @@ if ! grep -q "name = \"vllm-tpu\"" "$PYPROJECT_FILE"; then
|
||||
cp "$PYPROJECT_FILE" "${PYPROJECT_FILE}.bak"
|
||||
sed -i '0,/^name = "vllm"/s//name = "vllm-tpu"/' "$PYPROJECT_FILE"
|
||||
|
||||
echo "Patching ${CHANGE_FILE_LIST[@]} vllm to vllm-tpu..."
|
||||
echo "Patching ${CHANGE_FILE_LIST[*]} vllm to vllm-tpu..."
|
||||
# patching
|
||||
# importlib.metadata.version('vllm') -> importlib.metadata.version('vllm-tpu')
|
||||
# importlib.metadata.version("vllm") -> importlib.metadata.version("vllm-tpu")
|
||||
|
||||
Reference in New Issue
Block a user