From e30a17cf4e715b3d139fa1e0ba01cda1bcf0f884 Mon Sep 17 00:00:00 2001
From: shixian.shi <shixian.shi@alibaba-inc.com>
Date: 星期三, 10 一月 2024 11:23:41 +0800
Subject: [PATCH] update funasr-onnx
---
funasr/utils/timestamp_tools.py | 294 ++++++++++++++++++++++++++++------------------------------
1 files changed, 144 insertions(+), 150 deletions(-)
diff --git a/funasr/utils/timestamp_tools.py b/funasr/utils/timestamp_tools.py
index 489d317..8186dff 100644
--- a/funasr/utils/timestamp_tools.py
+++ b/funasr/utils/timestamp_tools.py
@@ -1,14 +1,28 @@
-from itertools import zip_longest
-
import torch
-import copy
import codecs
import logging
-import edit_distance
import argparse
-import pdb
import numpy as np
-from typing import Any, List, Tuple, Union
+# import edit_distance
+from itertools import zip_longest
+
+
+def cif_wo_hidden(alphas, threshold):
+ batch_size, len_time = alphas.size()
+ # loop varss
+ integrate = torch.zeros([batch_size], device=alphas.device)
+ # intermediate vars along time
+ list_fires = []
+ for t in range(len_time):
+ alpha = alphas[:, t]
+ integrate += alpha
+ list_fires.append(integrate)
+ fire_place = integrate >= threshold
+ integrate = torch.where(fire_place,
+ integrate - torch.ones([batch_size], device=alphas.device)*threshold,
+ integrate)
+ fires = torch.stack(list_fires, 1)
+ return fires
def ts_prediction_lfr6_standard(us_alphas,
@@ -24,19 +38,24 @@
MAX_TOKEN_DURATION = 12
TIME_RATE = 10.0 * 6 / 1000 / 3 # 3 times upsampled
if len(us_alphas.shape) == 2:
- _, peaks = us_alphas[0], us_peaks[0] # support inference batch_size=1 only
+ alphas, peaks = us_alphas[0], us_peaks[0] # support inference batch_size=1 only
else:
- _, peaks = us_alphas, us_peaks
- num_frames = peaks.shape[0]
+ alphas, peaks = us_alphas, us_peaks
if char_list[-1] == '</s>':
char_list = char_list[:-1]
+ fire_place = torch.where(peaks>1.0-1e-4)[0].cpu().numpy() + force_time_shift # total offset
+ if len(fire_place) != len(char_list) + 1:
+ alphas /= (alphas.sum() / (len(char_list) + 1))
+ alphas = alphas.unsqueeze(0)
+ peaks = cif_wo_hidden(alphas, threshold=1.0-1e-4)[0]
+ fire_place = torch.where(peaks>1.0-1e-4)[0].cpu().numpy() + force_time_shift # total offset
+ num_frames = peaks.shape[0]
timestamp_list = []
new_char_list = []
# for bicif model trained with large data, cif2 actually fires when a character starts
# so treat the frames between two peaks as the duration of the former token
fire_place = torch.where(peaks>1.0-1e-4)[0].cpu().numpy() + force_time_shift # total offset
- num_peak = len(fire_place)
- assert num_peak == len(char_list) + 1 # number of peaks is supposed to be number of tokens + 1
+ # assert num_peak == len(char_list) + 1 # number of peaks is supposed to be number of tokens + 1
# begin silence
if fire_place[0] > START_END_THRESHOLD:
# char_list.insert(0, '<sil>')
@@ -80,6 +99,7 @@
def time_stamp_sentence(punc_id_list, time_stamp_postprocessed, text_postprocessed):
+ punc_list = ['锛�', '銆�', '锛�', '銆�']
res = []
if text_postprocessed is None:
return res
@@ -124,34 +144,8 @@
punc_id = int(punc_id) if punc_id is not None else 1
sentence_end = time_stamp[1] if time_stamp is not None else sentence_end
- if punc_id == 2:
- sentence_text += ','
- res.append({
- 'text': sentence_text,
- "start": sentence_start,
- "end": sentence_end,
- "text_seg": sentence_text_seg,
- "ts_list": ts_list
- })
- sentence_text = ''
- sentence_text_seg = ''
- ts_list = []
- sentence_start = sentence_end
- elif punc_id == 3:
- sentence_text += '.'
- res.append({
- 'text': sentence_text,
- "start": sentence_start,
- "end": sentence_end,
- "text_seg": sentence_text_seg,
- "ts_list": ts_list
- })
- sentence_text = ''
- sentence_text_seg = ''
- ts_list = []
- sentence_start = sentence_end
- elif punc_id == 4:
- sentence_text += '?'
+ if punc_id > 1:
+ sentence_text += punc_list[punc_id - 2]
res.append({
'text': sentence_text,
"start": sentence_start,
@@ -166,116 +160,116 @@
return res
-class AverageShiftCalculator():
- def __init__(self):
- logging.warning("Calculating average shift.")
- def __call__(self, file1, file2):
- uttid_list1, ts_dict1 = self.read_timestamps(file1)
- uttid_list2, ts_dict2 = self.read_timestamps(file2)
- uttid_intersection = self._intersection(uttid_list1, uttid_list2)
- res = self.as_cal(uttid_intersection, ts_dict1, ts_dict2)
- logging.warning("Average shift of {} and {}: {}.".format(file1, file2, str(res)[:8]))
- logging.warning("Following timestamp pair differs most: {}, detail:{}".format(self.max_shift, self.max_shift_uttid))
-
- def _intersection(self, list1, list2):
- set1 = set(list1)
- set2 = set(list2)
- if set1 == set2:
- logging.warning("Uttid same checked.")
- return set1
- itsc = list(set1 & set2)
- logging.warning("Uttid differs: file1 {}, file2 {}, lines same {}.".format(len(list1), len(list2), len(itsc)))
- return itsc
-
- def read_timestamps(self, file):
- # read timestamps file in standard format
- uttid_list = []
- ts_dict = {}
- with codecs.open(file, 'r') as fin:
- for line in fin.readlines():
- text = ''
- ts_list = []
- line = line.rstrip()
- uttid = line.split()[0]
- uttid_list.append(uttid)
- body = " ".join(line.split()[1:])
- for pd in body.split(';'):
- if not len(pd): continue
- # pdb.set_trace()
- char, start, end = pd.lstrip(" ").split(' ')
- text += char + ','
- ts_list.append((float(start), float(end)))
- # ts_lists.append(ts_list)
- ts_dict[uttid] = (text[:-1], ts_list)
- logging.warning("File {} read done.".format(file))
- return uttid_list, ts_dict
-
- def _shift(self, filtered_timestamp_list1, filtered_timestamp_list2):
- shift_time = 0
- for fts1, fts2 in zip(filtered_timestamp_list1, filtered_timestamp_list2):
- shift_time += abs(fts1[0] - fts2[0]) + abs(fts1[1] - fts2[1])
- num_tokens = len(filtered_timestamp_list1)
- return shift_time, num_tokens
-
- def as_cal(self, uttid_list, ts_dict1, ts_dict2):
- # calculate average shift between timestamp1 and timestamp2
- # when characters differ, use edit distance alignment
- # and calculate the error between the same characters
- self._accumlated_shift = 0
- self._accumlated_tokens = 0
- self.max_shift = 0
- self.max_shift_uttid = None
- for uttid in uttid_list:
- (t1, ts1) = ts_dict1[uttid]
- (t2, ts2) = ts_dict2[uttid]
- _align, _align2, _align3 = [], [], []
- fts1, fts2 = [], []
- _t1, _t2 = [], []
- sm = edit_distance.SequenceMatcher(t1.split(','), t2.split(','))
- s = sm.get_opcodes()
- for j in range(len(s)):
- if s[j][0] == "replace" or s[j][0] == "insert":
- _align.append(0)
- if s[j][0] == "replace" or s[j][0] == "delete":
- _align3.append(0)
- elif s[j][0] == "equal":
- _align.append(1)
- _align3.append(1)
- else:
- continue
- # use s to index t2
- for a, ts , t in zip(_align, ts2, t2.split(',')):
- if a:
- fts2.append(ts)
- _t2.append(t)
- sm2 = edit_distance.SequenceMatcher(t2.split(','), t1.split(','))
- s = sm2.get_opcodes()
- for j in range(len(s)):
- if s[j][0] == "replace" or s[j][0] == "insert":
- _align2.append(0)
- elif s[j][0] == "equal":
- _align2.append(1)
- else:
- continue
- # use s2 tp index t1
- for a, ts, t in zip(_align3, ts1, t1.split(',')):
- if a:
- fts1.append(ts)
- _t1.append(t)
- if len(fts1) == len(fts2):
- shift_time, num_tokens = self._shift(fts1, fts2)
- self._accumlated_shift += shift_time
- self._accumlated_tokens += num_tokens
- if shift_time/num_tokens > self.max_shift:
- self.max_shift = shift_time/num_tokens
- self.max_shift_uttid = uttid
- else:
- logging.warning("length mismatch")
- return self._accumlated_shift / self._accumlated_tokens
+# class AverageShiftCalculator():
+# def __init__(self):
+# logging.warning("Calculating average shift.")
+# def __call__(self, file1, file2):
+# uttid_list1, ts_dict1 = self.read_timestamps(file1)
+# uttid_list2, ts_dict2 = self.read_timestamps(file2)
+# uttid_intersection = self._intersection(uttid_list1, uttid_list2)
+# res = self.as_cal(uttid_intersection, ts_dict1, ts_dict2)
+# logging.warning("Average shift of {} and {}: {}.".format(file1, file2, str(res)[:8]))
+# logging.warning("Following timestamp pair differs most: {}, detail:{}".format(self.max_shift, self.max_shift_uttid))
+#
+# def _intersection(self, list1, list2):
+# set1 = set(list1)
+# set2 = set(list2)
+# if set1 == set2:
+# logging.warning("Uttid same checked.")
+# return set1
+# itsc = list(set1 & set2)
+# logging.warning("Uttid differs: file1 {}, file2 {}, lines same {}.".format(len(list1), len(list2), len(itsc)))
+# return itsc
+#
+# def read_timestamps(self, file):
+# # read timestamps file in standard format
+# uttid_list = []
+# ts_dict = {}
+# with codecs.open(file, 'r') as fin:
+# for line in fin.readlines():
+# text = ''
+# ts_list = []
+# line = line.rstrip()
+# uttid = line.split()[0]
+# uttid_list.append(uttid)
+# body = " ".join(line.split()[1:])
+# for pd in body.split(';'):
+# if not len(pd): continue
+# # pdb.set_trace()
+# char, start, end = pd.lstrip(" ").split(' ')
+# text += char + ','
+# ts_list.append((float(start), float(end)))
+# # ts_lists.append(ts_list)
+# ts_dict[uttid] = (text[:-1], ts_list)
+# logging.warning("File {} read done.".format(file))
+# return uttid_list, ts_dict
+#
+# def _shift(self, filtered_timestamp_list1, filtered_timestamp_list2):
+# shift_time = 0
+# for fts1, fts2 in zip(filtered_timestamp_list1, filtered_timestamp_list2):
+# shift_time += abs(fts1[0] - fts2[0]) + abs(fts1[1] - fts2[1])
+# num_tokens = len(filtered_timestamp_list1)
+# return shift_time, num_tokens
+#
+# # def as_cal(self, uttid_list, ts_dict1, ts_dict2):
+# # # calculate average shift between timestamp1 and timestamp2
+# # # when characters differ, use edit distance alignment
+# # # and calculate the error between the same characters
+# # self._accumlated_shift = 0
+# # self._accumlated_tokens = 0
+# # self.max_shift = 0
+# # self.max_shift_uttid = None
+# # for uttid in uttid_list:
+# # (t1, ts1) = ts_dict1[uttid]
+# # (t2, ts2) = ts_dict2[uttid]
+# # _align, _align2, _align3 = [], [], []
+# # fts1, fts2 = [], []
+# # _t1, _t2 = [], []
+# # sm = edit_distance.SequenceMatcher(t1.split(','), t2.split(','))
+# # s = sm.get_opcodes()
+# # for j in range(len(s)):
+# # if s[j][0] == "replace" or s[j][0] == "insert":
+# # _align.append(0)
+# # if s[j][0] == "replace" or s[j][0] == "delete":
+# # _align3.append(0)
+# # elif s[j][0] == "equal":
+# # _align.append(1)
+# # _align3.append(1)
+# # else:
+# # continue
+# # # use s to index t2
+# # for a, ts , t in zip(_align, ts2, t2.split(',')):
+# # if a:
+# # fts2.append(ts)
+# # _t2.append(t)
+# # sm2 = edit_distance.SequenceMatcher(t2.split(','), t1.split(','))
+# # s = sm2.get_opcodes()
+# # for j in range(len(s)):
+# # if s[j][0] == "replace" or s[j][0] == "insert":
+# # _align2.append(0)
+# # elif s[j][0] == "equal":
+# # _align2.append(1)
+# # else:
+# # continue
+# # # use s2 tp index t1
+# # for a, ts, t in zip(_align3, ts1, t1.split(',')):
+# # if a:
+# # fts1.append(ts)
+# # _t1.append(t)
+# # if len(fts1) == len(fts2):
+# # shift_time, num_tokens = self._shift(fts1, fts2)
+# # self._accumlated_shift += shift_time
+# # self._accumlated_tokens += num_tokens
+# # if shift_time/num_tokens > self.max_shift:
+# # self.max_shift = shift_time/num_tokens
+# # self.max_shift_uttid = uttid
+# # else:
+# # logging.warning("length mismatch")
+# # return self._accumlated_shift / self._accumlated_tokens
def convert_external_alphas(alphas_file, text_file, output_file):
- from funasr.models.predictor.cif import cif_wo_hidden
+ from funasr.models.paraformer.cif_predictor import cif_wo_hidden
with open(alphas_file, 'r') as f1, open(text_file, 'r') as f2, open(output_file, 'w') as f3:
for line1, line2 in zip(f1.readlines(), f2.readlines()):
line1 = line1.rstrip()
@@ -317,10 +311,10 @@
def main(args):
- if args.mode == 'cal_aas':
- asc = AverageShiftCalculator()
- asc(args.input, args.input2)
- elif args.mode == 'read_ext_alphas':
+ # if args.mode == 'cal_aas':
+ # asc = AverageShiftCalculator()
+ # asc(args.input, args.input2)
+ if args.mode == 'read_ext_alphas':
convert_external_alphas(args.input, args.input2, args.output)
else:
logging.error("Mode {} not in SUPPORTED_MODES: {}.".format(args.mode, SUPPORTED_MODES))
--
Gitblit v1.9.1