Skip to content

Conversation

@tjtanaa
Copy link
Collaborator

@tjtanaa tjtanaa commented Aug 15, 2025

Purpose

Revert "[ROCm][AITER] Support AITER Rope ops in RotaryEmbedding Module.".

Requires more investigation.

Test Plan

Test Result

(Optional) Documentation Update


Essential Elements of an Effective PR Description Checklist
  • The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
  • The test plan, such as providing test command.
  • The test results, such as pasting the results comparison before and after, or e2e results
  • (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.

@mergify mergify bot added the rocm Related to AMD ROCm label Aug 15, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request reverts the support for AITER Rope ops in the RotaryEmbedding Module. The changes mostly involve removing code related to this feature. The revert appears correct in its goal, but it introduces code duplication for the yarn_get_mscale function. This function is modified in common.py while its previous version is copied into deepseek_scaling_rope.py to maintain functionality. This duplication is a potential maintenance issue and should be addressed.

Comment on lines +16 to +19
def yarn_get_mscale(scale: float = 1, mscale: float = 1) -> float:
if scale <= 1:
return 1.0
return 0.1 * mscale * math.log(scale) + 1.0
Copy link
Contributor

Choose a reason for hiding this comment

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

high

This PR introduces a duplicate definition of yarn_get_mscale, which was previously defined in vllm/model_executor/layers/rotary_embedding/common.py. The version in common.py is being changed to remove the mscale parameter, while this file requires it.

Code duplication can lead to maintenance issues where one instance is updated but the other is missed. If this function is specific to Deepseek, it should be renamed to indicate its local scope (e.g., _yarn_get_mscale_for_deepseek).

A better approach would be to avoid the duplication altogether. The yarn_get_mscale function in common.py should probably retain the mscale parameter to support this use case. It would be cleaner to revert the changes in common.py to keep the version with mscale and continue importing it here, rather than duplicating the code.

@tjtanaa tjtanaa marked this pull request as ready for review August 15, 2025 03:55
@DarkLight1337 DarkLight1337 enabled auto-merge (squash) August 15, 2025 03:57
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 15, 2025
@github-actions
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.

🚀

@DarkLight1337 DarkLight1337 merged commit b2f6c24 into vllm-project:main Aug 15, 2025
51 checks passed
yiliu30 pushed a commit to yiliu30/vllm-fork that referenced this pull request Aug 19, 2025
divakar-amd pushed a commit to divakar-amd/vllm_upstream that referenced this pull request Aug 20, 2025
djmmoss pushed a commit to djmmoss/vllm that referenced this pull request Aug 21, 2025
epwalsh pushed a commit to epwalsh/vllm that referenced this pull request Aug 28, 2025
xiao-llm pushed a commit to xiao-llm/vllm that referenced this pull request Aug 28, 2025
zhewenl pushed a commit to zhewenl/vllm that referenced this pull request Aug 28, 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 rocm Related to AMD ROCm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants