From d92cd5ae037ae85ab9730499d99e5c1bd475eed2 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 06 二月 2024 21:22:21 +0800
Subject: [PATCH] Funasr1.0 (#1362)
---
funasr/auto/auto_model.py | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index ae47d35..1345157 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -121,9 +121,6 @@
if spk_mode not in ["default", "vad_segment", "punc_segment"]:
logging.error("spk_mode should be one of default, vad_segment and punc_segment.")
self.spk_mode = spk_mode
- self.preset_spk_num = kwargs.get("preset_spk_num", None)
- if self.preset_spk_num:
- logging.warning("Using preset speaker number: {}".format(self.preset_spk_num))
self.kwargs = kwargs
self.model = model
@@ -174,7 +171,7 @@
# build model
model_class = tables.model_classes.get(kwargs["model"])
model = model_class(**kwargs, **kwargs["model_conf"], vocab_size=vocab_size)
- model.eval()
+
model.to(device)
# init_param
@@ -209,6 +206,7 @@
kwargs = self.kwargs if kwargs is None else kwargs
kwargs.update(cfg)
model = self.model if model is None else model
+ model.eval()
batch_size = kwargs.get("batch_size", 1)
# if kwargs.get("device", "cpu") == "cpu":
@@ -388,11 +386,11 @@
result["text"] = punc_res[0]["text"]
# speaker embedding cluster after resorted
- if self.spk_model is not None:
+ if self.spk_model is not None and kwargs.get('return_spk_res', True):
all_segments = sorted(all_segments, key=lambda x: x[0])
spk_embedding = result['spk_embedding']
- labels = self.cb_model(spk_embedding.cpu(), oracle_num=self.preset_spk_num)
- del result['spk_embedding']
+ labels = self.cb_model(spk_embedding.cpu(), oracle_num=kwargs.get('preset_spk_num', None))
+ # del result['spk_embedding']
sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
if self.spk_mode == 'vad_segment': # recover sentence_list
sentence_list = []
@@ -412,6 +410,7 @@
result['timestamp'], \
result['raw_text'])
result['sentence_info'] = sentence_list
+ del result['spk_embedding']
result["key"] = key
results_ret_list.append(result)
--
Gitblit v1.9.1