mirror of
https://github.com/open-compass/opencompass.git
synced 2025-05-30 16:03:24 +08:00
[Fix] Fix bugs when adding QwQ models
This commit is contained in:
parent
4ef3c5083b
commit
a3bac3611a
@ -71,6 +71,17 @@ api_meta_template = dict(
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
for model in deepseek_r1_api_aliyun_model:
|
||||||
|
model['return_reasoning_content'] = True
|
||||||
|
model['pred_postprocessor'] = {'open_hu_eval_*': {'type': 'rm_<think>_before_eval'}}
|
||||||
|
if model['abbr'].startswith('QwQ'):
|
||||||
|
model['pred_postprocessor'] = {
|
||||||
|
'OpenHuEval_*': {'type': 'extract_qwq_answer_before_eval'}
|
||||||
|
}
|
||||||
|
del model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
|
|
||||||
models = [
|
models = [
|
||||||
*gpt_4o_mini_20240718_model,
|
*gpt_4o_mini_20240718_model,
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
from mmengine.config import read_base
|
from mmengine.config import read_base
|
||||||
|
|
||||||
with read_base():
|
with read_base():
|
||||||
|
<<<<<<< HEAD
|
||||||
from opencompass.configs.datasets.OpenHuEval.HuMatchingFIB.HuMatchingFIB import (
|
from opencompass.configs.datasets.OpenHuEval.HuMatchingFIB.HuMatchingFIB import (
|
||||||
HuMatchingFIB_datasets,
|
HuMatchingFIB_datasets,
|
||||||
)
|
)
|
||||||
@ -66,6 +67,33 @@ with read_base():
|
|||||||
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
||||||
models as o1_mini_2024_09_12_model,
|
models as o1_mini_2024_09_12_model,
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
from opencompass.configs.datasets.OpenHuEval.HuMatchingFIB.HuMatchingFIB import HuMatchingFIB_datasets
|
||||||
|
|
||||||
|
from opencompass.configs.models.openai.gpt_4o_mini_20240718 import models as gpt_4o_mini_20240718_model
|
||||||
|
from opencompass.configs.models.openai.gpt_4o_2024_11_20 import models as gpt_4o_2024_11_20_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_v3_api_aliyun import models as deepseek_v3_api_aliyun_model
|
||||||
|
|
||||||
|
from opencompass.configs.models.qwen2_5.lmdeploy_qwen2_5_7b_instruct import models as lmdeploy_qwen2_5_7b_instruct_model
|
||||||
|
from opencompass.configs.models.qwen2_5.lmdeploy_qwen2_5_32b_instruct import models as lmdeploy_qwen2_5_32b_instruct_model
|
||||||
|
from opencompass.configs.models.qwen2_5.lmdeploy_qwen2_5_14b_instruct import models as lmdeploy_qwen2_5_14b_instruct_model
|
||||||
|
from opencompass.configs.models.qwen2_5.lmdeploy_qwen2_5_72b_instruct import models as lmdeploy_qwen2_5_72b_instruct_model
|
||||||
|
from opencompass.configs.models.hf_llama.lmdeploy_llama3_1_8b_instruct import models as lmdeploy_llama3_1_8b_instruct_model
|
||||||
|
from opencompass.configs.models.hf_llama.lmdeploy_llama3_1_70b_instruct import models as lmdeploy_llama3_1_70b_instruct_model
|
||||||
|
from opencompass.configs.models.hf_llama.llama3_3_70b_api_siliconflow import models as llama3_3_70b_api_siliconflow_model
|
||||||
|
|
||||||
|
from opencompass.configs.models.hf_internlm.lmdeploy_internlm3_8b_instruct import models as lmdeploy_internlm3_8b_instruct_model
|
||||||
|
|
||||||
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import models as lmdeploy_qwq_32b_preview_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_32b import models as qwq_32b_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_plus_2025_03_05 import models as qwq_plus_2025_03_05_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_aliyun import models as deepseek_r1_api_aliyun_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_distill_llama_8b_api_aliyun import models as deepseek_r1_distill_llama_8b_api_aliyun_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_qwen_32b_instruct import models as deepseek_r1_distill_qwen_32b_instruct_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_qwen_14b_instruct import models as deepseek_r1_distill_qwen_14b_instruct_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_llama_70b_instruct import models as deepseek_r1_distill_llama_70b_instruct_model
|
||||||
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import models as o1_mini_2024_09_12_model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
||||||
|
|
||||||
datasets = HuMatchingFIB_datasets
|
datasets = HuMatchingFIB_datasets
|
||||||
@ -85,6 +113,10 @@ for model in models:
|
|||||||
}
|
}
|
||||||
del model
|
del model
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
work_dir = (
|
work_dir = (
|
||||||
'./outputs/' + __file__.split('/')[-1].split('.')[0] + '/'
|
'./outputs/' + __file__.split('/')[-1].split('.')[0] + '/'
|
||||||
) # do NOT modify this line, yapf: disable, pylint: disable
|
) # do NOT modify this line, yapf: disable, pylint: disable
|
||||||
|
@ -32,6 +32,7 @@ with read_base():
|
|||||||
models as lmdeploy_internlm3_8b_instruct_model,
|
models as lmdeploy_internlm3_8b_instruct_model,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
||||||
models as lmdeploy_qwq_32b_preview_model,
|
models as lmdeploy_qwq_32b_preview_model,
|
||||||
)
|
)
|
||||||
@ -45,6 +46,13 @@ with read_base():
|
|||||||
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
||||||
models as o1_mini_2024_09_12_model,
|
models as o1_mini_2024_09_12_model,
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import models as lmdeploy_qwq_32b_preview_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_32b import models as qwq_32b_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_plus_2025_03_05 import models as qwq_plus_2025_03_05_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_aliyun import models as deepseek_r1_api_aliyun_model
|
||||||
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import models as o1_mini_2024_09_12_model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
||||||
|
|
||||||
datasets = HuProverbRea_datasets
|
datasets = HuProverbRea_datasets
|
||||||
|
@ -32,6 +32,7 @@ with read_base():
|
|||||||
models as lmdeploy_internlm3_8b_instruct_model,
|
models as lmdeploy_internlm3_8b_instruct_model,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
||||||
models as lmdeploy_qwq_32b_preview_model,
|
models as lmdeploy_qwq_32b_preview_model,
|
||||||
)
|
)
|
||||||
@ -45,6 +46,13 @@ with read_base():
|
|||||||
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
||||||
models as o1_mini_2024_09_12_model,
|
models as o1_mini_2024_09_12_model,
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import models as lmdeploy_qwq_32b_preview_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_32b import models as qwq_32b_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_plus_2025_03_05 import models as qwq_plus_2025_03_05_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_aliyun import models as deepseek_r1_api_aliyun_model
|
||||||
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import models as o1_mini_2024_09_12_model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
||||||
|
|
||||||
datasets = HuProverbRea_datasets
|
datasets = HuProverbRea_datasets
|
||||||
|
@ -42,6 +42,7 @@ with read_base():
|
|||||||
|
|
||||||
# from opencompass.configs.models.hf_internlm.lmdeploy_internlm3_8b_instruct import models as lmdeploy_internlm3_8b_instruct_model
|
# from opencompass.configs.models.hf_internlm.lmdeploy_internlm3_8b_instruct import models as lmdeploy_internlm3_8b_instruct_model
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
||||||
models as lmdeploy_qwq_32b_preview_model,
|
models as lmdeploy_qwq_32b_preview_model,
|
||||||
)
|
)
|
||||||
@ -67,6 +68,17 @@ with read_base():
|
|||||||
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
||||||
models as o1_mini_2024_09_12_model,
|
models as o1_mini_2024_09_12_model,
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import models as lmdeploy_qwq_32b_preview_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_32b import models as qwq_32b_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_plus_2025_03_05 import models as qwq_plus_2025_03_05_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_aliyun import models as deepseek_r1_api_aliyun_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_distill_llama_8b_api_aliyun import models as deepseek_r1_distill_llama_8b_api_aliyun_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_qwen_32b_instruct import models as deepseek_r1_distill_qwen_32b_instruct_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_qwen_14b_instruct import models as deepseek_r1_distill_qwen_14b_instruct_model
|
||||||
|
from opencompass.configs.models.deepseek.lmdeploy_deepseek_r1_distill_llama_70b_instruct import models as deepseek_r1_distill_llama_70b_instruct_model
|
||||||
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import models as o1_mini_2024_09_12_model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
||||||
|
|
||||||
from opencompass.models import OpenAI
|
from opencompass.models import OpenAI
|
||||||
@ -146,7 +158,12 @@ eval = dict(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
summarizer = dict(type=HuSimpleQASummarizer, prompt_languages=PROMPT_LANGUAGES)
|
summarizer = dict(type=HuSimpleQASummarizer, prompt_languages=PROMPT_LANGUAGES)
|
||||||
|
=======
|
||||||
|
summarizer = dict(type=HuSimpleQASummarizer,
|
||||||
|
prompt_languages=PROMPT_LANGUAGES)
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
|
|
||||||
work_dir = (
|
work_dir = (
|
||||||
'./outputs/' + __file__.split('/')[-1].split('.')[0] + '/'
|
'./outputs/' + __file__.split('/')[-1].split('.')[0] + '/'
|
||||||
|
@ -32,6 +32,7 @@ with read_base():
|
|||||||
models as lmdeploy_internlm3_8b_instruct_model,
|
models as lmdeploy_internlm3_8b_instruct_model,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import (
|
||||||
models as lmdeploy_qwq_32b_preview_model,
|
models as lmdeploy_qwq_32b_preview_model,
|
||||||
)
|
)
|
||||||
@ -48,6 +49,14 @@ with read_base():
|
|||||||
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import (
|
||||||
models as o1_mini_2024_09_12_model,
|
models as o1_mini_2024_09_12_model,
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
from opencompass.configs.models.qwq.lmdeploy_qwq_32b_preview import models as lmdeploy_qwq_32b_preview_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_32b import models as qwq_32b_model
|
||||||
|
from opencompass.configs.models.qwq.qwq_plus_2025_03_05 import models as qwq_plus_2025_03_05_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_aliyun import models as deepseek_r1_api_aliyun_model
|
||||||
|
from opencompass.configs.models.deepseek.deepseek_r1_api_siliconflow import models as deepseek_r1_api_siliconflow_model
|
||||||
|
from opencompass.configs.models.openai.o1_mini_2024_09_12 import models as o1_mini_2024_09_12_model
|
||||||
|
>>>>>>> 6b84df9... add_qwen_api_qwq_32b
|
||||||
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
# from opencompass.configs.models.openai.o3_mini_2025_01_31 import models as o3_mini_2025_01_31_model
|
||||||
|
|
||||||
datasets = HuStandardFIB_datasets
|
datasets = HuStandardFIB_datasets
|
||||||
|
Loading…
Reference in New Issue
Block a user