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

[Model] Pipeline parallel support for Qwen2 #6924

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

xuyi
Copy link
Contributor

@xuyi xuyi commented Jul 30, 2024

#6471

PP support for qwen2

Testd on model Qwen2-7B-Instruct, 2 nodes, pp=8 tp=1, pp=2 tp=4


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

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

🚀

@ericg108
Copy link

any update please?

@andoorve
Copy link
Collaborator

Hi, would you also be able to add Qwen 2 MoE?

@xuyi
Copy link
Contributor Author

xuyi commented Jul 30, 2024

Hi, would you also be able to add Qwen 2 MoE?

Okay, I'll try.

@andoorve
Copy link
Collaborator

Thanks for your contribution!

  1. Can you just quickly test correctness locally by using https://github.com/vllm-project/vllm/blob/main/tests/distributed/test_pipeline_parallel.py by changing the model there to Qwen2 and Qwen2 MoE
  2. Can you add the models to the docs here: https://github.com/vllm-project/vllm/blob/main/docs/source/serving/distributed_serving.rst

Otherwise looks good to me

@andoorve
Copy link
Collaborator

It seems we may also need to pipe the prefix through as with: dbe5588#diff-68eec0d10e8c35e912b4a84fedfa8189be2b613c91a403397f2124d4c11ba58d

@andoorve
Copy link
Collaborator

@xuyi take a look here: #6974

@xuyi
Copy link
Contributor Author

xuyi commented Jul 31, 2024

Thanks for your contribution!

  1. Can you just quickly test correctness locally by using https://github.com/vllm-project/vllm/blob/main/tests/distributed/test_pipeline_parallel.py by changing the model there to Qwen2 and Qwen2 MoE
  2. Can you add the models to the docs here: https://github.com/vllm-project/vllm/blob/main/docs/source/serving/distributed_serving.rst

Otherwise looks good to me

pytest test_pipeline_parallel.py::test_compare_tp

Passed on models Qwen2-7B and Qwen1.5-MoE-A2.7B.

Failed on Qwen2-7B-Instruct, because in Qwen2-7B-Instruct, tensor-parallel-size=1 returns 'Dr. David B.', but tensor-parallel-size=2 returns 'Dr. David M.'

@xuyi
Copy link
Contributor Author

xuyi commented Jul 31, 2024

@xuyi take a look here: #6974

@andoorve This is pp support for Qwen1. Should I merge this commit, or do someting else?

@andoorve
Copy link
Collaborator

Failed on Qwen2-7B-Instruct, because in Qwen2-7B-Instruct, tensor-parallel-size=1 returns 'Dr. David B.', but tensor-parallel-size=2 returns 'Dr. David M.'

What does pipeline parallel return? Is it 'Dr. David B.'?

@andoorve This is pp support for Qwen1. Should I merge this commit, or do someting else?

Feel free to ignore that actually. Yours looks fine to me.

@xuyi
Copy link
Contributor Author

xuyi commented Aug 1, 2024

It's an issue with RTX 3090 support for bfloat16. On the 3090, tp=1 pp>=2 always returns "Dr. David B.", but tp=2,4 returns "Dr. David M.", float16 or RTX 4090 is correct.

@andoorve
Copy link
Collaborator

andoorve commented Aug 1, 2024

LGTM then. @youkaichao recommend for merge after you TAL!

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.

@andoorve please test it locally to make sure it works?

I give approval to unblock you.

@youkaichao youkaichao merged commit 1d2e7fb into vllm-project:main Aug 1, 2024
28 checks passed
@xuyi xuyi deleted the qwen2-pp branch August 8, 2024 02:52
kylesayrs pushed a commit to neuralmagic/vllm that referenced this pull request Aug 17, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
Signed-off-by: Alvant <alvasian@yandex.ru>
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 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.

4 participants