Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
8543a61
Add sync worker to detect changes and merge with fork
Zhuul Apr 23, 2025
fe88462
Merge pull request #1 from Zhuul/add-sync-worker
Zhuul Apr 23, 2025
1b6563f
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 23, 2025
a5817be
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 24, 2025
35558b2
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 25, 2025
80f3d61
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 26, 2025
bf0272d
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 27, 2025
ee6a510
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 28, 2025
c451ce7
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 29, 2025
140da88
Merge remote-tracking branch 'upstream/main'
github-actions[bot] Apr 30, 2025
1d76899
Add improved error handling and retry mechanism
Zhuul May 6, 2025
a6407db
Merge branch 'vllm-project:main' into main
Zhuul May 6, 2025
0f29a43
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 7, 2025
beef967
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 8, 2025
c47d363
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 9, 2025
f33b888
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 10, 2025
be139dd
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 11, 2025
019e834
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 12, 2025
deda756
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 13, 2025
8458f5e
Update LICENSE
Zhuul May 13, 2025
61192e6
Merge remote-tracking branch 'upstream/main'
github-actions[bot] May 13, 2025
e82b373
Create test_vllm.py
Zhuul May 14, 2025
c513e85
Revert "Update LICENSE"
Zhuul May 14, 2025
4ffea43
Update sync_with_upstream.yml
Zhuul Jul 28, 2025
8221a4d
Update sync_with_upstream.yml
Zhuul Jul 28, 2025
4ba01a2
Merge branch 'vllm-project:main' into main
Zhuul Jul 28, 2025
4b16052
[Enhancement] Add run-vllm-dev.ps1 script for launching vLLM developm…
Zhuul Jul 28, 2025
ce1ca96
Add troubleshooting and setup scripts for WSL2 + Podman + GPU
Zhuul Aug 8, 2025
982a0d2
Update sync_with_upstream.yml
Zhuul Aug 8, 2025
1a79898
quick fix
Zhuul Aug 8, 2025
2b84d21
Merge branch 'vllm-project:main' into main
Zhuul Aug 8, 2025
670a06d
Merge branch 'main' of https://github.com/Zhuul/vllm
Zhuul Aug 8, 2025
31d2d18
Update sync_with_upstream.yml
Zhuul Aug 13, 2025
9de7e16
feat: Add RTX 5090 (sm_120) support and container optimizations
Zhuul Aug 13, 2025
d1db810
build: add ENABLE_MACHETE option + fix arch list duplication for sm_1…
Zhuul Aug 13, 2025
004c22d
chore(extras): keep all dev-container and helper changes in extras/ o…
Zhuul Aug 14, 2025
1560347
chore(sync): restore repo to upstream/main except extras/; revert loc…
Zhuul Aug 14, 2025
da32b3b
feat: Add enhanced Podman scripts for vLLM development with GPU support
Zhuul Aug 14, 2025
95a3dcb
chore: restore .buildkite/run-multi-node-test.sh to upstream/main
Zhuul Aug 14, 2025
b477863
ci: use GITHUB_TOKEN in sync_with_upstream workflow and set permissions
Zhuul Aug 14, 2025
899799e
ci: revert sync_with_upstream to GH_PAT-based auth
Zhuul Aug 14, 2025
dacb7c0
ci: trigger sync_with_upstream workflow
Zhuul Aug 14, 2025
ba5f570
Merge remote-tracking branch 'upstream/main'
Zhuul Aug 14, 2025
2f61bd9
Delete extras/CONTAINER_SETUP_COMPLETE.md
Zhuul Aug 14, 2025
059bd49
extras: CUDA 12.9 dev container w/ cu129 nightly; enable sm_120; add …
Zhuul Aug 14, 2025
a3507b1
enhance Dockerfile and setup scripts for improved build performance a…
Zhuul Aug 14, 2025
05f8feb
refactor: streamline Dockerfile dependencies and enhance run script w…
Zhuul Aug 14, 2025
91aac9f
Merge branch 'main' of https://github.com/Zhuul/vllm
Zhuul Aug 14, 2025
334f5ee
Update sync_with_upstream.yml
Zhuul Aug 14, 2025
d4a7d41
enhance: add NCCL support and improve dev setup scripts for better GP…
Zhuul Aug 14, 2025
2c7a70b
Merge branch 'main' of https://github.com/Zhuul/vllm
Zhuul Aug 14, 2025
9ae0e5d
enhance: add rsync to Dockerfile dependencies and improve dev setup s…
Zhuul Aug 14, 2025
d7e0b0e
enhance: add progress display option for dev setup scripts and update…
Zhuul Aug 14, 2025
a261e7f
enhance: make progress watcher fully opt-in, disabling auto-enable on…
Zhuul Aug 14, 2025
ee74860
enhance: add initial empty files for various scripts and documentatio…
Zhuul Aug 14, 2025
5839c61
enhance: add WorkVolume and WorkDirHost parameters to dev launcher sc…
Zhuul Aug 16, 2025
2df711b
cleanup: remove deprecated test scripts to streamline the codebase
Zhuul Aug 16, 2025
4f67b52
feat: Introduce Podman support and deprecate legacy scripts
Zhuul Aug 16, 2025
7978e52
Merge branch 'vllm-project:main' into main
Zhuul Aug 16, 2025
66d45f7
Merge branch 'vllm-project:main' into main
Zhuul Aug 16, 2025
e152b58
Merge branch 'vllm-project:main' into main
Zhuul Aug 19, 2025
9263e4d
Initial plan
Copilot Sep 2, 2025
0a29077
Fix pre-commit linting errors
Copilot Sep 2, 2025
d6608d2
Remove accidental node_modules commit
Copilot Sep 2, 2025
05a4465
Merge pull request #53 from Zhuul/copilot/fix-fa0d98c5-a3dd-4ebb-9656…
Zhuul Sep 2, 2025
feb1998
Merge branch 'vllm-project:main' into main
Zhuul Sep 2, 2025
0f3e9da
feat: Update Dockerfile and build environment for improved CUDA suppo…
Zhuul Sep 2, 2025
2101854
Merge branch 'main' of https://github.com/Zhuul/vllm
Zhuul Sep 2, 2025
91ca936
Merge remote-tracking branch 'upstream/main'
Zhuul Sep 2, 2025
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
1 change: 1 addition & 0 deletions .github/ci-trigger-20250814-1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
trigger: sync_with_upstream
80 changes: 80 additions & 0 deletions .github/workflows/sync_with_upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Sync with Upstream

