Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions buildkite/test-template-amd.j2
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{% set cov_enabled = (cov_enabled == "1") %}
{% set docker_image = "public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT" %}
{% set docker_image_torch_nightly = "public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT-torch-nightly" %}
{% set docker_image_cu118 = "public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT-cu118" %}
{% set docker_image_cpu = "public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT-cpu" %}
{% if branch == "main" %}
{% set docker_image = "public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$BUILDKITE_COMMIT" %}
{% set docker_image_latest = "public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:latest" %}
{% set docker_image_torch_nightly = "public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$BUILDKITE_COMMIT-torch-nightly" %}
{% set docker_image_cu118 = "public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$BUILDKITE_COMMIT-cu118" %}
{% set docker_image_cpu = "public.ecr.aws/q9t5s3a7/vllm-ci-postmerge-repo:$BUILDKITE_COMMIT-cpu" %}
{% endif %}
Expand Down
16 changes: 11 additions & 5 deletions buildkite/test-template-ci.j2
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ steps:
{% endif %}
{% endfor %}

- group: "vllm against torch nightly"
- group: "vLLM Against PyTorch Nightly"
depends_on: ~
steps:
{% if nightly != "1" %}
Expand All @@ -489,9 +489,13 @@ steps:
{% else %}
queue: cpu_queue_premerge_us_east_1
{% endif %}
timeout_in_minutes: 360
timeout_in_minutes: 600
commands:
- "aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/q9t5s3a7"
- "aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 936637512419.dkr.ecr.us-east-1.amazonaws.com"
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this matches standard Dockerfile build flags both here and down below. The key is that vLLM builds with PT nightlies and standard vLLM builds should be identical here minus the --build-arg PYTORCH_NIGHTLY=1 flag. Unfortunately we can't unify further yet, but we can do that in some additional commits.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the main Nvidia GPU build this has now moved to buildkite/scripts/ci-bake.sh, but we should still keep these incremental changes towards what the main build was doing.

- "docker buildx create --name vllm-builder --driver docker-container --use"
- "docker buildx inspect --bootstrap"
- "docker buildx ls"
- |
#!/bin/bash
if [[ -z $(docker manifest inspect {{ docker_image_torch_nightly }}) ]]; then
Expand All @@ -501,15 +505,17 @@ steps:
exit 0
fi
- >
docker build
--file docker/Dockerfile.nightly_torch
docker buildx build --file docker/Dockerfile
--build-arg max_jobs=16
--build-arg buildkite_commit=$BUILDKITE_COMMIT
--build-arg USE_SCCACHE=1
--build-arg PYTORCH_NIGHTLY=1
--build-arg TORCH_CUDA_ARCH_LIST="8.0 8.9 9.0 10.0"
--build-arg FI_TORCH_CUDA_ARCH_LIST="8.0 8.9 9.0a 10.0a"
--tag {{ docker_image_torch_nightly }}
--push
--target test
--progress plain .
- "docker push {{ docker_image_torch_nightly }}"
env:
DOCKER_BUILDKIT: "1"
retry:
Expand Down