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

[Core][Frontend] Support Passing Processor Kwargs #8657

Open
wants to merge 21 commits into
base: main
Choose a base branch
from

Conversation

alex-jw-brooks
Copy link
Contributor

@alex-jw-brooks alex-jw-brooks commented Sep 20, 2024

In support of #7861 - It's split into two PRs to make it easier to review

This PR adds support for passing processor_kwargs at initialization time to override values, e.g., in the image processor config and adds a pattern that we can use to easily implement such overrides, especially in the case of multimodal models. More specifically, it adds a well-defined way to pass valid processor_kwargs as expanded keyword-only arguments (which should have default values) to:

  • The input mapper (e.g,. default mapper wrapping the image processor from HF, or a custom mapper implemented in the model class)
  • The input processor
  • Max token calculations
  • Dummy data for memory profiling

This is important since the provided overrides may greatly change the number of image tokens per multimodal instance.

It also forwards some args to the video processor, since those weren't being pushed through yet.

Some Implementation Considerations

I've tried to implement this to be easily extensible for potential inference-time configuration and intuitive to use coming from transformers. More specifically, I was aiming for:

  • avoid writing any configs on disk (since that's the main reason we need this anyway)
  • avoid mutating any configs in-memory
  • Make no assumptions about config structure are made; having a user specify where the value of something like num_crops comes from is a bad experience, and implementing a per-model mapping of allowed config overrides is also fragile since things could be moved around a bit for models that are written to try to generically support fine-tuned models with different LLMs, etc
  • Assume that most overrides are going to be added gradually added; especially for the mapper, since it is a VLLM model implementation detail of whether or not it's using a custom mapper or falling back to something like the HF image processor. If a processor_kwarg is not supported, it will warn that it'll be unused and drop it from the processor kwargs, instead of throwing some nasty unexpected keyword argument deep in the model class
  • Keep compatibility with the existing interfaces for max_token_counts, mapper, input processor, etc
  • Should be easy for us to check if something has already been added for a model

Examples

I've opened a second PR on top of this PR which makes num_crops at init time for phi3v models which illustrates the usage here; see this commit for what adding a processor_kwarg looks like, as well as example tests for each place it's used in phi3v.

You can also try running those examples on this to see what happens if it's unsupported. Since it leverages the default mapper, whose kwargs can't easily be inspected since it gets created through the automodel, there will be some mismatches that eventually crash since the processor kwargs will be used to initialize the auto model, but you'll at least get a bunch of things like:

The following intended overrides are not keyword-only args and and will be dropped: {'num_crops'}

out in the warmup. In situations where the class has its own mapper, and a bad kwarg was used, this would be ignored like it is everywhere else (same case as the sad not found kwargs tests here)

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.

Adding or changing kernels

Each custom kernel needs a schema and one or more implementations to be registered with PyTorch.

  • Make sure custom ops are registered following PyTorch guidelines: Custom C++ and CUDA Operators and The Custom Operators Manual
  • Custom operations that return Tensors require meta-functions. Meta-functions should be implemented and registered in python so that dynamic dims can be handled automatically. See above documents for a description of meta-functions.
  • Use torch.libary.opcheck() to test the function registration and meta-function for any registered ops. See tests/kernels for examples.
  • When changing the C++ signature of an existing op, the schema must be updated to reflect the changes.
  • If a new custom type is needed, see the following document: Custom Class Support in PT2.

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!

Signed-off-by: Alex-Brooks <[email protected]>
Signed-off-by: Alex-Brooks <[email protected]>
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 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.

🚀

Copy link
Member

@DarkLight1337 DarkLight1337 left a comment

Choose a reason for hiding this comment

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

Hmm, originally I was thinking of dynamic kwargs via multi-modal inputs, e.g.

llm.generate({"multi_modal_data": {"image": {"data": image, "options": image_kwargs}}})

but this works too!

I'll take a closer look later today.

@@ -134,6 +134,7 @@ def __init__(
max_seq_len_to_capture: int = 8192,
disable_custom_all_reduce: bool = False,
disable_async_output_proc: bool = False,
processor_kwargs=None,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
processor_kwargs=None,
processor_kwargs: Optional[Dict[str, Any]] = None,

@@ -211,7 +217,7 @@ def _default_input_processor(self, ctx: InputContext,
"""The default input processor is a no-op."""
return inputs

def register_input_processor(self, processor: InputProcessor):
def register_input_processor(self, processor: InputProcessor) -> Callable:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
def register_input_processor(self, processor: InputProcessor) -> Callable:
def register_input_processor(self, processor: InputProcessor):

I intentionally didn't specify the return type here so that the type variables are automatically inferred without having to spell them all out.

Copy link
Member

Choose a reason for hiding this comment

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

If you do want to explicitly specify it, it should return Callable[[N], N] here.

def process_input(self, model_config: "ModelConfig",
inputs: LLMInputs) -> LLMInputs:
def _process_input(self, inputs: LLMInputs, model_config: "ModelConfig",
processor: Callable, **processor_kwargs) -> LLMInputs:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
processor: Callable, **processor_kwargs) -> LLMInputs:
processor: InputProcessor, **processor_kwargs: Any) -> LLMInputs:

return processor(InputContext(model_config), inputs,
**processor_kwargs)

def create_input_processor(self, model_config: "ModelConfig") -> Callable:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
def create_input_processor(self, model_config: "ModelConfig") -> Callable:
def create_input_processor(self, model_config: "ModelConfig"):

**processor_kwargs)

def _get_model_input_processor(self,
model_config: "ModelConfig") -> Callable:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
model_config: "ModelConfig") -> Callable:
model_config: "ModelConfig"):

Copy link
Member

Choose a reason for hiding this comment

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

If you do want to explicitly specify it, it should return InputProcessor here.

@alex-jw-brooks
Copy link
Contributor Author

alex-jw-brooks commented Sep 20, 2024

Sounds good, thanks @DarkLight1337! 🙂 I wanted to open this one first since it's useful by itself, and to make sure the overall approach looks reasonable and had good test coverage since it's touching a few different things.

I'm happy to add that in a follow-up PR though - I did implement this with that in mind as next steps, and it won't require changes to individual models to support it if additional init time processor kwargs are exposed in the meantime! 🤞

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.

2 participants