Main2main 0324

[22dimensions]

What this PR does / why we need it?

Does this PR introduce any user-facing change?

How was this patch tested?

• vLLM version: v0.18.0
• vLLM main: vllm-project/vllm@ed359c4

[gemini-code-assist]

Summary of Changes

Hello, I'm Gemini Code Assist¹! 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 primarily focuses on maintaining compatibility and updating documentation. It adjusts the initialization of certain token-related arrays in the NPU input batch worker to accommodate different vLLM versions, specifically handling changes introduced after version 0.18.0. Additionally, it updates the versioning policy documentation to reflect the latest compatible vLLM commit for the main branch.

Highlights

• Documentation Update: The vLLM commit hash in the docs/source/community/versioning_policy.md file has been updated to reflect a newer version for the main branch compatibility.
• Version-Specific Initialization: Conditional logic was introduced in vllm_ascend/worker/npu_input_batch.py to initialize num_tokens_no_spec and num_prompt_tokens differently based on whether the vLLM version is 0.18.0 or not, ensuring compatibility across versions.

🧠 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.

Ignored Files

• Ignored by pattern: .github/workflows/** (6)
  • .github/workflows/_e2e_test.yaml
  • .github/workflows/bot_pr_create.yaml
  • .github/workflows/dockerfiles/Dockerfile.lint
  • .github/workflows/pr_test_full.yaml
  • .github/workflows/pr_test_light.yaml
  • .github/workflows/schedule_codecov_refresh.yaml

Using Gemini Code Assist

The 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 /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

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 .gemini/ folder in the base of the repository. Detailed instructions can be found here.

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.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[github-actions]

👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:‌‌

• A PR should do only one thing, smaller PRs enable faster reviews.
• Every PR should include unit tests and end-to-end tests ‌to ensure it works and is not broken by other future PRs.
• Write the commit message by fulfilling the PR description to help reviewer and future developers understand.

If CI fails, you can run linting and testing checks locally according Contributing and Testing.

[gemini-code-assist]

Code Review

This pull request updates the compatible vLLM commit hash and introduces version-specific logic in NPUInputBatch to maintain compatibility with vLLM versions beyond v0.18.0. The change correctly adapts tensor initializations based on the vLLM version. However, the new code block introduces some duplication which could be refactored for better maintainability. Additionally, the pull request title and description do not conform to the repository's style guide. I have provided suggestions for both below.

Suggested PR Title:

[main][Worker][Compat] Add compatibility for vLLM versions beyond v0.18.0

Suggested PR Summary:

### What this PR does / why we need it?

This PR updates the compatible vLLM commit hash in the versioning policy documentation. It also modifies `NPUInputBatch` to handle differences in tensor initialization between vLLM v0.18.0 and later versions. Specifically, for versions other than v0.18.0, `num_tokens_no_spec` and `num_prompt_tokens` are now backed by pinned memory tensors to align with upstream changes, ensuring continued compatibility.

### Does this PR introduce _any_ user-facing change?

No, this is an internal refactoring to maintain compatibility with different versions of vLLM and does not introduce any user-facing changes.

### How was this patch tested?

CI should pass with existing tests.

[gemini-code-assist]

The initialization logic for num_tokens_no_spec_cpu_tensor and num_prompt_tokens_cpu_tensor is duplicated. This reduces maintainability, as any future changes to the tensor creation would need to be applied in two places, increasing the risk of errors. Please refactor this to remove the duplication by extracting the common arguments.

            tensor_args = dict(device="cpu", dtype=torch.int32, pin_memory=pin_memory)
            self.num_tokens_no_spec_cpu_tensor = torch.zeros((max_num_reqs,), **tensor_args)
            self.num_tokens_no_spec = self.num_tokens_no_spec_cpu_tensor.numpy()
            self.num_prompt_tokens_cpu_tensor = torch.zeros((max_num_reqs,), **tensor_args)
            self.num_prompt_tokens = self.num_prompt_tokens_cpu_tensor.numpy()

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.