Skip to content

Commit 27abe13

Browse files
chore: remove dynamo from vllm whl version (#257)
Co-authored-by: Meenakshi Sharma <[email protected]>
1 parent 66ffd49 commit 27abe13

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

container/Dockerfile.vllm

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ RUN --mount=type=bind,source=./container/deps/requirements.txt,target=/tmp/requi
188188
# rebuilds from unrelated source code changes
189189
ARG VLLM_REF="0.7.2"
190190
ARG VLLM_PATCH="vllm_v${VLLM_REF}-dynamo-kv-disagg-patch.patch"
191-
ARG VLLM_VERSION_PATCH_SUFFIX="dynamo"
192191
ARG VLLM_PATCHED_PACKAGE_NAME="ai_dynamo_vllm"
193192
RUN --mount=type=bind,source=./container/deps/,target=/tmp/deps \
194193
mkdir /tmp/vllm && \
@@ -198,17 +197,13 @@ RUN --mount=type=bind,source=./container/deps/,target=/tmp/deps \
198197
wheel unpack *.whl && \
199198
cd vllm-${VLLM_REF}/ && \
200199
patch -p1 < /tmp/deps/vllm/${VLLM_PATCH} && \
201-
sed -i "s/__version__ = version = '\(.*\)'/__version__ = version = '\1+${VLLM_VERSION_PATCH_SUFFIX}'/g; s/__version_tuple__ = version_tuple = (\(.*\))/__version_tuple__ = version_tuple = (\1, '${VLLM_VERSION_PATCH_SUFFIX}')/g" vllm/_version.py && \
202200
# Rename the package from vllm to ai_dynamo_vllm
203-
mv vllm-${VLLM_REF}.dist-info ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info && \
204-
sed -i "s/${VLLM_REF}/${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info/METADATA && \
205-
sed -i "s/vllm-${VLLM_REF}/vllm-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info/RECORD && \
206-
# Rename the package from vllm to ai_dynamo_vllm
207-
sed -i "s/^Name: vllm/Name: ${VLLM_PATCHED_PACKAGE_NAME}/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info/METADATA && \
201+
mv vllm-${VLLM_REF}.dist-info ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}.dist-info && \
202+
sed -i "s/^Name: vllm/Name: ${VLLM_PATCHED_PACKAGE_NAME}/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}.dist-info/METADATA && \
208203
# Update wheel tag from linux_x86_64 to manylinux1_x86_64 in WHEEL file
209-
sed -i 's/Tag: cp38-abi3-linux_x86_64/Tag: cp38-abi3-manylinux1_x86_64/g' ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info/WHEEL && \
204+
sed -i 's/Tag: cp38-abi3-linux_x86_64/Tag: cp38-abi3-manylinux1_x86_64/g' ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}.dist-info/WHEEL && \
210205
# Also update the tag in RECORD file to match
211-
sed -i "s/-cp38-abi3-linux_x86_64.whl/-cp38-abi3-manylinux1_x86_64.whl/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}+${VLLM_VERSION_PATCH_SUFFIX}.dist-info/RECORD && \
206+
sed -i "s/-cp38-abi3-linux_x86_64.whl/-cp38-abi3-manylinux1_x86_64.whl/g" ${VLLM_PATCHED_PACKAGE_NAME}-${VLLM_REF}.dist-info/RECORD && \
212207
mkdir -p /workspace/dist && \
213208
wheel pack . --dest-dir /workspace/dist && \
214209
uv pip install /workspace/dist/${VLLM_PATCHED_PACKAGE_NAME}-*.whl

container/deps/vllm/tests/test_patch_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
@pytest.mark.skipif(vllm is None, reason="Skipping vllm tests, vllm not installed")
2828
def test_version():
2929
# Verify that the image has the patched version of vllm
30-
assert vllm.__version__.endswith("+dynamo") # type: ignore
30+
assert vllm.__version__.endswith("0.7.2") # type: ignore

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ Repository = "https://github.com/ai-dynamo/dynamo.git"
5353

5454
[project.optional-dependencies]
5555
all = [
56-
"ai-dynamo-vllm==0.7.2+dynamo",
56+
"ai-dynamo-vllm==0.7.2",
5757
"nixl",
5858
]
5959

6060
vllm = [
61-
"ai-dynamo-vllm==0.7.2+dynamo"
61+
"ai-dynamo-vllm==0.7.2"
6262
]
6363

6464
[project.scripts]

0 commit comments

Comments
 (0)