on:
schedule:
- cron: '0 0 * * *' # Runs daily at midnight
push:
branches:
- main

jobs:
sync:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Git
run: |
git config --global user.name 'Zhuul'
git config --global user.email '[email protected]'

- name: Add upstream remote
run: git remote add upstream https://github.com/vllm-project/vllm.git

- name: Fetch upstream changes
run: git fetch upstream

- name: Merge upstream changes
id: merge
run: |
git checkout main
git merge upstream/main || {
echo "Merge conflict detected. Creating a new branch for manual resolution."
git checkout -b "merge-conflict-$(date +%Y%m%d%H%M%S)"
git push origin HEAD
echo "conflict=true" >> "$GITHUB_OUTPUT"
exit 1
}
echo "conflict=false" >> "$GITHUB_OUTPUT"

- name: Check for workflow file changes
id: workflow_change
run: |
if git diff --name-only upstream/main | grep '^.github/workflows/'; then
echo "workflow_changed=true" >> "$GITHUB_OUTPUT"
else
echo "workflow_changed=false" >> "$GITHUB_OUTPUT"
fi

- name: Set up PAT authentication
env:
GH_PAT: ${{ secrets.GH_PAT }}
run: |
git remote set-url origin "https://Zhuul:${GH_PAT}@github.com/Zhuul/vllm.git"

- name: Push changes if no workflow files changed
if: steps.workflow_change.outputs.workflow_changed == 'false' && steps.merge.outputs.conflict == 'false'
run: git push origin main

