Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Bugfix] Fix support for dimension like integers and ScalarType #9299

Merged
merged 13 commits into from
Oct 17, 2024

Conversation

bnellnm
Copy link
Contributor

@bnellnm bnellnm commented Oct 11, 2024

Some of the custom ops take integers which are Tensor dimensions. These can sometimes be SymInts if those Tensor dimensions are marked as dynamic. The appropriate int arguments for these class of custom ops have been changed to SymInt to support dynamic dimensions.

The inductor is not currently able to support passing custom C++ classes to custom ops. This PR fully implements ScalarType in python. ScalarTypes are now passed by id to C++ where they are reconstructed into C++ ScalarTypes. This has the side effect of removing the _core_C extension.

fixes #9234

cc @SageMoore , @ProExpertProg , @LucasWilkinson , @youkaichao


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!

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.

🚀

@bnellnm bnellnm marked this pull request as ready for review October 11, 2024 22:16
@LucasWilkinson
Copy link
Collaborator

Thanks for doing this! Sorry scalar type caused this issue, stinks that inductor doesnt support custom classes. But more red then green in this PR so an overall win I guess 👍. I am a bit worried about python based id function calls on the hot path as the id function can be a bit slow in python (im seeing about 14us)
Screenshot 2024-10-11 at 11 57 25 PM
although we do appear to saving an expensive _must_dispatch_in_python which appears to more than offset that,
Screenshot 2024-10-12 at 12 04 30 AM
but might still be good to lift the id call out of _custom_ops.py so users can optimize that if they please

@bnellnm
Copy link
Contributor Author

bnellnm commented Oct 14, 2024

Thanks for doing this! Sorry scalar type caused this issue, stinks that inductor doesnt support custom classes. But more red then green in this PR so an overall win I guess 👍. I am a bit worried about python based id function calls on the hot path as the id function can be a bit slow in python (im seeing about 14us) Screenshot 2024-10-11 at 11 57 25 PM although we do appear to saving an expensive _must_dispatch_in_python which appears to more than offset that, Screenshot 2024-10-12 at 12 04 30 AM but might still be good to lift the id call out of _custom_ops.py so users can optimize that if they please

I've memoized id and made sure it is populated when the types are constructed. If you can send me the commands you used to benchmark, I can see how much difference the memoization makes.

@LucasWilkinson
Copy link
Collaborator

LucasWilkinson commented Oct 15, 2024

I was using:

python examples/offline_profile.py --model neuralmagic/Meta-Llama-3.1-8B-Instruct-quantized.w4a16 --batch-size 4 --prompt-len 512 --json trace_test --save-chrome-traces-folder chrome_traces --max-num-batched-tokens 8196

off this branch: #8337

Then opening prefill.json in chrome_traces using https://ui.perfetto.dev/, you have to merge the branches though so I just went ahead and re-ran it here:

image

looks good! 👍 not seeing any overhead, thanks!

overall I think this is actually much better than the original now! (assuming we won't need more fields and overflow 64bits haha), thanks!

if (quantization == "fp8" or quantization == "gptq_marlin"
or quantization == "gptq_marlin_24"
) and optimization_level >= CompilationLevel.INDUCTOR:
if ((quantization == "fp8" or model == "meta-llama/Meta-Llama-3-8B")
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way to make this more robust? What about Llama-3.1-8B and Llama-3.2-8B?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd rather the check be specific to the problem model(s) rather than making it more generic, e.g. once we upgrade to 2.5 we can remove the fp8 check. It's possible this llama model will also run without oom'ing.

Copy link
Collaborator

@tlrmchlsmth tlrmchlsmth left a comment

Choose a reason for hiding this comment

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

RIP ScalarType

@tlrmchlsmth tlrmchlsmth added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 17, 2024
"__torch__.torch.classes._core_C.ScalarType b_q_type, int size_m, "
"int size_n, int size_k, bool is_k_full, int num_experts, int topk, "
"int b_q_type, SymInt size_m, "
"SymInt size_n, SymInt size_k, bool is_k_full, int num_experts, int "
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should size_n and size_k be regular ints since they will be known at torch.compile time?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ditto for all Ns and Ks

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.

thanks for the great efforts! please address comments from @tlrmchlsmth ?

@tlrmchlsmth
Copy link
Collaborator

tlrmchlsmth commented Oct 17, 2024

thanks for the great efforts! please address comments from @tlrmchlsmth ?

From an offline discussion with @bnellnm, it sounds like there's no downside to leaving N and K as SymInts -- good to go from my end. Interested to see if there's any documentation on SymInt though.

@bnellnm bnellnm force-pushed the inductor-scalar-type-fix branch from adc2024 to 9896b7b Compare October 17, 2024 15:36
@tlrmchlsmth tlrmchlsmth enabled auto-merge (squash) October 17, 2024 16:13
@tlrmchlsmth tlrmchlsmth merged commit eca2c5f into vllm-project:main Oct 17, 2024
79 checks passed
@youkaichao youkaichao deleted the inductor-scalar-type-fix branch October 20, 2024 18:19
charlifu pushed a commit to charlifu/vllm that referenced this pull request Oct 23, 2024
vrdn-23 pushed a commit to vrdn-23/vllm that referenced this pull request Oct 23, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
garg-amit pushed a commit to garg-amit/vllm that referenced this pull request Oct 28, 2024
FerdinandZhong pushed a commit to FerdinandZhong/vllm that referenced this pull request Oct 29, 2024
sumitd2 pushed a commit to sumitd2/vllm that referenced this pull request Nov 14, 2024
mfournioux pushed a commit to mfournioux/vllm that referenced this pull request Nov 20, 2024
…-project#9299)

Signed-off-by: Maxime Fournioux <55544262+mfournioux@users.noreply.github.com>
tlrmchlsmth pushed a commit to neuralmagic/vllm that referenced this pull request Nov 23, 2024
…-project#9299)

Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com>
# for free to join this conversation on GitHub. Already have an account? # 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.

[issue tracker] make quantization compatible with dynamo dynamic shape
6 participants