Skip to content

Commit 3710127

Browse files
foreverlmsclaude
andcommitted
deps: allow vllm to coexist with cu128/cu130 (torch 2.10.0) groups
The Dockerfile always syncs --group=<cuda> --group=vllm, but vllm was in the same [tool.uv] conflict set as every cuda group, so 'uv sync' rejected the combination. vllm pins torch==2.10.0, which the cu128/cu130 torch 2.10.0+cuXXX local builds satisfy; only the cu130-torch213 groups (torch 2.13.0) are truly incompatible. Move vllm into a conflict set with just the torch-2.13 groups so cu128+vllm and cu130+vllm resolve. Verified with 'uv sync --locked --dry-run'. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 9dac66c commit 3710127

2 files changed

Lines changed: 2518 additions & 2686 deletions

File tree

pyproject.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,21 @@ repository = "https://github.com/NVIDIA/cosmos-framework"
316316
required-version = ">=0.11.3"
317317
conflicts = [
318318
[
319-
{group = "vllm"},
320319
{group = "cu128"},
321320
{group = "cu128-train"},
322321
{group = "cu130"},
323322
{group = "cu130-train"},
324323
{group = "cu130-torch213"},
325324
{group = "cu130-torch213-train"},
326325
],
326+
# vllm pins torch==2.10.0, which is satisfied by the cu128/cu130 torch 2.10.0
327+
# local builds, so vllm may combine with those. It is incompatible only with
328+
# the torch 2.13.0 groups; keep those mutually exclusive with vllm.
329+
[
330+
{group = "vllm"},
331+
{group = "cu130-torch213"},
332+
{group = "cu130-torch213-train"},
333+
],
327334
]
328335
override-dependencies = [
329336
# Lower bound defeats robomimic/robosuite's old numpy 1.x pins; upper bound

0 commit comments

Comments
 (0)