From df3210890465056f29d969a016719243b8dc43f1 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Wed, 13 Nov 2024 06:46:09 +0000 Subject: [PATCH 1/4] Make shellcheck happy Signed-off-by: DarkLight1337 --- .buildkite/run-cpu-test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/run-cpu-test.sh b/.buildkite/run-cpu-test.sh index b3771bb268e2..1c0939c354d6 100644 --- a/.buildkite/run-cpu-test.sh +++ b/.buildkite/run-cpu-test.sh @@ -9,8 +9,8 @@ CORE_RANGE=${CORE_RANGE:-48-95} NUMA_NODE=${NUMA_NODE:-1} # Try building the docker image -numactl -C $CORE_RANGE -N $NUMA_NODE docker build -t cpu-test -f Dockerfile.cpu . -numactl -C $CORE_RANGE -N $NUMA_NODE docker build --build-arg VLLM_CPU_DISABLE_AVX512="true" -t cpu-test-avx2 -f Dockerfile.cpu . +numactl -C "$CORE_RANGE" -N "$NUMA_NODE" docker build -t cpu-test -f Dockerfile.cpu . +numactl -C "$CORE_RANGE" -N "$NUMA_NODE" docker build --build-arg VLLM_CPU_DISABLE_AVX512="true" -t cpu-test-avx2 -f Dockerfile.cpu . # Setup cleanup remove_docker_container() { docker rm -f cpu-test cpu-test-avx2 || true; } @@ -18,10 +18,10 @@ trap remove_docker_container EXIT remove_docker_container # Run the image, setting --shm-size=4g for tensor parallel. -docker run -itd --entrypoint /bin/bash -v ~/.cache/huggingface:/root/.cache/huggingface --cpuset-cpus=$CORE_RANGE \ - --cpuset-mems=$NUMA_NODE --privileged=true --network host -e HF_TOKEN --env VLLM_CPU_KVCACHE_SPACE=4 --shm-size=4g --name cpu-test cpu-test -docker run -itd --entrypoint /bin/bash -v ~/.cache/huggingface:/root/.cache/huggingface --cpuset-cpus=$CORE_RANGE \ - --cpuset-mems=$NUMA_NODE --privileged=true --network host -e HF_TOKEN --env VLLM_CPU_KVCACHE_SPACE=4 --shm-size=4g --name cpu-test-avx2 cpu-test-avx2 +docker run -itd --entrypoint /bin/bash -v ~/.cache/huggingface:/root/.cache/huggingface --cpuset-cpus="$CORE_RANGE" \ + --cpuset-mems="$NUMA_NODE" --privileged=true --network host -e HF_TOKEN --env VLLM_CPU_KVCACHE_SPACE=4 --shm-size=4g --name cpu-test cpu-test +docker run -itd --entrypoint /bin/bash -v ~/.cache/huggingface:/root/.cache/huggingface --cpuset-cpus="$CORE_RANGE" \ + --cpuset-mems="$NUMA_NODE" --privileged=true --network host -e HF_TOKEN --env VLLM_CPU_KVCACHE_SPACE=4 --shm-size=4g --name cpu-test-avx2 cpu-test-avx2 function cpu_tests() { set -e From 195c548a52245ed98bd6205323cb714d678b7f4c Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Wed, 13 Nov 2024 15:22:07 +0000 Subject: [PATCH 2/4] Fail CI when shellcheck fails Signed-off-by: DarkLight1337 --- tools/shellcheck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/shellcheck.sh b/tools/shellcheck.sh index 0bb6fd2eafa1..894baa3b2777 100755 --- a/tools/shellcheck.sh +++ b/tools/shellcheck.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -ex scversion="stable" From c7418e84374463b6ee904fb18d8a7495a089efd2 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Wed, 13 Nov 2024 15:28:01 +0000 Subject: [PATCH 3/4] Avoid spamming the command output Signed-off-by: DarkLight1337 --- tools/shellcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/shellcheck.sh b/tools/shellcheck.sh index 894baa3b2777..a13c49ebac9c 100755 --- a/tools/shellcheck.sh +++ b/tools/shellcheck.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -e scversion="stable" From 1e0d209e4d3986dca15f14ac3fa2a46feb19b7d0 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Wed, 13 Nov 2024 15:58:38 +0000 Subject: [PATCH 4/4] Fix `format.sh` not failing when shellcheck fails Signed-off-by: DarkLight1337 --- tools/shellcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/shellcheck.sh b/tools/shellcheck.sh index a13c49ebac9c..d99fa77b9635 100755 --- a/tools/shellcheck.sh +++ b/tools/shellcheck.sh @@ -19,4 +19,4 @@ if ! [ -x "$(command -v shellcheck)" ]; then fi # TODO - fix warnings in .buildkite/run-amd-test.sh -find . -name "*.sh" -not -path "./.buildkite/run-amd-test.sh" -exec sh -c 'git check-ignore -q $1 || shellcheck $1' _ {} \; +find . -name "*.sh" -not -path "./.buildkite/run-amd-test.sh" -print0 | xargs -0 -I {} sh -c 'git check-ignore -q "{}" || shellcheck "{}"'