- name: Create Pull Request for workflow file changes
if: steps.workflow_change.outputs.workflow_changed == 'true' && steps.merge.outputs.conflict == 'false'
uses: peter-evans/create-pull-request@v6

Check warning on line 65 in .github/workflows/sync_with_upstream.yml

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

.github/workflows/sync_with_upstream.yml#L65

An action sourced from a third-party repository on GitHub is not pinned to a full length commit SHA. Pinning an action to a full length commit SHA is currently the only way to use an action as an immutable release.
with:
token: ${{ secrets.GH_PAT }}
commit-message: "Sync with upstream: update workflow files"
title: "Sync with upstream: update workflow files"
body: |
This PR was automatically created because workflow files were updated while syncing with upstream.
Please review and merge.
branch: workflow-sync-${{ github.run_id }}
base: main

- name: Send notification if merge conflict
if: steps.merge.outputs.conflict == 'true'
run: |
echo "Merge conflict detected. Manual intervention required."
# Add your notification logic here (e.g., send an email, create an issue, etc.)
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,5 @@ shellcheck*/
csrc/moe/marlin_moe_wna16/kernel_*

# Ignore ep_kernels_workspace folder
ep_kernels_workspace/
ep_kernels_workspace/node_modules/
package*.json
2 changes: 2 additions & 0 deletions docs/contributing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ See <gh-file:LICENSE>.
Depending on the kind of development you'd like to do (e.g. Python, CUDA), you can choose to build vLLM with or without compilation.
Check out the [building from source][build-from-source] documentation for details.

For a containerized developer workflow, see Podman-first dev: `docs/contributing/podman-dev.md`.

For an optimized workflow when iterating on C++/CUDA kernels, see the [Incremental Compilation Workflow](./incremental_build.md) for recommendations.

### Building the docs with MkDocs
Expand Down
41 changes: 41 additions & 0 deletions docs/contributing/podman-dev.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
title: Podman-first Development Environment
---

This guide documents the Podman-first development workflow for building vLLM from source with CUDA and PyTorch nightly.

Primary entrypoint

- Windows (PowerShell): `./extras/podman/run.ps1`
- Linux/macOS (bash): `extras/podman/run.sh`

Legacy launchers at `extras/run-vllm-dev.ps1` and `extras/run-vllm-dev.sh` are deprecated and forward to the Podman wrappers.

Prerequisites

- Podman with GPU CDI enabled (on Windows, use Podman Desktop + WSL; ensure NVIDIA drivers and CUDA are installed on the host).
- Optional named volume for build/work space, e.g., `vllm-work`.

Quick start

Windows (PowerShell):

```powershell
./extras/podman/run.ps1 -Build
./extras/podman/run.ps1 -GPUCheck
./extras/podman/run.ps1 -Setup -WorkVolume vllm-work -Progress
```

Linux/macOS (bash):

```bash
extras/podman/run.sh --build
extras/podman/run.sh --gpu-check
extras/podman/run.sh --setup --work-volume vllm-work --progress
```

Notes

- The image uses CUDA 12.9 UBI9 and installs PyTorch nightly cu129 first to ensure latest GPU arch support (including sm_120 when present).
- The setup step performs an editable vLLM install without downgrading torch family packages.
- Use a named Podman volume for `/opt/work` to avoid `/tmp` tmpfs pressure and to speed up rebuilds.
39 changes: 39 additions & 0 deletions extras/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Reduce build context to avoid Windows Podman tar write issues
.git
.github
.vscode
.venv
venv
node_modules
build
dist
csrc/
vllm/
benchmarks/
docs/
examples/
tests/
**/__pycache__
**/*.pyc
**/*.pyo
**/*.pyd
**/*.so
**/*.o
**/*.a
**/*.dll
**/*.dylib
extras/build.log
extras/*.bak
extras/tools/
extras/run-vllm-dev-*.ps1
extras/run-vllm-dev-*.sh
extras/*wsl*
extras/*docker*.ps1

!extras/Dockerfile
!extras/run-vllm-dev.ps1
!extras/run-vllm-dev.sh
!extras/dev-setup.sh
requirements/
pyproject.toml
setup.py
Loading