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

Add LLaVA-InternLM2 #53

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Add LLaVA-InternLM2 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a0368
support
LZHgrla Jan 16, 2024
e477843
add trust_remote_code
LZHgrla Jan 16, 2024
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
2 changes: 2 additions & 0 deletions vlmeval/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
}

xtuner_models = {
'llava-internlm2-7b': partial(LLaVA_XTuner, llm_path='internlm/internlm2-chat-7b', llava_path='xtuner/llava-internlm2-7b', visual_select_layer=-2, prompt_template='internlm2_chat'),
'llava-internlm2-20b': partial(LLaVA_XTuner, llm_path='internlm/internlm2-chat-20b', llava_path='xtuner/llava-internlm2-20b', visual_select_layer=-2, prompt_template='internlm2_chat'),
'llava-internlm-7b': partial(LLaVA_XTuner, llm_path='internlm/internlm-chat-7b', llava_path='xtuner/llava-internlm-7b', visual_select_layer=-2, prompt_template='internlm_chat'),
'llava-v1.5-7b-xtuner': partial(LLaVA_XTuner, llm_path='lmsys/vicuna-7b-v1.5', llava_path='xtuner/llava-v1.5-7b-xtuner', visual_select_layer=-2, prompt_template='vicuna'),
'llava-v1.5-13b-xtuner': partial(LLaVA_XTuner, llm_path='lmsys/vicuna-13b-v1.5', llava_path='xtuner/llava-v1.5-13b-xtuner', visual_select_layer=-2, prompt_template='vicuna'),
Expand Down
18 changes: 13 additions & 5 deletions vlmeval/vlm/llava_xtuner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os, sys
import os
import os.path as osp
import string
import sys
import warnings

import pandas as pd
Expand All @@ -9,7 +10,7 @@
from PIL import Image
from transformers import (AutoModel, AutoModelForCausalLM, AutoTokenizer,
CLIPImageProcessor, CLIPVisionModel,
GenerationConfig)
GenerationConfig, StoppingCriteriaList)

from ..smp import cn_string, get_cache_path
from ..utils import DATASET_TYPE, CustomPrompt
Expand All @@ -25,11 +26,11 @@ def __init__(self,
visual_encoder_path='openai/clip-vit-large-patch14-336',
visual_select_layer=-2,
prompt_template=None,
stop_words=[],
torch_dtype=torch.float16):
try:
from peft import PeftModel
from xtuner.tools.utils import get_chat_utils
from xtuner.utils import PROMPT_TEMPLATE
from xtuner.utils import PROMPT_TEMPLATE, StopWordStoppingCriteria
except Exception:
warnings.warn(
'Please install xtuner with `pip install -U xtuner` before '
Expand Down Expand Up @@ -82,18 +83,21 @@ def __init__(self,
adapter_path = osp.join(llava_path, 'llm_adapter')
llm = PeftModel.from_pretrained(llm,
adapter_path,
trust_remote_code=True,
device_map='cpu')
print(f'Load LLM adapter from {llava_path}')
if 'visual_encoder_adapter' in os.listdir(llava_path):
adapter_path = osp.join(llava_path, 'visual_encoder_adapter')
visual_encoder = PeftModel.from_pretrained(visual_encoder,
adapter_path,
trust_remote_code=True,
device_map='cpu')
print(f'Load visual_encoder adapter from {llava_path}')

# build projector
projector_path = osp.join(llava_path, 'projector')
projector = AutoModel.from_pretrained(projector_path,
trust_remote_code=True,
torch_dtype=torch_dtype,
device_map='cpu')
print(f'Load projector from {llava_path}')
Expand All @@ -110,10 +114,14 @@ def __init__(self,
self.visual_select_layer = visual_select_layer
if prompt_template is not None:
self.prompt_template = PROMPT_TEMPLATE[prompt_template]
stop_words += self.prompt_template.get('STOP_WORDS', [])
else:
self.prompt_template = None

_, self.stop_criteria = get_chat_utils(self.llm)
self.stop_criteria = StoppingCriteriaList()
for word in stop_words:
self.stop_criteria.append(
StopWordStoppingCriteria(self.tokenizer, word))

def build_gen_config(self, dataset):
gen_kwargs = dict(max_new_tokens=1024,
Expand Down