From 3df109adfccedeb134dea4ba2ea9a2da89872048 Mon Sep 17 00:00:00 2001
From: Isuxiz Slidder <48672727+Isuxiz@users.noreply.github.com>
Date: 星期一, 31 三月 2025 17:51:52 +0800
Subject: [PATCH] Update model.py to fix "IndexError: index 1 is out of bounds for dimension 1 with size 0" (#2454)
---
funasr/download/runtime_sdk_download_tool.py | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/funasr/download/runtime_sdk_download_tool.py b/funasr/download/runtime_sdk_download_tool.py
index 1981347..fb0ff02 100644
--- a/funasr/download/runtime_sdk_download_tool.py
+++ b/funasr/download/runtime_sdk_download_tool.py
@@ -2,46 +2,57 @@
import argparse
from pathlib import Path
-from funasr.utils.types import str2bool
+from funasr.utils.type_utils import str2bool
def main():
parser = argparse.ArgumentParser()
- parser.add_argument('--model-name', type=str, required=True)
- parser.add_argument('--export-dir', type=str, required=True)
- parser.add_argument('--export', type=str2bool, default=True, help='whether to export model')
- parser.add_argument('--type', type=str, default='onnx', help='["onnx", "torch"]')
- parser.add_argument('--device', type=str, default='cpu', help='["cpu", "cuda"]')
- parser.add_argument('--quantize', type=str2bool, default=False, help='export quantized model')
- parser.add_argument('--fallback-num', type=int, default=0, help='amp fallback number')
- parser.add_argument('--audio_in', type=str, default=None, help='["wav", "wav.scp"]')
- parser.add_argument('--model_revision', type=str, default=None, help='model_revision')
- parser.add_argument('--calib_num', type=int, default=200, help='calib max num')
+ parser.add_argument("--model-name", type=str, required=True)
+ parser.add_argument("--export-dir", type=str, required=True)
+ parser.add_argument("--export", type=str2bool, default=True, help="whether to export model")
+ parser.add_argument("--type", type=str, default="onnx", help='["onnx", "torchscript", "bladedisc"]')
+ parser.add_argument("--device", type=str, default="cpu", help='["cpu", "cuda"]')
+ parser.add_argument("--quantize", type=str2bool, default=False, help="export quantized model")
+ parser.add_argument("--fallback-num", type=int, default=0, help="amp fallback number")
+ parser.add_argument("--audio_in", type=str, default=None, help='["wav", "wav.scp"]')
+ parser.add_argument("--model_revision", type=str, default=None, help="model_revision")
+ parser.add_argument("--calib_num", type=int, default=200, help="calib max num")
args = parser.parse_args()
-
+
model_dir = args.model_name
+ output_dir = args.model_name
if not Path(args.model_name).exists():
from modelscope.hub.snapshot_download import snapshot_download
+
try:
- model_dir = snapshot_download(args.model_name, cache_dir=args.export_dir, revision=args.model_revision)
- except:
- raise "model_dir must be model_name in modelscope or local path downloaded from modelscope, but is {}".format \
- (model_dir)
- if args.export:
- model_file = os.path.join(model_dir, 'model.onnx')
- if args.quantize:
- model_file = os.path.join(model_dir, 'model_quant.onnx')
- if not os.path.exists(model_file):
- print(".onnx is not exist, begin to export onnx")
- from funasr.bin.export_model import ModelExport
- export_model = ModelExport(
- cache_dir=args.export_dir,
- onnx=True,
- device="cpu",
- quant=args.quantize,
+ model_dir = snapshot_download(
+ args.model_name, cache_dir=args.export_dir, revision=args.model_revision
)
- export_model.export(model_dir)
+ output_dir = os.path.join(args.export_dir, args.model_name)
+ except:
+ raise "model_dir must be model_name in modelscope or local path downloaded from modelscope, but is {}".format(
+ model_dir
+ )
+ if args.export:
+ model_file = os.path.join(model_dir, "model.onnx")
+ if args.quantize:
+ model_file = os.path.join(model_dir, "model_quant.onnx")
+ if args.type == "torchscript":
+ model_file = os.path.join(model_dir, "model.torchscript")
+ args.device = "cuda"
+ elif args.type == "bladedisc":
+ model_file = os.path.join(model_dir, "model_blade.torchscript")
+ args.device = "cuda"
+ if not os.path.exists(model_file):
+ print("model is not exist, begin to export " + model_file)
+ from funasr import AutoModel
+
+ export_model = AutoModel(model=args.model_name, output_dir=output_dir, device=args.device)
+ export_model.export(
+ quantize=args.quantize,
+ type=args.type,
+ )
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
--
Gitblit v1.9.1