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

[CI] Try introducing isort. #3495

Merged
merged 14 commits into from
Mar 25, 2024
Merged

[CI] Try introducing isort. #3495

merged 14 commits into from
Mar 25, 2024

Conversation

rkooo567
Copy link
Collaborator

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:

  • 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!

@simon-mo
Copy link
Collaborator

Overall I'm in favor. But I think ruff already does this we just need to remove the ignore astral-sh/ruff#8926 (comment)

@zhuohan123
Copy link
Collaborator

This is great! I'm thinking about having this for a long time.

@rkooo567
Copy link
Collaborator Author

@simon-mo I can also use ruff if that's what you prefer, so plz lmk.

isort policy

The default ordering;

FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

Also it prioritizes regular import over from import. I believe this is exact same policy as vllm, but please review ^ @simon-mo @zhuohan123

Merge plan

In 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?

@zhuohan123
Copy link
Collaborator

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.

@zhuohan123
Copy link
Collaborator

Also the order looks good to me!

vllm/config.py Outdated Show resolved Hide resolved
@simon-mo
Copy link
Collaborator

Checkout .github folder for workflows for lint.

@rkooo567
Copy link
Collaborator Author

@simon-mo can you take a look? I included this to a part of ruff btw (instead of adding a new step)

@rkooo567
Copy link
Collaborator Author

rkooo567 commented Mar 20, 2024

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?

@simon-mo
Copy link
Collaborator

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 ruff --check fix to sort the imports

@rkooo567
Copy link
Collaborator Author

rkooo567 commented Mar 20, 2024

ah my wording was confusing. Sorry about that. More concretely;

  • I added isort . --check-only to the end of ruff.yaml (so it will be included in the ci). See c4681b0
  • this fail because not every file is sorted yet.
  • So my proposal is to merge this PR, and I make another PR to sort every file. And add isort . --check-only to ruff.yaml

Alternatively, we can only check diff, but when I tried this, it somehow didin't work

@rkooo567 rkooo567 changed the title [WIP] Try introducing isort. [CI] Try introducing isort. Mar 22, 2024
@simon-mo
Copy link
Collaborator

Thanks for clarifying. My question is that, instead of using isort executable, can we just use ruff executable by uncomment this line

vllm/pyproject.toml

Lines 29 to 30 in e90fc21

# isort
# "I",

@rkooo567
Copy link
Collaborator Author

@simon-mo let me try that out!

Copy link
Collaborator

@zhuohan123 zhuohan123 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 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.

.github/workflows/ruff.yml Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
@rkooo567
Copy link
Collaborator Author

rkooo567 commented Mar 25, 2024

@simon-mo @zhuohan123

  • Tried ruff, and it doesn't support use_parentheses, so I just sticked to isort.
  • All files are isorted.
  • Isort running is added to the workflow (ruff workflow)

@simon-mo simon-mo merged commit 01bfb22 into vllm-project:main Mar 25, 2024
32 checks passed
xjpang pushed a commit to xjpang/vllm that referenced this pull request Mar 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants