Skip to content

[model] make llama4 compatible with pure dense layers #17315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025

Conversation

luccafong
Copy link
Collaborator

make llama4 compatible with pure dense layers when interleave_moe_layer_step == 0 (no moe layers)

Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Signed-off-by: Lucia Fang <fanglu@fb.com>
@luccafong luccafong force-pushed the llama-dense-layers branch from ea54eaf to ae67aa8 Compare April 28, 2025 17:41
@luccafong luccafong marked this pull request as ready for review April 28, 2025 17:43
@luccafong luccafong requested a review from houseroad April 28, 2025 22:37
Copy link
Collaborator

@houseroad houseroad left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@houseroad houseroad added the ready ONLY add when PR is ready to merge/full CI is needed label Apr 28, 2025
@DarkLight1337 DarkLight1337 merged commit b4ac4fa into vllm-project:main Apr 29, 2025
61 checks passed
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
@ayanbagcts
Copy link

Looks like this code fix has not been pushed into the docker hub yet. I’m using vLLM docker image v0.8.5.post1 and still getting the same divide by zero error while deploying Llama-Guard-4-12B model. Any tentative date when this fix will be available on docker hub ?

@DarkLight1337
Copy link
Member

RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
…7315)

Signed-off-by: Lucia Fang <fanglu@fb.com>
Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
dtrifiro pushed a commit to red-hat-data-services/vllm that referenced this pull request May 13, 2025
dtrifiro pushed a commit to red-hat-data-services/vllm that referenced this pull request May 13, 2025
Syncing midstream NM fork to Upstream tag of
[v0.8.5.post1](https://github.com/vllm-project/vllm/tree/v0.8.5.post1) +
cherry pick of
vllm-project@be633fb
needed for benchmarks +
[CP](neuralmagic/nm-vllm-ent@1fe447d)
for compressed tensor bump +
[CP](vllm-project#17677) for lora on AMD +
[CP](vllm-project#17315) for llama4 w/ pure
dense layers

```
commit 31c73ba (HEAD -> upstream-v0.8.5, nm-fork/upstream-v0.8.5)
Author: Chauncey <chaunceyjiang@gmail.com>
Date:   Wed Apr 30 15:11:04 2025 +0800

    [Bugfix] Fix AttributeError: 'State' object has no attribute 'engine_client' (vllm-project#17434)
    
    Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>

commit f8db0bd
Author: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com>
Date:   Fri May 2 14:01:38 2025 -0400

    [BugFix][Attention] Fix sliding window attention in V1 giving incorrect results (vllm-project#17574)
    
    Signed-off-by: Lucas Wilkinson <lwilkinson@neuralmagic.com>

commit e335c34
Author: Robert Shaw <114415538+robertgshaw2-redhat@users.noreply.github.com>
Date:   Fri May 2 04:07:03 2025 -0400

    [BugFix] Fix Memory Leak (vllm-project#17567)
    
    Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

commit cc463fe
Merge: 1e358ff ba41cc9
Author: Selbi Nuryyeva <selbi@redhat.com>
Date:   Tue Apr 29 12:34:57 2025 -0400

    Merge branch 'tag-upstream-v0.8.5' into upstream-v0.8.5

commit ba41cc9 (tag: v0.8.5, tag-upstream-v0.8.5)
Author: Michael Goin <mgoin64@gmail.com>
Date:   Mon Apr 28 16:20:24 2025 -0600

    [Model] Add tuned triton fused_moe configs for Qwen3Moe (vllm-project#17328)
    
    Signed-off-by: mgoin <mgoin64@gmail.com>

commit dcbac4c
Author: Simon Mo <simon.mo@hey.com>
Date:   Mon Apr 28 14:12:01 2025 -0700

    [Model] Qwen3 Dense FP8 Compat Fixes (vllm-project#17318)
    
    Signed-off-by: simon-mo <xmo@berkeley.edu>
[...]
```

Commands
```
git fetch upstream
git checkout -b upstream-v0.8.5
git merge upstream/v0.8.5
git cherry-pick be633fb
```

TEST PLAN
accept sync:
https://github.com/neuralmagic/nm-cicd/actions/runs/14841223552
related PR in cicd: neuralmagic/nm-cicd#99
release workflow:
https://github.com/neuralmagic/nm-cicd/actions/runs/14845693864
zzzyq pushed a commit to zzzyq/vllm that referenced this pull request May 24, 2025
…7315)

Signed-off-by: Lucia Fang <fanglu@fb.com>
Signed-off-by: Yuqi Zhang <yuqizhang@google.com>
minpeter pushed a commit to minpeter/vllm that referenced this pull request Jun 24, 2025
…7315)

Signed-off-by: Lucia Fang <fanglu@fb.com>
Signed-off-by: minpeter <kali2005611@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants