From 3c173e6187ea49520b1e946c9d5de66c824f0864 Mon Sep 17 00:00:00 2001
From: 语帆 <yf352572@alibaba-inc.com>
Date: 星期三, 21 二月 2024 17:02:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev_yf
---
funasr/auto/auto_model.py | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 78e47cc..60aeb16 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -23,7 +23,7 @@
from funasr.models.campplus.cluster_backend import ClusterBackend
except:
print("If you want to use the speaker diarization, please `pip install hdbscan`")
-
+import pdb
def prepare_data_iterator(data_in, input_len=None, data_type=None, key=None):
"""
@@ -209,13 +209,15 @@
kwargs.update(cfg)
model = self.model if model is None else model
model.eval()
+ pdb.set_trace()
batch_size = kwargs.get("batch_size", 1)
# if kwargs.get("device", "cpu") == "cpu":
# batch_size = 1
key_list, data_list = prepare_data_iterator(input, input_len=input_len, data_type=kwargs.get("data_type", None), key=key)
-
+ pdb.set_trace()
+
speed_stats = {}
asr_result_list = []
num_samples = len(data_list)
@@ -223,20 +225,25 @@
pbar = tqdm(colour="blue", total=num_samples, dynamic_ncols=True) if not disable_pbar else None
time_speech_total = 0.0
time_escape_total = 0.0
+ pdb.set_trace()
for beg_idx in range(0, num_samples, batch_size):
+ pdb.set_trace()
end_idx = min(num_samples, beg_idx + batch_size)
data_batch = data_list[beg_idx:end_idx]
key_batch = key_list[beg_idx:end_idx]
batch = {"data_in": data_batch, "key": key_batch}
+ pdb.set_trace()
if (end_idx - beg_idx) == 1 and kwargs.get("data_type", None) == "fbank": # fbank
batch["data_in"] = data_batch[0]
batch["data_lengths"] = input_len
time1 = time.perf_counter()
with torch.no_grad():
+ pdb.set_trace()
results, meta_data = model.inference(**batch, **kwargs)
time2 = time.perf_counter()
+ pdb.set_trace()
asr_result_list.extend(results)
# batch_data_time = time_per_frame_s * data_batch_i["speech_lengths"].sum().item()
@@ -379,12 +386,14 @@
result[k] = restored_data[j][k]
else:
result[k] += restored_data[j][k]
-
+
+ return_raw_text = kwargs.get('return_raw_text', False)
# step.3 compute punc model
if self.punc_model is not None:
self.punc_kwargs.update(cfg)
punc_res = self.inference(result["text"], model=self.punc_model, kwargs=self.punc_kwargs, disable_pbar=True, **cfg)
raw_text = copy.copy(result["text"])
+ if return_raw_text: result['raw_text'] = raw_text
result["text"] = punc_res[0]["text"]
else:
raw_text = None
@@ -403,26 +412,28 @@
for res, vadsegment in zip(restored_data, vadsegments):
if 'timestamp' not in res:
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'\
- can predict timestamp, and speaker diarization relies on timestamps.")
- sentence_list.append({"start": vadsegment[0],\
- "end": vadsegment[1],
- "sentence": res['text'],
- "timestamp": res['timestamp']})
+ and 'iic/speech_seaco_paraformer_large_asr_nat-zh-cn-16k-common-vocab8404-pytorch'\
+ can predict timestamp, and speaker diarization relies on timestamps.")
+ sentence_list.append({"start": vadsegment[0],
+ "end": vadsegment[1],
+ "sentence": res['text'],
+ "timestamp": res['timestamp']})
elif self.spk_mode == 'punc_segment':
if 'timestamp' not in result:
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'\
- can predict timestamp, and speaker diarization relies on timestamps.")
- sentence_list = timestamp_sentence(punc_res[0]['punc_array'], \
- result['timestamp'], \
- raw_text)
+ and 'iic/speech_seaco_paraformer_large_asr_nat-zh-cn-16k-common-vocab8404-pytorch'\
+ can predict timestamp, and speaker diarization relies on timestamps.")
+ sentence_list = timestamp_sentence(punc_res[0]['punc_array'],
+ result['timestamp'],
+ raw_text,
+ return_raw_text=return_raw_text)
distribute_spk(sentence_list, sv_output)
result['sentence_info'] = sentence_list
elif kwargs.get("sentence_timestamp", False):
- sentence_list = timestamp_sentence(punc_res[0]['punc_array'], \
- result['timestamp'], \
- raw_text)
+ sentence_list = timestamp_sentence(punc_res[0]['punc_array'],
+ result['timestamp'],
+ raw_text,
+ return_raw_text=return_raw_text)
result['sentence_info'] = sentence_list
if "spk_embedding" in result: del result['spk_embedding']
--
Gitblit v1.9.1