From 19d7e630d6216550a56c8df572cce481c22f2ddc Mon Sep 17 00:00:00 2001 From: Fengzhe Zhou Date: Thu, 9 May 2024 14:32:31 +0800 Subject: [PATCH] [Sync] Update accelerator (#1122) (cherry picked from commit 4beb6d9ab655d8a626971841b7acfd9fae9d438f) Co-authored-by: liuhongwei --- opencompass/cli/main.py | 4 ++-- opencompass/utils/run.py | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/opencompass/cli/main.py b/opencompass/cli/main.py index 8d806fc4..2c06b9f3 100644 --- a/opencompass/cli/main.py +++ b/opencompass/cli/main.py @@ -53,8 +53,8 @@ def parse_args(): parser.add_argument( '--accelerator', help='Infer accelerator, support vllm and lmdeploy now.', - choices=['vllm', 'lmdeploy', 'hg'], - default='hg', + choices=['vllm', 'lmdeploy', 'hf'], + default='hf', type=str) parser.add_argument('-m', '--mode', diff --git a/opencompass/utils/run.py b/opencompass/utils/run.py index a66ea71d..2a26b6c7 100644 --- a/opencompass/utils/run.py +++ b/opencompass/utils/run.py @@ -220,7 +220,7 @@ def change_accelerator(models, accelerator): if accelerator == 'lmdeploy': get_logger().info( f'Transforming {model["abbr"]} to {accelerator}') - model = dict( + acc_model = dict( type= # noqa E251 f'{TurboMindModel.__module__}.{TurboMindModel.__name__}', abbr=model['abbr'].replace('hf', 'lmdeploy') @@ -242,12 +242,12 @@ def change_accelerator(models, accelerator): ) for item in ['meta_template']: if model.get(item) is not None: - model.update(item, model[item]) + acc_model[item] = model[item] elif accelerator == 'vllm': get_logger().info( f'Transforming {model["abbr"]} to {accelerator}') - model = dict( + acc_model = dict( type=f'{VLLM.__module__}.{VLLM.__name__}', abbr=model['abbr'].replace('hf', 'vllm') if '-hf' in model['abbr'] else model['abbr'] + '-vllm', @@ -262,12 +262,10 @@ def change_accelerator(models, accelerator): ) for item in ['meta_template', 'end_str']: if model.get(item) is not None: - model.update(item, model[item]) - generation_kwargs.update( - dict(temperature=gen_args['temperature'])) + acc_model[item] = model[item] else: raise ValueError(f'Unsupported accelerator {accelerator}') - model_accels.append(model) + model_accels.append(acc_model) return model_accels