Skip to content

Commit 5fa16b2

Browse files
author
limuan
committed
add mindspore modelnotfound error
1 parent 2a51fff commit 5fa16b2

4 files changed

Lines changed: 26 additions & 14 deletions

File tree

ais_bench/benchmark/configs/models/mf_models/mf_model.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ais_bench.benchmark.models import MindFormerModel
1+
from ais_bench.benchmark.models.local_models.mindformers_model import MindFormerModel
22

33
models = [
44
dict(
@@ -25,7 +25,8 @@
2525
),
2626
run_cfg = dict(num_gpus=1, num_procs=1), # 多卡/多机多卡 参数,使用torchrun拉起任务
2727
max_out_len=100, # 最大输出token长度
28-
batch_size=2, # 每次推理的batch size
28+
batch_size=2, # 每次拆分数据集的batch size
29+
build_batch_size = 2, # 构建静态图模型时使用的build_batch_size>=batch_size
2930
max_seq_len=2048,
3031
batch_padding=True,
3132
)

ais_bench/benchmark/models/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
from ais_bench.benchmark.models.api_models.tgi_api import TGICustomAPIStream # noqa: F401
1616
from ais_bench.benchmark.models.api_models.vllm_custom_api_chat import VllmMultiturnAPIChatStream # noqa: F401
1717
from ais_bench.benchmark.models.local_models.vllm_offline_vl import VLLMOfflineVLModel
18-
from ais_bench.benchmark.models.local_models.mindformers_model import MindFormerModel

ais_bench/benchmark/models/local_models/mindformers_model.py

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,26 @@
88
from ais_bench.benchmark.models.local_models.base import BaseModel
99
from ais_bench.benchmark.models import APITemplateParser
1010
from ais_bench.benchmark.registry import MODELS
11-
12-
from mindspore import Tensor, Model
13-
from mindformers import MindFormerConfig, build_context
14-
from mindformers.models import build_network
15-
from mindformers.core.parallel_config import build_parallel_config
16-
from mindformers.utils.load_checkpoint_utils import get_load_path_after_hf_convert
17-
from mindformers.trainer.utils import transform_and_load_checkpoint
18-
11+
try:
12+
from mindspore import Tensor, Model
13+
from mindformers import MindFormerConfig, build_context
14+
from mindformers.models import build_network
15+
from mindformers.core.parallel_config import build_parallel_config
16+
from mindformers.utils.load_checkpoint_utils import get_load_path_after_hf_convert
17+
from mindformers.trainer.utils import transform_and_load_checkpoint
18+
except ModuleNotFoundError as _mf_err:
19+
MIND_FORMERS_INSTALL_GUIDE = (
20+
"MindSpore/MindFormers is not available in the current environment. "
21+
"To use `MindFormerModel`, install MindSpore and MindFormers and ensure any required "
22+
"environment variables for your device are configured.\n\n"
23+
"Quick steps (examples):\n"
24+
" 1) Follow the official MindSpore installation guide for your platform: "
25+
"https://www.mindspore.cn/install/en.\n"
26+
" 2) Install MindFormers: `pip install mindformers` (or follow its docs); "
27+
"alternatively, add a local MindFormers checkout to your PYTHONPATH, e.g.:\n"
28+
" PYTHONPATH=/path/to/mindformers:$PYTHONPATH\n"
29+
)
30+
raise ModuleNotFoundError(MIND_FORMERS_INSTALL_GUIDE) from _mf_err
1931

2032

2133
class MultiTokenEOSCriteria(transformers.StoppingCriteria):
@@ -61,7 +73,7 @@ def __init__(self,
6173
path: str,
6274
checkpoint: Optional[str] = None,
6375
yaml_cfg_file: Optional[str] = None,
64-
batch_size: int = 1,
76+
build_batch_size: int = 1,
6577
max_seq_len: int = 2048,
6678
tokenizer_path: Optional[str] = None,
6779
tokenizer_kwargs: dict = dict(),
@@ -79,7 +91,7 @@ def __init__(self,
7991
max_seq_len=max_seq_len,
8092
tokenizer_only=tokenizer_only,
8193
meta_template=meta_template)
82-
self.batch_size = batch_size
94+
self.batch_size = build_batch_size
8395
self.pad_token_id = pad_token_id
8496
self.pretrained_model_path = path
8597
if mode not in ['none', 'mid']:

ais_bench/benchmark/utils/config/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def build_model_from_cfg(model_cfg: ConfigDict):
162162
model_cfg.pop("use_timestamp", None)
163163
model_cfg.pop("run_cfg", None)
164164
model_cfg.pop("request_rate", None)
165-
batch_size = model_cfg.pop("batch_size", None)
165+
model_cfg.pop("batch_size", None)
166166
model_cfg.pop("abbr", None)
167167
model_cfg.pop("attr", None)
168168
model_cfg.pop("summarizer_abbr", None)

0 commit comments

Comments
 (0)