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.

Sign up for GitHub

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

Jump to bottom

[Bugfix] Clean up MiniCPM-V #6939

Merged
merged 25 commits into from
Jul 31, 2024
Merged

[Bugfix] Clean up MiniCPM-V #6939

merged 25 commits into from
Jul 31, 2024
+975 −94

Conversation

HwwwwwwwH
Copy link
Contributor

@HwwwwwwwH HwwwwwwwH commented Jul 30, 2024 •
edited by DarkLight1337
Loading

What has been changed?

  • Modify the support models of MiniCPMV. As the official MiniCPM-V-2 repo still doesn't support vllm. I create a repo of my own for temporarily using. I claim this in the doc for eliminating the confusions of this.
  • Using *Model for LLM part instead of *CausalModel. And delete the previously added code in *CausalModel. This make our code consistent with other VLMs.
  • Automatically infer version when it is not specified in the config. (fixes [Bug]: AttributeError: 'MiniCPMVConfig' object has no attribute 'version' #6814)

@github-actions GitHub Actions
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 consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

To run full CI, you can do one of these:

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

🚀

DarkLight1337
DarkLight1337 reviewed Jul 30, 2024
View reviewed changes
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.

By the way,

docs/source/models/supported_models.rst Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
@HwwwwwwwH
Copy link
Contributor Author

HwwwwwwwH commented Jul 30, 2024 •
edited
Loading

By the way,

I was formatting it.....

@HwwwwwwwH
Copy link
Contributor Author

@DarkLight1337 Plz be careful when checking the code of language model.

@HwwwwwwwH
Copy link
Contributor Author

/ready

@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Jul 31, 2024
DarkLight1337
DarkLight1337 reviewed Jul 31, 2024
View reviewed changes
docs/source/models/supported_models.rst Outdated Show resolved Hide resolved
docs/source/models/supported_models.rst Outdated Show resolved Hide resolved
docs/source/models/supported_models.rst Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/minicpmv.py Outdated Show resolved Hide resolved
vllm/model_executor/models/na_vit.py Show resolved Hide resolved
HwwwwwwwH and others added 11 commits July 31, 2024 20:37
@HwwwwwwwH @DarkLight1337
Update docs/source/models/supported_models.rst
7153277 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update docs/source/models/supported_models.rst
78fe278 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update docs/source/models/supported_models.rst
50d78fd 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
ff8db35 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
794c9b1 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
113238f 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
92bc316 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
0d15a8c 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
aa837b7 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
65bef49 
Co-authored-by: Cyrus Leung <[email protected]>
@HwwwwwwwH @DarkLight1337
Update vllm/model_executor/models/minicpmv.py
f71fb29 
Co-authored-by: Cyrus Leung <[email protected]>
@DarkLight1337 DarkLight1337 changed the title [Bugfix] fix bug for calculating image pos embedding for MiniCPM-V. [Bugfix] Clean up MiniCPM-V Jul 31, 2024
DarkLight1337
DarkLight1337 approved these changes Jul 31, 2024
View reviewed changes
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.

Thanks for the fix!

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) July 31, 2024 14:37
@DarkLight1337 DarkLight1337 merged commit 2f4e108 into vllm-project:main Jul 31, 2024
73 checks passed
@dtrifiro dtrifiro mentioned this pull request Aug 5, 2024
Closed
@HwwwwwwwH HwwwwwwwH deleted the fix_bug branch August 9, 2024 08:45
kylesayrs pushed a commit to neuralmagic/vllm that referenced this pull request Aug 17, 2024
@HwwwwwwwH @DarkLight1337 @kylesayrs
[Bugfix] Clean up MiniCPM-V (vllm-project#6939)
344892c 
Co-authored-by: hezhihui <[email protected]>
Co-authored-by: Cyrus Leung <[email protected]>
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
@HwwwwwwwH @DarkLight1337 @Alvant
[Bugfix] Clean up MiniCPM-V (vllm-project#6939)
6f656c6 
Co-authored-by: hezhihui <[email protected]>
Co-authored-by: Cyrus Leung <[email protected]>
Signed-off-by: Alvant <[email protected]>
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
@HwwwwwwwH @DarkLight1337
[Bugfix] Clean up MiniCPM-V (vllm-project#6939)
26e115e 
Co-authored-by: hezhihui <[email protected]>
Co-authored-by: Cyrus Leung <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

Assignees
No one assigned
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: AttributeError: 'MiniCPMVConfig' object has no attribute 'version'
2 participants
@HwwwwwwwH @DarkLight1337