From 000d43b7747a8da43cc7522fc4e14e0b1733d417 Mon Sep 17 00:00:00 2001
From: Yabin Li <wucong.lyb@alibaba-inc.com>
Date: 星期四, 22 八月 2024 14:07:50 +0800
Subject: [PATCH] Update SDK_advanced_guide_offline_zh.md
---
funasr/auto/auto_model.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 1c2d2e4..ca1f202 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -114,7 +114,7 @@
try:
from funasr.utils.version_checker import check_for_update
- check_for_update()
+ check_for_update(disable=kwargs.get("disable_update", False))
except:
pass
@@ -264,6 +264,8 @@
def inference(self, input, input_len=None, model=None, kwargs=None, key=None, **cfg):
kwargs = self.kwargs if kwargs is None else kwargs
+ if "cache" in kwargs:
+ kwargs.pop("cache")
deep_update(kwargs, cfg)
model = self.model if model is None else model
model.eval()
@@ -337,9 +339,11 @@
end_vad = time.time()
# FIX(gcf): concat the vad clips for sense vocie model for better aed
- if kwargs.get("merge_vad", False):
+ if cfg.get("merge_vad", False):
for i in range(len(res)):
- res[i]["value"] = merge_vad(res[i]["value"], kwargs.get("merge_length", 15000))
+ res[i]["value"] = merge_vad(
+ res[i]["value"], kwargs.get("merge_length_s", 15) * 1000
+ )
# step.2 compute asr model
model = self.model
@@ -379,6 +383,9 @@
if len(sorted_data) > 0 and len(sorted_data[0]) > 0:
batch_size = max(batch_size, sorted_data[0][0][1] - sorted_data[0][0][0])
+
+ if kwargs["device"] == "cpu":
+ batch_size = 0
beg_idx = 0
beg_asr_total = time.time()
@@ -506,8 +513,8 @@
sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
if self.spk_mode == "vad_segment": # recover sentence_list
sentence_list = []
- for res, vadsegment in zip(restored_data, vadsegments):
- if "timestamp" not in res:
+ for rest, vadsegment in zip(restored_data, vadsegments):
+ if "timestamp" not in rest:
logging.error(
"Only 'iic/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-pytorch' \
and 'iic/speech_seaco_paraformer_large_asr_nat-zh-cn-16k-common-vocab8404-pytorch'\
@@ -517,8 +524,8 @@
{
"start": vadsegment[0],
"end": vadsegment[1],
- "sentence": res["text"],
- "timestamp": res["timestamp"],
+ "sentence": rest["text"],
+ "timestamp": rest["timestamp"],
}
)
elif self.spk_mode == "punc_segment":
--
Gitblit v1.9.1