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

[Core] Comment out unused code in sampler #7023

Merged
merged 2 commits into from
Aug 2, 2024

Conversation

peng1999
Copy link
Contributor

@peng1999 peng1999 commented Aug 1, 2024

The sampling_seeds, sample_indices, and extra_seeds member in SamplingTensors is only for triton sampler, which is incomplete and currently stalled in development (See #3186, #3626). This PR comments out some related code. This will eliminate the call to _get_sequence_seeds, which consists ~17% in the construction of SamplingTensors in my profiling.

图片

If maintainers decide not to continue developing triton sampler in the near future, I recommend removing the fields mentioned above from SamplingTensors to make code cleaner and improve performance.

cc @Yard1

BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE


PR Checklist (Click to Expand)

Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.

PR Title and Classification

Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:

  • [Bugfix] for bug fixes.
  • [CI/Build] for build or continuous integration improvements.
  • [Doc] for documentation fixes and improvements.
  • [Model] for adding a new model or improving an existing model. Model name should appear in the title.
  • [Frontend] For changes on the vLLM frontend (e.g., OpenAI API server, LLM class, etc.)
  • [Kernel] for changes affecting CUDA kernels or other compute kernels.
  • [Core] for changes in the core vLLM logic (e.g., LLMEngine, AsyncLLMEngine, Scheduler, etc.)
  • [Hardware][Vendor] for hardware-specific changes. Vendor name should appear in the prefix (e.g., [Hardware][AMD]).
  • [Misc] for PRs that do not fit the above categories. Please use this sparingly.

Note: If the PR spans more than one category, please include all relevant prefixes.

Code Quality

The PR need to meet the following code quality standards:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to docs/source/ if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.

Notes for Large Changes

Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with rfc-required and might not go through the PR.

What to Expect for the Reviews

The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an action-required label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

Thank You

Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!

Copy link

github-actions bot commented Aug 1, 2024

👋 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 consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

To run full CI, you can do one of these:

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

🚀

@@ -549,7 +546,7 @@ def from_lists(cls, temperatures: List[float], top_ps: List[float],
device="cpu",
dtype=torch.long,
pin_memory=pin_memory,
).T.contiguous()
).t().contiguous()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change is to avoid pytorch warning because sampling_seeds_t becomes 1-dim here.

@Yard1
Copy link
Collaborator

Yard1 commented Aug 1, 2024

The triton sampler is pending changes to triton which will reduce kernel launch overhead. The construction of sampling seems should be overlapped with GPU forward pass if using cuda graphs making it essentially free (the overhead is hidden). That being said, we can comment this out for now and add it back in the future when the kernel is enabled.

@youkaichao
Copy link
Member

Can we directly remove the relevant code? We can add it back later if necessary.

Commenting the code in the codebase sounds not good to me.

@Yard1
Copy link
Collaborator

Yard1 commented Aug 1, 2024

I'd suggest we gate it behind a global flag hardcoded to false for now. I will take a look at the triton sampler again once we update to torch 2.4 & triton 3.0.0

@youkaichao
Copy link
Member

LGTM, @peng1999 can you make a hard-coded False flag, and guard these fields under the flag?

@peng1999
Copy link
Contributor Author

peng1999 commented Aug 2, 2024

Changed to hard-coded False flag as per comments.

Copy link
Member

@youkaichao youkaichao left a comment

Choose a reason for hiding this comment

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

Thanks for the great fix!

@youkaichao youkaichao added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 2, 2024
@youkaichao
Copy link
Member

we can force merge if only tracing related tests fail, which are already fixed in main via #7065 and can be ignored.

@youkaichao youkaichao merged commit db35186 into vllm-project:main Aug 2, 2024
70 of 76 checks passed
@peng1999 peng1999 deleted the unused-tensor branch August 2, 2024 08:27
sfc-gh-mkeralapura pushed a commit to sfc-gh-mkeralapura/vllm that referenced this pull request Aug 12, 2024
kylesayrs pushed a commit to neuralmagic/vllm that referenced this pull request Aug 17, 2024
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.

3 participants