Skip to content

make xcomposer2 optional #351

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

make xcomposer2 optional #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205d4bb
gptqmodel failings
yggdrasil75 Mar 21, 2025
6ad2b67
Create optional_requirements.txt
yggdrasil75 Mar 21, 2025
b531d5c
Update requirements.txt
yggdrasil75 Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions optional_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gptqmodel
2 changes: 0 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ sentencepiece==0.2.0
torchvision==0.21.0
xformers==0.0.29.post3

# InternLM-XComposer2
gptqmodel==1.9.0
numpy==2.2.3

# WD Tagger
Expand Down
16 changes: 10 additions & 6 deletions taggui/auto_captioning/models_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
from auto_captioning.models.moondream import Moondream1, Moondream2
from auto_captioning.models.phi_3_vision import Phi3Vision
from auto_captioning.models.wd_tagger import WdTagger
from auto_captioning.models.xcomposer2 import Xcomposer2, Xcomposer2_4khd
try:
from auto_captioning.models.xcomposer2 import Xcomposer2, Xcomposer2_4khd
except:
print('GPTQModel probably failed to install')

MODELS = [
'fancyfeast/llama-joycaption-alpha-two-hf-llava',
'internlm/internlm-xcomposer2-vl-7b-4bit',
'internlm/internlm-xcomposer2-vl-7b',
'internlm/internlm-xcomposer2-vl-1_8b',
'internlm/internlm-xcomposer2-4khd-7b',
'THUDM/cogvlm-chat-hf',
'THUDM/cogagent-vqa-hf',
'THUDM/cogvlm2-llama3-chat-19B-int4',
Expand Down Expand Up @@ -60,7 +59,12 @@
'Salesforce/blip2-flan-t5-xxl',
'microsoft/kosmos-2-patch14-224'
]

if Xcomposer:
MODELS.extend([
'internlm/internlm-xcomposer2-vl-7b-4bit',
'internlm/internlm-xcomposer2-vl-7b',
'internlm/internlm-xcomposer2-vl-1_8b',
'internlm/internlm-xcomposer2-4khd-7b',])

def get_model_class(model_id: str) -> type[AutoCaptioningModel]:
lowercase_model_id = model_id.lower()
Expand Down