From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict
---
funasr/bin/inference.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/funasr/bin/inference.py b/funasr/bin/inference.py
index 7d9c1b9..3aab31a 100644
--- a/funasr/bin/inference.py
+++ b/funasr/bin/inference.py
@@ -115,7 +115,7 @@
vad_model = kwargs.get("vad_model", None)
vad_kwargs = kwargs.get("vad_model_revision", None)
if vad_model is not None:
- print("build vad model")
+ logging.info("Building VAD model.")
vad_kwargs = {"model": vad_model, "model_revision": vad_kwargs}
vad_model, vad_kwargs = self.build_model(**vad_kwargs)
@@ -123,6 +123,7 @@
punc_model = kwargs.get("punc_model", None)
punc_kwargs = kwargs.get("punc_model_revision", None)
if punc_model is not None:
+ logging.info("Building punc model.")
punc_kwargs = {"model": punc_model, "model_revision": punc_kwargs}
punc_model, punc_kwargs = self.build_model(**punc_kwargs)
@@ -130,6 +131,7 @@
spk_model = kwargs.get("spk_model", None)
spk_kwargs = kwargs.get("spk_model_revision", None)
if spk_model is not None:
+ logging.info("Building SPK model.")
spk_kwargs = {"model": spk_model, "model_revision": spk_kwargs}
spk_model, spk_kwargs = self.build_model(**spk_kwargs)
self.cb_model = ClusterBackend()
@@ -403,7 +405,7 @@
spk_embedding = result['spk_embedding']
labels = self.cb_model(spk_embedding, oracle_num=self.preset_spk_num)
del result['spk_embedding']
- sv_output = postprocess(all_segments, None, labels, spk_embedding)
+ sv_output = postprocess(all_segments, None, labels, spk_embedding.cpu())
if self.spk_mode == 'vad_segment':
sentence_list = []
for res, vadsegment in zip(restored_data, vadsegments):
--
Gitblit v1.9.1