Skip to content

[Bugfix] Fix MultiprocessingGPUExecutor.check_health when world_size == 1#5254

Merged
simon-mo merged 2 commits intovllm-project:mainfrom
jsato8094:fix/multiproc-gpu-executor-health-check
Jun 11, 2024
Merged

[Bugfix] Fix MultiprocessingGPUExecutor.check_health when world_size == 1#5254
simon-mo merged 2 commits intovllm-project:mainfrom
jsato8094:fix/multiproc-gpu-executor-health-check

Conversation

@jsato8094
Copy link
Copy Markdown
Contributor

MultiprocessingGPUExecutor and MultiprocessingGPUExecutorAsync do not have the worker_monitor attribute when world_size == 1. However, the check_health() method requires this attribute, so it should be ignored in this case.

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 simon-mo requested a review from njhill June 4, 2024 17:33
Copy link
Copy Markdown
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.

Thanks @jsato8094. I don't think it's expected that MultiprocessingGPUExecutor would be used with world_size == 1, it would make more sense to just use GPUExecutor.

But I think this fix is fine since it should currently otherwise work with world_size == 1 in theory.

It would be better though I think to set self.worker_monitor = None in the world_size == 1 case in _init_executor() and then the check here should only need to be if self.worker_monitor is not None and ... rather than checking for the attribute existence.

getattr is used in the shutdown method because this is called from the destructor and that can happen before the _init_executor() method completed successfully.

@jsato8094
Copy link
Copy Markdown
Contributor Author

@njhill Thank you for your comment. Indeed, MultiprocessingGPUExecutor should not be used when world_size == 1. I encountered this issue because I mistakenly set engine_args.distributed_executor_backend to mp. Your idea to avoid using getattr is excellent, so I will implement this change.

@vrdn-23
Copy link
Copy Markdown
Contributor

vrdn-23 commented Jun 11, 2024

Nice work @jsato8094 @njhill ! Is this good to merge now?

@simon-mo simon-mo merged commit 2e02311 into vllm-project:main Jun 11, 2024
robertgshaw2-redhat pushed a commit to neuralmagic/nm-vllm that referenced this pull request Jun 12, 2024
joerunde pushed a commit to joerunde/vllm that referenced this pull request Jun 17, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jun 27, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 8, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 24, 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