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: 1 addition & 1 deletion .github/workflows/bot_pr_create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- name: Get vLLM version
run: |
VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
echo "VLLM_COMMIT=https://github.com/vllm-project/vllm/commit/$VLLM_COMMIT" >> "$GITHUB_ENV"

- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get update -y && \

ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
# For lint purpose, actually we need make a main2main matching.
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_test_full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
name: e2e-full
strategy:
matrix:
vllm_version: [14acf429ac08b6d538ca6feb3e06b6d13895804d]
vllm_version: [29e48707e8144b78dd5d756f793c26a405043f3d]
needs: [changes]
if: ${{ needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.e2e_tracker == true }}
uses: ./.github/workflows/_e2e_test.yaml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr_test_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
lint:
uses: ./.github/workflows/_pre_commit.yml
with:
vllm: 14acf429ac08b6d538ca6feb3e06b6d13895804d
vllm: 29e48707e8144b78dd5d756f793c26a405043f3d
changes:
runs-on: linux-aarch64-a2b3-0
outputs:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
if: ${{ needs.lint.result == 'success' && (needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.ut_tracker == 'true') }}
strategy:
matrix:
vllm_version: [14acf429ac08b6d538ca6feb3e06b6d13895804d]
vllm_version: [29e48707e8144b78dd5d756f793c26a405043f3d]
uses: ./.github/workflows/_unit_test.yaml
with:
vllm: ${{ matrix.vllm_version }}
Expand All @@ -102,7 +102,7 @@ jobs:
name: e2e-light
strategy:
matrix:
vllm_version: [14acf429ac08b6d538ca6feb3e06b6d13895804d]
vllm_version: [29e48707e8144b78dd5d756f793c26a405043f3d]
# Note (yikun): If CI resource are limited we can split job into two chain jobs
needs: [lint, changes]
# only trigger e2e test after lint passed and the change is e2e related with pull request.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule_codecov_refresh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: refresh codecov
strategy:
matrix:
vllm_version: [14acf429ac08b6d538ca6feb3e06b6d13895804d]
vllm_version: [29e48707e8144b78dd5d756f793c26a405043f3d]
uses: ./.github/workflows/_unit_test.yaml
with:
vllm: ${{ matrix.vllm_version }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.310p
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.310p.openEuler
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.a3
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.a3.openEuler
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.openEuler
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL} && \

# Install vLLM
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
ARG VLLM_COMMIT=14acf429ac08b6d538ca6feb3e06b6d13895804d
ARG VLLM_COMMIT=29e48707e8144b78dd5d756f793c26a405043f3d
RUN git init /vllm-workspace/vllm && \
git -C /vllm-workspace/vllm fetch --depth 1 $VLLM_REPO $VLLM_COMMIT && \
git -C /vllm-workspace/vllm checkout FETCH_HEAD
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/singlecard/test_cpu_offloading.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import msgspec
import msgspec.msgpack
import pytest
import zmq
from vllm import LLM, SamplingParams, TokensPrompt
from vllm.config import KVEventsConfig, KVTransferConfig
Expand Down Expand Up @@ -127,6 +128,7 @@ def _accuracy_test(llm: LLM, subscriber: MockSubscriber):
assert success_count >= 0.5 * test_count


@pytest.mark.skip(reason="cpu offload connector is deprecated.")
def test_cpu_offloading() -> None:
"""
Tests OffloadingConnector with CPUOffloadingSpec.
Expand Down
Loading
Loading