Skip to content

Fix bug that model doesn't automatically switch peft adapter #2884

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

Merged
merrymercy merged 4 commits into from
Jan 7, 2024
Merged

Fix bug that model doesn't automatically switch peft adapter #2884

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46d559e
fix the problem of not using the decoding method corresponding to the…
Jingsong-Yan Dec 27, 2023
1b03606
remove test function
Jingsong-Yan Dec 27, 2023
619ec98
Merge branch 'lm-sys:main' into main
Jingsong-Yan Jan 4, 2024
0203f55
Fix bug that doesn't automatically switch peft models
Jingsong-Yan Jan 4, 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
23 changes: 18 additions & 5 deletions fastchat/model/model_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,6 @@ def get_generate_stream_function(model: torch.nn.Module, model_path: str):

model_type = str(type(model)).lower()
is_peft = "peft" in model_type
if is_peft:
model.set_adapter(model_path)
model_type = str(type(model.base_model.model))

is_chatglm = "chatglm" in model_type
is_falcon = "rwforcausallm" in model_type
is_codet5p = "codet5p" in model_type
Expand Down Expand Up @@ -407,7 +403,24 @@ def generate_stream_peft(
judge_sent_end: bool = False,
):
model.set_adapter(model_path)
for x in generate_stream(
base_model_type = str(type(model.base_model.model))
is_chatglm = "chatglm" in base_model_type
is_falcon = "rwforcausallm" in base_model_type
is_codet5p = "codet5p" in base_model_type
is_exllama = "exllama" in base_model_type
is_xft = "xft" in base_model_type
generate_stream_function = generate_stream
if is_chatglm:
generate_stream_function = generate_stream_chatglm
elif is_falcon:
generate_stream_function = generate_stream_falcon
elif is_codet5p:
generate_stream_function = generate_stream_codet5p
elif is_exllama:
generate_stream_function = generate_stream_exllama
elif is_xft:
generate_stream_function = generate_stream_xft
for x in generate_stream_function(
model,
tokenizer,
params,
Expand Down