Skip to content

Requirements logic during skip image build can be removed. #169

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 1 commit into
base: main
Choose a base branch
from
+4 −22
Open

Requirements logic during skip image build can be removed. #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions buildkite/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ upload_pipeline() {
-D fail_fast="$FAIL_FAST" \
-D vllm_use_precompiled="$VLLM_USE_PRECOMPILED" \
-D skip_image_build="$SKIP_IMAGE_BUILD" \
-D requirements_changed="$REQUIREMENTS_CHANGED" \
-D docker_image_override="$DOCKER_IMAGE_OVERRIDE" \
| sed '/^[[:space:]]*$/d' \
> pipeline.yaml
Expand Down Expand Up @@ -119,16 +118,6 @@ ignore_patterns=(
"docker/Dockerfile."
)

# Track changes to requirements/*.txt explicitly
REQUIREMENTS_CHANGED=0
for f in $file_diff; do
case "$f" in
requirements/common.txt|requirements/cuda.txt|requirements/build.txt|requirements/test.txt)
REQUIREMENTS_CHANGED=1
;;
esac
done

for file in $file_diff; do
# First check if file matches any pattern
matches_pattern=0
Expand Down
15 changes: 4 additions & 11 deletions buildkite/test-template-fastcheck.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{% set docker_image = "public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT" %}
{% set docker_image_amd = "rocm/vllm-ci:$BUILDKITE_COMMIT" %}
{% set skip_image_build = (skip_image_build | default("0")) %}
{% set requirements_changed = (requirements_changed | default("0")) %}
{% if skip_image_build == "1" and docker_image_override is defined and docker_image_override %}
{% set docker_image = docker_image_override %}
{% endif %}
Expand All @@ -10,9 +9,9 @@
{% set hf_home_efs = "/mnt/efs/hf_cache" %}
{% set hf_home_fsx = "/fsx/hf_cache" %}

{% macro vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,requirements_changed,fail_fast) -%}
{% macro vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,fail_fast) -%}
set {% if fail_fast == "true" %}-xeuo pipefail{% else %}-xuo{% endif %}
echo "SKIP_IMAGE_BUILD={{ skip_image_build }} REQUIREMENTS_CHANGED={{ requirements_changed }}"
echo "SKIP_IMAGE_BUILD={{ skip_image_build }}"
{% if skip_image_build == "1" %}

# Copy in the code from the checkout to the workspace
Expand All @@ -27,12 +26,6 @@ cp -a /vllm-workspace/vllm/* "$$SITEPKG/vllm/"
rm -rf /vllm-workspace/src || true
mkdir -p /vllm-workspace/src
mv /vllm-workspace/vllm /vllm-workspace/src/vllm

# If deps changed, re-install (system-wide in the container)
{% if requirements_changed == '1' %}
cd /vllm-workspace
uv pip install --system -r requirements/common.txt -r requirements/build.txt -r requirements/test.txt
{% endif %}
{% endif %}

(command -v nvidia-smi >/dev/null && nvidia-smi || true)
Expand Down Expand Up @@ -143,7 +136,7 @@ steps:
- "/bin/bash"
- "-xce"
- |
{{ vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,requirements_changed,fail_fast) | indent(14,true) }}
{{ vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,fail_fast) | indent(14,true) }}
environment:
- VLLM_USAGE_SOURCE=ci-test
- NCCL_CUMEM_HOST_ENABLE=0
Expand Down Expand Up @@ -208,7 +201,7 @@ steps:
- "/bin/bash"
- "-xce"
- |
{{ vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,requirements_changed,fail_fast) | indent(14,true) }}
{{ vllm_checkoutoverlay_script(step,default_working_dir,skip_image_build,fail_fast) | indent(14,true) }}
environment:
- VLLM_USAGE_SOURCE=ci-test
- NCCL_CUMEM_HOST_ENABLE=0
Expand Down