-
-
Notifications
You must be signed in to change notification settings - Fork 6k
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
[CI] Try introducing isort. #3495
Conversation
Overall I'm in favor. But I think ruff already does this we just need to remove the ignore astral-sh/ruff#8926 (comment) |
This is great! I'm thinking about having this for a long time. |
@simon-mo I can also use ruff if that's what you prefer, so plz lmk. isort policyThe default ordering;
Also it prioritizes regular import over from import. I believe this is exact same policy as vllm, but please review ^ @simon-mo @zhuohan123 Merge planIn terms of sorting all files, I will do incrementally to avoid merge conflict. CI@simon-mo do Can you point me which file I have to modify to introduce sorting check in the CI? |
I think enabling ruff formatter is a big change and will probably not be done in the near future. Having isort as a temp fix is better. |
Also the order looks good to me! |
Checkout .github folder for workflows for lint. |
@simon-mo can you take a look? I included this to a part of ruff btw (instead of adding a new step) |
Looks like I need to make every file to pass isort to pass ruff. Let's merge this PR without ruff check. And then in the next PR, I am going to apply isort on all files + add ruff check to CI. And then let's merge fast before merge conflict happes? |
Can you clarify the relationship here? I would assume once you enable the ruff check, isort is no longer needed. Supposedly developers can just run |
ah my wording was confusing. Sorry about that. More concretely;
Alternatively, we can only check diff, but when I tried this, it somehow didin't work |
Thanks for clarifying. My question is that, instead of using Lines 29 to 30 in e90fc21
|
@simon-mo let me try that out! |
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.
Thanks for introducing this! Please let us know when this is ready to be merged. I personally also feel that we can apply isort to all files in this PR.
|
It is WIP, and Idk if committers agree on introducing this feature yet.
Seems like vllm oss has sorting rule that's implicit. This PR tries introducing isort to
format.sh
.This PR only touches small # of files to avoid huge merge conflict.
FIX #xxxx (link existing issues this PR will resolve)
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:
format.sh
to format your code.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:
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.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!