From e9d2cfc3a134b00f4e98271fbee3838d1ccecbcc Mon Sep 17 00:00:00 2001
From: VirtuosoQ <2416050435@qq.com>
Date: 星期五, 26 四月 2024 14:59:30 +0800
Subject: [PATCH] FunASR java http client
---
funasr/models/lcbnet/model.py | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/funasr/models/lcbnet/model.py b/funasr/models/lcbnet/model.py
index 45b1ee5..3ac319c 100644
--- a/funasr/models/lcbnet/model.py
+++ b/funasr/models/lcbnet/model.py
@@ -111,8 +111,8 @@
)
self.blank_id = blank_id
- self.sos = sos if sos is not None else vocab_size - 1
- self.eos = eos if eos is not None else vocab_size - 1
+ self.sos = vocab_size - 1
+ self.eos = vocab_size - 1
self.vocab_size = vocab_size
self.ignore_id = ignore_id
self.ctc_weight = ctc_weight
@@ -181,8 +181,7 @@
text: (Batch, Length)
text_lengths: (Batch,)
"""
- # import pdb;
- # pdb.set_trace()
+
if len(text_lengths.size()) > 1:
text_lengths = text_lengths[:, 0]
if len(speech_lengths.size()) > 1:
@@ -274,15 +273,12 @@
ind: int
"""
with autocast(False):
- pdb.set_trace()
# Data augmentation
if self.specaug is not None and self.training:
speech, speech_lengths = self.specaug(speech, speech_lengths)
- pdb.set_trace()
# Normalization for feature: e.g. Global-CMVN, Utterance-CMVN
if self.normalize is not None:
speech, speech_lengths = self.normalize(speech, speech_lengths)
- pdb.set_trace()
# Forward encoder
# feats: (Batch, Length, Dim)
# -> encoder_out: (Batch, Length2, Dim2)
@@ -299,7 +295,6 @@
if intermediate_outs is not None:
return (encoder_out, intermediate_outs), encoder_out_lens
- pdb.set_trace()
return encoder_out, encoder_out_lens
def _calc_att_loss(
@@ -379,14 +374,14 @@
scorers["ngram"] = ngram
weights = dict(
- decoder=1.0 - kwargs.get("decoding_ctc_weight", 0.5),
- ctc=kwargs.get("decoding_ctc_weight", 0.5),
+ decoder=1.0 - kwargs.get("decoding_ctc_weight", 0.3),
+ ctc=kwargs.get("decoding_ctc_weight", 0.3),
lm=kwargs.get("lm_weight", 0.0),
ngram=kwargs.get("ngram_weight", 0.0),
length_bonus=kwargs.get("penalty", 0.0),
)
beam_search = BeamSearch(
- beam_size=kwargs.get("beam_size", 10),
+ beam_size=kwargs.get("beam_size", 20),
weights=weights,
scorers=scorers,
sos=self.sos,
@@ -432,7 +427,10 @@
time2 = time.perf_counter()
meta_data["load_data"] = f"{time2 - time1:0.3f}"
audio_sample_list = sample_list[0]
- ocr_sample_list = sample_list[1]
+ if len(sample_list) >1:
+ ocr_sample_list = sample_list[1]
+ else:
+ ocr_sample_list = [[294, 0]]
speech, speech_lengths = extract_fbank(audio_sample_list, data_type=kwargs.get("data_type", "sound"),
frontend=frontend)
time3 = time.perf_counter()
@@ -442,19 +440,23 @@
speech = speech.to(device=kwargs["device"])
speech_lengths = speech_lengths.to(device=kwargs["device"])
- pdb.set_trace()
# Encoder
encoder_out, encoder_out_lens = self.encode(speech, speech_lengths)
if isinstance(encoder_out, tuple):
encoder_out = encoder_out[0]
-
+
+ ocr_list_new = [[x + 1 if x != 0 else x for x in sublist] for sublist in ocr_sample_list]
+ ocr = torch.tensor(ocr_list_new).to(device=kwargs["device"])
+ ocr_lengths = ocr.new_full([1], dtype=torch.long, fill_value=ocr.size(1)).to(device=kwargs["device"])
+ ocr, ocr_lens, _ = self.text_encoder(ocr, ocr_lengths)
+ fusion_out, _, _, _ = self.fusion_encoder(encoder_out,None, ocr, None)
+ encoder_out = encoder_out + fusion_out
# c. Passed the encoder result and the beam search
nbest_hyps = self.beam_search(
x=encoder_out[0], maxlenratio=kwargs.get("maxlenratio", 0.0), minlenratio=kwargs.get("minlenratio", 0.0)
)
nbest_hyps = nbest_hyps[: self.nbest]
-
results = []
b, n, d = encoder_out.size()
@@ -480,7 +482,7 @@
# Change integer-ids to tokens
token = tokenizer.ids2tokens(token_int)
text = tokenizer.tokens2text(token)
-
+
text_postprocessed, _ = postprocess_utils.sentence_postprocess(token)
result_i = {"key": key[i], "token": token, "text": text_postprocessed}
results.append(result_i)
--
Gitblit v1.9.1