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

[2/N] executor pass the complete config to worker/modelrunner #9938

Merged
merged 32 commits into from
Nov 2, 2024

Conversation

youkaichao
Copy link
Member

continue of #9933

Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
Copy link

github-actions bot commented Nov 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 starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can do one of these:

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

🚀

@youkaichao youkaichao marked this pull request as draft November 1, 2024 21:41
Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
@youkaichao youkaichao marked this pull request as ready for review November 1, 2024 21:53
@robertgshaw2-neuralmagic
Copy link
Collaborator

I personally find it confusing that we call the members/arguments vllm_config when it is of type EngineConfig. I would personally choose the name engine_config, but I dont have religion around it.

Other than the ModelConfig --> EngineConfig comment, approving to unblock

Copy link
Member

@njhill njhill left a comment

Choose a reason for hiding this comment

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

Nice cleanup!

vllm/worker/multi_step_worker.py Outdated Show resolved Hide resolved
vllm/worker/neuron_model_runner.py Outdated Show resolved Hide resolved
vllm/worker/neuron_worker.py Outdated Show resolved Hide resolved
@njhill
Copy link
Member

njhill commented Nov 1, 2024

I personally find it confusing that we call the members/arguments vllm_config when it is of type EngineConfig. I would personally choose the name engine_config, but I dont have religion around it.

Agree .. alternatively EngineConfig could be renamed to VLLMConfig :)

Signed-off-by: youkaichao <[email protected]>
Signed-off-by: youkaichao <[email protected]>
@youkaichao youkaichao added the ready ONLY add when PR is ready to merge/full CI is needed label Nov 2, 2024
Signed-off-by: youkaichao <[email protected]>
Copy link

mergify bot commented Nov 2, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. @youkaichao please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Nov 2, 2024
@mergify mergify bot removed the needs-rebase label Nov 2, 2024
@youkaichao youkaichao enabled auto-merge (squash) November 2, 2024 07:48
@youkaichao youkaichao disabled auto-merge November 2, 2024 14:34
@youkaichao youkaichao merged commit e893795 into vllm-project:main Nov 2, 2024
63 of 66 checks passed
@youkaichao youkaichao deleted the excutor-worker branch November 2, 2024 14:35
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Nov 4, 2024
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Nov 4, 2024
richardsliu pushed a commit to richardsliu/vllm that referenced this pull request Nov 4, 2024
bigPYJ1151 pushed a commit to bigPYJ1151/vllm that referenced this pull request Nov 5, 2024
DarkLight1337 pushed a commit that referenced this pull request Nov 5, 2024
DarkLight1337 pushed a commit that referenced this pull request Nov 5, 2024
hissu-hyvarinen pushed a commit to ROCm/vllm that referenced this pull request Nov 6, 2024
JC1DA pushed a commit to JC1DA/vllm that referenced this pull request Nov 11, 2024
sumitd2 pushed a commit to sumitd2/vllm that referenced this pull request Nov 14, 2024
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
mfournioux pushed a commit to mfournioux/vllm that referenced this pull request Nov 20, 2024
tlrmchlsmth pushed a commit to neuralmagic/vllm that referenced this pull request Nov 23, 2024
…roject#9938)

Signed-off-by: youkaichao <[email protected]>
Co-authored-by: Nick Hill <[email protected]>
Signed-off-by: Tyler Michael Smith <[email protected]>
sleepwalker2017 pushed a commit to sleepwalker2017/vllm that referenced this pull request Dec 13, 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