From 618eaaafb5afc4112e822a524cfe732229850c5e Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Tue, 10 Sep 2024 16:59:10 +0800 Subject: [PATCH 1/7] add transformers in gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9b56a91519..493618bced 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,7 @@ output/ *.out benchmarks/ eval_outputs/ +transformers/ # Pytorch *.pth From 8fd40515386ebed250d400c3a58c6e1c9c47b05a Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Wed, 11 Sep 2024 18:57:16 +0800 Subject: [PATCH 2/7] fix a typo bug in text-caps --- swift/llm/utils/dataset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/llm/utils/dataset.py b/swift/llm/utils/dataset.py index fc27c35eb6..75e6784516 100644 --- a/swift/llm/utils/dataset.py +++ b/swift/llm/utils/dataset.py @@ -1430,7 +1430,7 @@ def preprocess(row): 'swift/TextCaps', [], preprocess_func=preprocess_text_caps, get_function=get_dataset_from_repo, - split=['train', 'val'], + split=['train', 'validation'], hf_dataset_id='HuggingFaceM4/TextCaps', huge_dataset=True, tags=['multi-modal', 'en', 'caption', 'quality']) From add49e5c154326e60ffdba4f20257196ad817a5a Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Fri, 20 Sep 2024 10:43:58 +0800 Subject: [PATCH 3/7] add .run into gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 493618bced..d6764baebd 100644 --- a/.gitignore +++ b/.gitignore @@ -109,6 +109,7 @@ venv.bak/ .vscode .idea +.run # custom *.pkl From 40d3ad021c4ed8d57676fa14d4e8ca26c6403d28 Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Mon, 30 Sep 2024 12:35:54 +0800 Subject: [PATCH 4/7] add vlmeval to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d6764baebd..5d576bee64 100644 --- a/.gitignore +++ b/.gitignore @@ -132,6 +132,7 @@ output/ benchmarks/ eval_outputs/ transformers/ +vlmeval/ # Pytorch *.pth From 818d0fd1cefee4dfe3b87ddb0dcd3f3f933bfa67 Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Fri, 18 Oct 2024 15:44:34 +0800 Subject: [PATCH 5/7] add my_model/ to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5d576bee64..8837648615 100644 --- a/.gitignore +++ b/.gitignore @@ -133,6 +133,7 @@ benchmarks/ eval_outputs/ transformers/ vlmeval/ +my_model/ # Pytorch *.pth From 72f6452289485de3ea420bd3d3be28121b06b9ba Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Sat, 22 Feb 2025 01:19:55 +0800 Subject: [PATCH 6/7] update the generation of JanusPro --- swift/llm/template/base.py | 12 +++++------- tests/test_align/test_template/test_gene.py | 5 +---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/swift/llm/template/base.py b/swift/llm/template/base.py index bddfd3c5df..f40b9a9959 100644 --- a/swift/llm/template/base.py +++ b/swift/llm/template/base.py @@ -227,13 +227,11 @@ def _replace_image_tags(inputs: StdTemplateInputs): def _replace_start_image_tags(inputs: StdTemplateInputs): # compat generate_mode = False - for message in inputs.messages: - content = message['content'] - if not isinstance(content, str): - continue - if content.strip().endswith(''): - generate_mode = True - message['content'] = re.sub('', '', content).strip() # remove the + message = inputs.messages[-1] + content = message['content'] + if content.endswith(''): + generate_mode = True + message['content'] = message['content'][:-len('')] # remove the inputs.generate_mode = generate_mode def _rlhf_encode(self, inputs: StdTemplateInputs) -> Dict[str, Any]: diff --git a/tests/test_align/test_template/test_gene.py b/tests/test_align/test_template/test_gene.py index 012eb1674b..9e985889b2 100644 --- a/tests/test_align/test_template/test_gene.py +++ b/tests/test_align/test_template/test_gene.py @@ -8,10 +8,7 @@ def test_deepseek_janus_pro_gene(): from swift.llm import infer_main, InferArguments - args = InferArguments( - # model='deepseek-ai/Janus-Pro-1B', - model='/mnt/nas1/.cache/modelscope/hub/deepseek-ai/Janus-Pro-1B', - infer_backend='pt') + args = InferArguments(model='deepseek-ai/Janus-Pro-1B', infer_backend='pt') infer_main(args) From c3ee27ad44da102b40000bfca47d2dd25efdd16c Mon Sep 17 00:00:00 2001 From: DaozeZhang Date: Sat, 22 Feb 2025 01:28:40 +0800 Subject: [PATCH 7/7] add `message['role'] == 'user'` --- swift/llm/template/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/llm/template/base.py b/swift/llm/template/base.py index f40b9a9959..d49650ded8 100644 --- a/swift/llm/template/base.py +++ b/swift/llm/template/base.py @@ -229,7 +229,7 @@ def _replace_start_image_tags(inputs: StdTemplateInputs): generate_mode = False message = inputs.messages[-1] content = message['content'] - if content.endswith(''): + if message['role'] == 'user' and content.endswith(''): generate_mode = True message['content'] = message['content'][:-len('')] # remove the inputs.generate_mode = generate_mode