[MODELRUNNERV2]fix penality ops#7013
Conversation
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request introduces a significant refactoring of the penalty application mechanism within Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
|
👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:
If CI fails, you can run linting and testing checks locally according Contributing and Testing. |
There was a problem hiding this comment.
Code Review
This pull request refactors the penalty application logic, separating it from temperature application and adding support for speculative decoding. The changes are implemented in a Triton kernel, its Python wrapper, and the corresponding test file. A critical out-of-bounds read vulnerability has been identified in the apply_penalties function within vllm_ascend/worker/v2/sample/penalties.py. This vulnerability stems from penalty tensors being incorrectly sliced by the batch size (num_tokens) instead of the number of sequence slots, which could lead to memory corruption or information leakage. Additionally, a high-severity performance issue was found in the Triton kernel.
| penalties = torch.stack([ | ||
| repetition_penalty[:num_tokens], | ||
| frequency_penalty[:num_tokens], | ||
| presence_penalty[:num_tokens] | ||
| ], dim=1).contiguous() |
There was a problem hiding this comment.
A critical out-of-bounds read vulnerability exists here. The penalties tensor is incorrectly constructed by slicing repetition_penalty, frequency_penalty, and presence_penalty up to num_tokens. While num_tokens is the batch size, the Triton kernel indexes these tensors by req_state_idx (sequence slot index), which can exceed num_tokens. This mismatch can lead to an out-of-bounds read, potentially causing information leakage from adjacent GPU memory or a GPU kernel/driver crash. The slicing should be removed to pass the full penalty tensors to the kernel, as suggested.
| penalties = torch.stack([ | |
| repetition_penalty[:num_tokens], | |
| frequency_penalty[:num_tokens], | |
| presence_penalty[:num_tokens] | |
| ], dim=1).contiguous() | |
| penalties = torch.stack([ | |
| repetition_penalty, | |
| frequency_penalty, | |
| presence_penalty | |
| ], dim=1).contiguous() |
| # Early return to avoid loading logits. | ||
| return | ||
|
|
||
| bit_masks = tl.full((INNER_BLOCK_SIZE // 32, 32), 1, dtype=tl.int32) << tl.arange(0, 32) |
There was a problem hiding this comment.
The creation of bit_masks is inefficient. It constructs a large tensor of shape (INNER_BLOCK_SIZE // 32, 32) where each row is identical. This can be simplified to create a (1, 32) tensor and rely on Triton's broadcasting capabilities. This change will improve both readability and performance by avoiding the allocation and manipulation of a large, redundant tensor.
| bit_masks = tl.full((INNER_BLOCK_SIZE // 32, 32), 1, dtype=tl.int32) << tl.arange(0, 32) | |
| bit_masks = (1 << tl.arange(0, 32))[None, :] |
16a52f7 to
d26f70e
Compare
| self.penalties_state.prompt_bin_mask, | ||
| self.penalties_state.output_bin_counts, | ||
| self.num_speculative_tokens, | ||
| ) |
There was a problem hiding this comment.
The function don't follow vllm's commit 4034c3d32e30d01639459edd3ab486f56993876d.
you don't need to modify sampler, please just follow up #7110
|
please mention RFC #5208 on your PR. |
Signed-off-by: shiyuan680 <917935075@qq.com>
…to qwen3next_graph * 'main' of https://github.com/vllm-project/vllm-ascend: (88 commits) [main][bugfix] Fixed the problem of speculative decoding in FULL mode (vllm-project#7148) fixed fia pad logic in graph mode. (vllm-project#7144) [Doc] fix DSV3.1 PD configs (vllm-project#7187) refactor: add a check before layer_sharding logging (vllm-project#7186) [Build] Add support for Ascend950 chip (vllm-project#7151) Revert "[CI] fix skiped e2e test when upgrade vllm version (vllm-project#6654)" (vllm-project#7166) [MODELRUNNERV2]fix penality ops (vllm-project#7013) [Bugfix][LoRA] Fix the issue when enable LoRA + tp + fully_sharded_loras (vllm-project#6650) [KV Pool]get_num_new_matched_tokens return 0 if token length < block_size (vllm-project#7146) [CI] Build Image for v0.16.0rc1 (vllm-project#7155) [CI] Skip `test_mooncake_layerwise_connector.py` in `ut` (vllm-project#7147) [BugFix]Fix recomputed scheduler bug (vllm-project#7137) [Model] Support Minimax-m2.5 on NPU (vllm-project#7105) [P/D]Mooncake Layerwise Connector supports hybrid attention manager with multiple kvcache groups (vllm-project#7022) Add patch_qwen3_5 for triton ops fused_recurrent_gated_delta_rule (vllm-project#7109) [Doc][ReleaseNote] Add release notes for v0.16.0rc1 (vllm-project#7067) [Misc] Download on both hk and guiyang region (vllm-project#7129) [bugdix] The problem that the w4a8 weight fails to be loaded when the EP is not enabled is resolved. (vllm-project#7090) [eagle][cp] fix eagle_cp enable bug2 (vllm-project#7079) [CI]Upgrade niglty multi-node-tests max-parallel to 2 (vllm-project#7035) ...
### What this PR does / why we need it? fix penality ops for new version, and achieved a 10% performance improvement ### How was this patch tested? pytest tests/e2e/nightly/single_node/ops/singlecard_ops/triton/test_penality.py - vLLM version: v0.16.0 - vLLM main: vllm-project/vllm@15d76f7 Signed-off-by: shiyuan680 <917935075@qq.com>
What this PR does / why we need it?
fix penality ops for new version, and achieved a 10% performance improvement
Does this PR introduce any user-facing change?
How was this patch tested?
pytest tests/e2e/nightly/single_node/ops/singlecard_ops/triton/test_penality.py