-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
Adds method to read the pooling types from model's files #9506
Conversation
👋 Hi! Thank you for contributing to the vLLM project. 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:
🚀 |
6b01faf
to
0d6123a
Compare
Thanks! This is great! Can you make sure to add some integration tests? |
dtype=torch.half if QUANTIZATION == "gptq" else "auto", | ||
max_model_len=MAX_MODEL_LEN) as model: | ||
output = model.encode("Write a short story about a robot that" | ||
" dreams for the first time.\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we need to add a verification to make sure that the pooling layer is configured correctly
Signed-off-by: Flavia Beo <[email protected]>
vllm/config.py
Outdated
@@ -186,6 +187,7 @@ def __init__( | |||
code_revision, rope_scaling, rope_theta, | |||
config_format) | |||
self.hf_text_config = get_hf_text_config(self.hf_config) | |||
self.bert_config = self._get_bert_config() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we call this something more general than "bert_config"? Maybe "encoder_config", I just feel bert is quite specific
Signed-off-by: Flavia Beo <[email protected]>
This pull request has merge conflicts that must be resolved before it can be |
Signed-off-by: Max de Bayser <[email protected]>
Signed-off-by: Flavia Beo <[email protected]>
Signed-off-by: Flavia Beo <[email protected]>
I was able to reproduce the error we are seeing at the CI tests in my environment - it is regarding another change that was included recently. The two environments compared in this test are: env 1 {'VLLM_TORCH_COMPILE_LEVEL': '0'}
env 2 {'VLLM_TORCH_COMPILE_LEVEL': '3'} All the vllm engine args and model configuration are the same, but when the test compares the tensors produced with this two different torch compiles, it fails. The vectors are different. Following are the engine args: ['--enforce-eager', '--task', 'embedding', '-pp', '1', '-tp', '1', '--load-format', 'dummy'] And model config parameters: model='BAAI/bge-multilingual-gemma2', speculative_config=None, tokenizer='BAAI/bge-multilingual-gemma2', skip_tokenizer_init=False, tokenizer_mode=auto, revision=None, override_neuron_config=None, rope_scaling=None, rope_theta=None, tokenizer_revision=None, trust_remote_code=False, dtype=torch.bfloat16, max_seq_len=8192, download_dir=None, load_format=LoadFormat.DUMMY, tensor_parallel_size=1, pipeline_parallel_size=1, disable_custom_all_reduce=False, quantization=None, enforce_eager=True, kv_cache_dtype=auto, quantization_param_path=None, device_config=cuda, decoding_config=DecodingConfig(guided_decoding_backend='outlines'), observability_config=ObservabilityConfig(otlp_traces_endpoint=None, collect_model_forward_time=False, collect_model_execute_time=False), seed=0, served_model_name=BAAI/bge-multilingual-gemma2, num_scheduler_steps=1, chunked_prefill_enabled=False multi_step_stream_outputs=True, enable_prefix_caching=False, use_async_output_proc=False, use_cached_outputs=True, chat_template_text_format=string, mm_processor_kwargs=None, pooler_config=PoolerConfig(pooling_type='LAST', pooling_norm=False, pooling_softmax=None, pooling_step_tag_id=None, pooling_returned_token_ids=None)) |
@youkaichao maybe there is a bug in using |
the mse is |
It is acceptable. I think we should measure cosine similarity instead of MSE for embedding models though. |
feel free to update the tests then. |
Signed-off-by: DarkLight1337 <[email protected]>
This pull request has merge conflicts that must be resolved before it can be |
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]> Signed-off-by: Isotr0py <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]> Signed-off-by: Loc Huynh <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]> Signed-off-by: Sumit Dubey <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]> Signed-off-by: Maxime Fournioux <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]> Signed-off-by: Tyler Michael Smith <[email protected]>
…t#9506) Signed-off-by: Flavia Beo <[email protected]> Signed-off-by: Max de Bayser <[email protected]> Co-authored-by: Max de Bayser <[email protected]>
This adds a method to load the pooling config file from sentence transformer models like sentence-transformers/all-MiniLM-L12-v2.
The pooling types added can be found at the sentence-transformers Pooling
FIX #9388 (link existing issues this PR will resolve)
cc: @maxdebayser
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:
format.sh
to format your code.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.
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.torch.libary.opcheck()
to test the function registration and meta-function for any registered ops. Seetests/kernels
for examples.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:
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.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!