Skip to content
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

[Kernel] Support MulAndSilu #11624

Merged
merged 7 commits into from
Jan 15, 2025
Merged

Conversation

jeejeelee
Copy link
Collaborator

@jeejeelee jeejeelee commented Dec 30, 2024

Currently there are 3 models in vllm that use this activation function: jais, ultravox and molmo. Implementing this kernel helps improve the performance of these models.

PS : It appears JAIS has different activation function choices, so keeping it unchanged for now.
ping @WoosukKwon @tlrmchlsmth

Signed-off-by: Jee Jee Li <[email protected]>
Signed-off-by: Jee Jee Li <[email protected]>
Copy link

👋 Hi! Thank you for contributing to the vLLM project.
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 do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

@jeejeelee jeejeelee marked this pull request as draft December 30, 2024 09:37
Signed-off-by: Jee Jee Li <[email protected]>
@jeejeelee jeejeelee changed the title [Kernel] Support MulAndAndSilu [Kernel] Support MulAndSilu Dec 30, 2024
Signed-off-by: Jee Jee Li <[email protected]>
@jeejeelee jeejeelee marked this pull request as ready for review December 30, 2024 14:36
csrc/activation_kernels.cu Outdated Show resolved Hide resolved
@comaniac
Copy link
Collaborator

IIRC we had this kernel before but removed, because of the introduction of torch compile?
cc @youkaichao

Copy link

mergify bot commented Jan 1, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @jeejeelee.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Jan 1, 2025
Signed-off-by: Jee Jee Li <[email protected]>
@mergify mergify bot removed the needs-rebase label Jan 2, 2025
@jeejeelee
Copy link
Collaborator Author

IIRC we had this kernel before but removed, because of the introduction of torch compile? cc @youkaichao

@comaniac Thanks for your review. If there are other considerations that don't support this operator, I will close this PR, also cc @youkaichao

@youkaichao
Copy link
Member

IIRC we had this kernel before but removed, because of the introduction of torch compile? cc @youkaichao

I didn't remember we removed this kernel, cc @WoosukKwon if i miss anything.

MulAndSilu should be fused with torch.compile, but I don't have strong opinions on adding the fused kernel when torch.compile is not used.

Copy link
Collaborator

@WoosukKwon WoosukKwon left a comment

Choose a reason for hiding this comment

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

LGTM! Sorry for the late review.

Copy link

mergify bot commented Jan 13, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @jeejeelee.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Jan 13, 2025
Signed-off-by: Jee Jee Li <[email protected]>
@jeejeelee jeejeelee added ready ONLY add when PR is ready to merge/full CI is needed and removed needs-rebase labels Jan 14, 2025
@jeejeelee jeejeelee enabled auto-merge (squash) January 15, 2025 01:23
@jeejeelee jeejeelee merged commit 42f5e7c into vllm-project:main Jan 15, 2025
90 of 91 checks passed
@jeejeelee jeejeelee deleted the support-mulandsilu branch January 15, 2025 02:42
ice-tong pushed a commit to ice-tong/vllm that referenced this pull request Jan 18, 2025
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.

5 participants