From 268adb8c1eafb95498e91b9657ed7f66d4d71c20 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期三, 09 八月 2023 22:26:19 +0800
Subject: [PATCH] fix catch for vad
---
funasr/export/export_model.py | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/funasr/export/export_model.py b/funasr/export/export_model.py
index a68724a..8c3108b 100644
--- a/funasr/export/export_model.py
+++ b/funasr/export/export_model.py
@@ -9,7 +9,7 @@
from funasr.export.models import get_model
import numpy as np
import random
-from funasr.utils.types import str2bool
+from funasr.utils.types import str2bool, str2triple_str
# torch_version = float(".".join(torch.__version__.split(".")[:2]))
# assert torch_version > 1.9
@@ -55,18 +55,21 @@
# export encoder1
self.export_config["model_name"] = "model"
- model = get_model(
+ models = get_model(
model,
self.export_config,
)
- model.eval()
- # self._export_onnx(model, verbose, export_dir)
- if self.onnx:
- self._export_onnx(model, verbose, export_dir)
- else:
- self._export_torchscripts(model, verbose, export_dir)
-
- print("output dir: {}".format(export_dir))
+ if not isinstance(models, tuple):
+ models = (models,)
+
+ for i, model in enumerate(models):
+ model.eval()
+ if self.onnx:
+ self._export_onnx(model, verbose, export_dir)
+ else:
+ self._export_torchscripts(model, verbose, export_dir)
+
+ print("output dir: {}".format(export_dir))
def _torch_quantize(self, model):
@@ -192,6 +195,7 @@
config, model_file, cmvn_file, 'cpu'
)
self.frontend = model.frontend
+ self.export_config["feats_dim"] = 560
elif mode.startswith('offline'):
from funasr.tasks.vad import VADTask
config = os.path.join(model_dir, 'vad.yaml')
@@ -263,7 +267,8 @@
if __name__ == '__main__':
import argparse
parser = argparse.ArgumentParser()
- parser.add_argument('--model-name', type=str, required=True)
+ # parser.add_argument('--model-name', type=str, required=True)
+ parser.add_argument('--model-name', type=str, action="append", required=True, default=[])
parser.add_argument('--export-dir', type=str, required=True)
parser.add_argument('--type', type=str, default='onnx', help='["onnx", "torch"]')
parser.add_argument('--device', type=str, default='cpu', help='["cpu", "cuda"]')
@@ -284,4 +289,6 @@
calib_num=args.calib_num,
model_revision=args.model_revision,
)
- export_model.export(args.model_name)
+ for model_name in args.model_name:
+ print("export model: {}".format(model_name))
+ export_model.export(model_name)
--
Gitblit v1.9.1