-
-
Notifications
You must be signed in to change notification settings - Fork 11.1k
[Kernel] Fix conflicting macro names for gguf kernels #15456
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
Conversation
Signed-off-by: SzymonOzog <szymon.ozog@gmail.com>
|
👋 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 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 🚀 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
I think we should separate the MoE kernel out from gguf_kernel.cu to a gguf_moe_kernel.cu and tight it to the moe extension. So that it would be much easier to maintain the GGUF kernel. (In fact, I'm planning an update for GGUF kernel to catchup the MMA support in llama.cpp, but haven't had enough bandwidth to do it yet)
Anyway, we can leave that to be done in a following PR.
|
Great! I've also started reading the MMA kernels from llama.cpp and will try to adapt MoE |
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com>
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com> Signed-off-by: Wes Medford <wryanmedford@gmail.com>
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com> Signed-off-by: Louis Ulmer <ulmerlouis@gmail.com>
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com>
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com>
…5456) Signed-off-by: SzymonOzog <szymon.ozog@gmail.com> Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
Just realized that the names for MoE macros are conflicting with MMQ ones at
vllm/csrc/quantization/gguf/mmq.cuh
Line 112 in 4f044b1
Not an issue at the moment because they are the same but might cause bugs in the future