From 6eaf50a063c08717db1cf346d1c9766ff1b83539 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 09 一月 2024 22:17:19 +0800
Subject: [PATCH] funasr1.0 paraformer_streaming

---
 /dev/null                                   |  507 ----------------------
 funasr/download/download_from_hub.py        |   15 
 funasr/models/paraformer_streaming/model.py |  820 -----------------------------------
 funasr/models/paraformer/decoder.py         |    4 
 4 files changed, 16 insertions(+), 1,330 deletions(-)

diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 8a4044d..73578f2 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -7,17 +7,17 @@
 def download_model(**kwargs):
 	model_hub = kwargs.get("model_hub", "ms")
 	if model_hub == "ms":
-		kwargs = download_fr_ms(**kwargs)
+		kwargs = download_from_ms(**kwargs)
 	
 	return kwargs
 
-def download_fr_ms(**kwargs):
+def download_from_ms(**kwargs):
 	model_or_path = kwargs.get("model")
 	if model_or_path in name_maps_ms:
 		model_or_path = name_maps_ms[model_or_path]
 	model_revision = kwargs.get("model_revision")
 	if not os.path.exists(model_or_path):
-		model_or_path = get_or_download_model_dir(model_or_path, model_revision, is_training=kwargs.get("is_training"))
+		model_or_path = get_or_download_model_dir(model_or_path, model_revision, is_training=kwargs.get("is_training"), check_latest=kwargs.get("kwargs", True))
 	
 	config = os.path.join(model_or_path, "config.yaml")
 	if os.path.exists(config) and os.path.exists(os.path.join(model_or_path, "model.pb")):
@@ -49,9 +49,10 @@
 	return OmegaConf.to_container(kwargs, resolve=True)
 
 def get_or_download_model_dir(
-                              model,
-                              model_revision=None,
-							  is_training=False,
+		model,
+		model_revision=None,
+		is_training=False,
+		check_latest=True,
 	):
 	""" Get local model directory or download model if necessary.
 
@@ -67,7 +68,7 @@
 	
 	key = Invoke.LOCAL_TRAINER if is_training else Invoke.PIPELINE
 	
-	if os.path.exists(model):
+	if os.path.exists(model) and check_latest:
 		model_cache_dir = model if os.path.isdir(
 			model) else os.path.dirname(model)
 		try:
diff --git a/funasr/models/paraformer/decoder.py b/funasr/models/paraformer/decoder.py
index b4de6cd..1df27e8 100644
--- a/funasr/models/paraformer/decoder.py
+++ b/funasr/models/paraformer/decoder.py
@@ -525,8 +525,8 @@
         return y, new_cache
 
 
-@tables.register("decoder_classes", "ParaformerDecoderSAN")
-class ParaformerDecoderSAN(BaseTransformerDecoder):
+@tables.register("decoder_classes", "ParaformerSANDecoder")
+class ParaformerSANDecoder(BaseTransformerDecoder):
     """
     Author: Speech Lab of DAMO Academy, Alibaba Group
     Paraformer: Fast and Accurate Parallel Transformer for Non-autoregressive End-to-End Speech Recognition
diff --git a/funasr/models/paraformer_streaming/model.py b/funasr/models/paraformer_streaming/model.py
index e57bc34..498d363 100644
--- a/funasr/models/paraformer_streaming/model.py
+++ b/funasr/models/paraformer_streaming/model.py
@@ -31,8 +31,6 @@
 
 from funasr.models.paraformer.search import Hypothesis
 
-# from funasr.models.model_class_factory import *
-
 if LooseVersion(torch.__version__) >= LooseVersion("1.6.0"):
 	from torch.cuda.amp import autocast
 else:
@@ -44,819 +42,13 @@
 from funasr.utils import postprocess_utils
 from funasr.utils.datadir_writer import DatadirWriter
 from funasr.utils.timestamp_tools import ts_prediction_lfr6_standard
-from funasr.register import tables
+
 from funasr.models.ctc.ctc import CTC
+from funasr.models.paraformer.model import Paraformer
 
-class Paraformer(nn.Module):
-	"""
-	Author: Speech Lab of DAMO Academy, Alibaba Group
-	Paraformer: Fast and Accurate Parallel Transformer for Non-autoregressive End-to-End Speech Recognition
-	https://arxiv.org/abs/2206.08317
-	"""
-	
-	def __init__(
-		self,
-		# token_list: Union[Tuple[str, ...], List[str]],
-		frontend: Optional[str] = None,
-		frontend_conf: Optional[Dict] = None,
-		specaug: Optional[str] = None,
-		specaug_conf: Optional[Dict] = None,
-		normalize: str = None,
-		normalize_conf: Optional[Dict] = None,
-		encoder: str = None,
-		encoder_conf: Optional[Dict] = None,
-		decoder: str = None,
-		decoder_conf: Optional[Dict] = None,
-		ctc: str = None,
-		ctc_conf: Optional[Dict] = None,
-		predictor: str = None,
-		predictor_conf: Optional[Dict] = None,
-		ctc_weight: float = 0.5,
-		input_size: int = 80,
-		vocab_size: int = -1,
-		ignore_id: int = -1,
-		blank_id: int = 0,
-		sos: int = 1,
-		eos: int = 2,
-		lsm_weight: float = 0.0,
-		length_normalized_loss: bool = False,
-		# report_cer: bool = True,
-		# report_wer: bool = True,
-		# sym_space: str = "<space>",
-		# sym_blank: str = "<blank>",
-		# extract_feats_in_collect_stats: bool = True,
-		# predictor=None,
-		predictor_weight: float = 0.0,
-		predictor_bias: int = 0,
-		sampling_ratio: float = 0.2,
-		share_embedding: bool = False,
-		# preencoder: Optional[AbsPreEncoder] = None,
-		# postencoder: Optional[AbsPostEncoder] = None,
-		use_1st_decoder_loss: bool = False,
-		**kwargs,
-	):
+from funasr.register import tables
 
-		super().__init__()
-		
-		# import pdb;
-		# pdb.set_trace()
-		
-		if frontend is not None:
-			frontend_class = tables.frontend_classes.get_class(frontend.lower())
-			frontend = frontend_class(**frontend_conf)
-		if specaug is not None:
-			specaug_class = tables.specaug_classes.get_class(specaug.lower())
-			specaug = specaug_class(**specaug_conf)
-		if normalize is not None:
-			normalize_class = tables.normalize_classes.get_class(normalize.lower())
-			normalize = normalize_class(**normalize_conf)
-		encoder_class = tables.encoder_classes.get_class(encoder.lower())
-		encoder = encoder_class(input_size=input_size, **encoder_conf)
-		encoder_output_size = encoder.output_size()
-		if decoder is not None:
-			decoder_class = tables.decoder_classes.get_class(decoder.lower())
-			decoder = decoder_class(
-				vocab_size=vocab_size,
-				encoder_output_size=encoder_output_size,
-				**decoder_conf,
-			)
-		if ctc_weight > 0.0:
-			
-			if ctc_conf is None:
-				ctc_conf = {}
-			
-			ctc = CTC(
-				odim=vocab_size, encoder_output_size=encoder_output_size, **ctc_conf
-			)
-		if predictor is not None:
-			predictor_class = tables.predictor_classes.get_class(predictor.lower())
-			predictor = predictor_class(**predictor_conf)
-		
-		# note that eos is the same as sos (equivalent ID)
-		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.vocab_size = vocab_size
-		self.ignore_id = ignore_id
-		self.ctc_weight = ctc_weight
-		# self.token_list = token_list.copy()
-		#
-		self.frontend = frontend
-		self.specaug = specaug
-		self.normalize = normalize
-		# self.preencoder = preencoder
-		# self.postencoder = postencoder
-		self.encoder = encoder
-		#
-		# if not hasattr(self.encoder, "interctc_use_conditioning"):
-		# 	self.encoder.interctc_use_conditioning = False
-		# if self.encoder.interctc_use_conditioning:
-		# 	self.encoder.conditioning_layer = torch.nn.Linear(
-		# 		vocab_size, self.encoder.output_size()
-		# 	)
-		#
-		# self.error_calculator = None
-		#
-		if ctc_weight == 1.0:
-			self.decoder = None
-		else:
-			self.decoder = decoder
-		
-		self.criterion_att = LabelSmoothingLoss(
-			size=vocab_size,
-			padding_idx=ignore_id,
-			smoothing=lsm_weight,
-			normalize_length=length_normalized_loss,
-		)
-		#
-		# if report_cer or report_wer:
-		# 	self.error_calculator = ErrorCalculator(
-		# 		token_list, sym_space, sym_blank, report_cer, report_wer
-		# 	)
-		#
-		if ctc_weight == 0.0:
-			self.ctc = None
-		else:
-			self.ctc = ctc
-		#
-		# self.extract_feats_in_collect_stats = extract_feats_in_collect_stats
-		self.predictor = predictor
-		self.predictor_weight = predictor_weight
-		self.predictor_bias = predictor_bias
-		self.sampling_ratio = sampling_ratio
-		self.criterion_pre = mae_loss(normalize_length=length_normalized_loss)
-		# self.step_cur = 0
-		#
-		self.share_embedding = share_embedding
-		if self.share_embedding:
-			self.decoder.embed = None
-		
-		self.use_1st_decoder_loss = use_1st_decoder_loss
-		self.length_normalized_loss = length_normalized_loss
-		self.beam_search = None
-	
-	def forward(
-		self,
-		speech: torch.Tensor,
-		speech_lengths: torch.Tensor,
-		text: torch.Tensor,
-		text_lengths: torch.Tensor,
-		**kwargs,
-	) -> Tuple[torch.Tensor, Dict[str, torch.Tensor], torch.Tensor]:
-		"""Encoder + Decoder + Calc loss
-		Args:
-				speech: (Batch, Length, ...)
-				speech_lengths: (Batch, )
-				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:
-			speech_lengths = speech_lengths[:, 0]
-		
-		batch_size = speech.shape[0]
-		
-		
-		# Encoder
-		encoder_out, encoder_out_lens = self.encode(speech, speech_lengths)
-
-		
-		loss_ctc, cer_ctc = None, None
-		loss_pre = None
-		stats = dict()
-		
-		# decoder: CTC branch
-		if self.ctc_weight != 0.0:
-			loss_ctc, cer_ctc = self._calc_ctc_loss(
-				encoder_out, encoder_out_lens, text, text_lengths
-			)
-			
-			# Collect CTC branch stats
-			stats["loss_ctc"] = loss_ctc.detach() if loss_ctc is not None else None
-			stats["cer_ctc"] = cer_ctc
-		
-
-		# decoder: Attention decoder branch
-		loss_att, acc_att, cer_att, wer_att, loss_pre, pre_loss_att = self._calc_att_loss(
-			encoder_out, encoder_out_lens, text, text_lengths
-		)
-		
-		# 3. CTC-Att loss definition
-		if self.ctc_weight == 0.0:
-			loss = loss_att + loss_pre * self.predictor_weight
-		else:
-			loss = self.ctc_weight * loss_ctc + (1 - self.ctc_weight) * loss_att + loss_pre * self.predictor_weight
-		
-		
-		# Collect Attn branch stats
-		stats["loss_att"] = loss_att.detach() if loss_att is not None else None
-		stats["pre_loss_att"] = pre_loss_att.detach() if pre_loss_att is not None else None
-		stats["acc"] = acc_att
-		stats["cer"] = cer_att
-		stats["wer"] = wer_att
-		stats["loss_pre"] = loss_pre.detach().cpu() if loss_pre is not None else None
-		
-		stats["loss"] = torch.clone(loss.detach())
-		
-		# force_gatherable: to-device and to-tensor if scalar for DataParallel
-		if self.length_normalized_loss:
-			batch_size = (text_lengths + self.predictor_bias).sum()
-		loss, stats, weight = force_gatherable((loss, stats, batch_size), loss.device)
-		return loss, stats, weight
-	
-
-	def encode(
-		self, speech: torch.Tensor, speech_lengths: torch.Tensor, **kwargs,
-	) -> Tuple[torch.Tensor, torch.Tensor]:
-		"""Frontend + Encoder. Note that this method is used by asr_inference.py
-		Args:
-				speech: (Batch, Length, ...)
-				speech_lengths: (Batch, )
-				ind: int
-		"""
-		with autocast(False):
-
-			# Data augmentation
-			if self.specaug is not None and self.training:
-				speech, speech_lengths = self.specaug(speech, speech_lengths)
-			
-			# Normalization for feature: e.g. Global-CMVN, Utterance-CMVN
-			if self.normalize is not None:
-				speech, speech_lengths = self.normalize(speech, speech_lengths)
-		
-
-		# Forward encoder
-		encoder_out, encoder_out_lens, _ = self.encoder(speech, speech_lengths)
-		if isinstance(encoder_out, tuple):
-			encoder_out = encoder_out[0]
-
-		return encoder_out, encoder_out_lens
-	
-	def calc_predictor(self, encoder_out, encoder_out_lens):
-		
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index = self.predictor(encoder_out, None,
-		                                                                               encoder_out_mask,
-		                                                                               ignore_id=self.ignore_id)
-		return pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index
-	
-	def cal_decoder_with_predictor(self, encoder_out, encoder_out_lens, sematic_embeds, ys_pad_lens):
-		
-		decoder_outs = self.decoder(
-			encoder_out, encoder_out_lens, sematic_embeds, ys_pad_lens
-		)
-		decoder_out = decoder_outs[0]
-		decoder_out = torch.log_softmax(decoder_out, dim=-1)
-		return decoder_out, ys_pad_lens
-
-	def _calc_att_loss(
-		self,
-		encoder_out: torch.Tensor,
-		encoder_out_lens: torch.Tensor,
-		ys_pad: torch.Tensor,
-		ys_pad_lens: torch.Tensor,
-	):
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		if self.predictor_bias == 1:
-			_, ys_pad = add_sos_eos(ys_pad, self.sos, self.eos, self.ignore_id)
-			ys_pad_lens = ys_pad_lens + self.predictor_bias
-		pre_acoustic_embeds, pre_token_length, _, pre_peak_index = self.predictor(encoder_out, ys_pad, encoder_out_mask,
-		                                                                          ignore_id=self.ignore_id)
-		
-		# 0. sampler
-		decoder_out_1st = None
-		pre_loss_att = None
-		if self.sampling_ratio > 0.0:
-
-			sematic_embeds, decoder_out_1st = self.sampler(encoder_out, encoder_out_lens, ys_pad, ys_pad_lens,
-			                                               pre_acoustic_embeds)
-		else:
-			sematic_embeds = pre_acoustic_embeds
-		
-		# 1. Forward decoder
-		decoder_outs = self.decoder(
-			encoder_out, encoder_out_lens, sematic_embeds, ys_pad_lens
-		)
-		decoder_out, _ = decoder_outs[0], decoder_outs[1]
-		
-		if decoder_out_1st is None:
-			decoder_out_1st = decoder_out
-		# 2. Compute attention loss
-		loss_att = self.criterion_att(decoder_out, ys_pad)
-		acc_att = th_accuracy(
-			decoder_out_1st.view(-1, self.vocab_size),
-			ys_pad,
-			ignore_label=self.ignore_id,
-		)
-		loss_pre = self.criterion_pre(ys_pad_lens.type_as(pre_token_length), pre_token_length)
-		
-		# Compute cer/wer using attention-decoder
-		if self.training or self.error_calculator is None:
-			cer_att, wer_att = None, None
-		else:
-			ys_hat = decoder_out_1st.argmax(dim=-1)
-			cer_att, wer_att = self.error_calculator(ys_hat.cpu(), ys_pad.cpu())
-		
-		return loss_att, acc_att, cer_att, wer_att, loss_pre, pre_loss_att
-	
-	def sampler(self, encoder_out, encoder_out_lens, ys_pad, ys_pad_lens, pre_acoustic_embeds):
-		
-		tgt_mask = (~make_pad_mask(ys_pad_lens, maxlen=ys_pad_lens.max())[:, :, None]).to(ys_pad.device)
-		ys_pad_masked = ys_pad * tgt_mask[:, :, 0]
-		if self.share_embedding:
-			ys_pad_embed = self.decoder.output_layer.weight[ys_pad_masked]
-		else:
-			ys_pad_embed = self.decoder.embed(ys_pad_masked)
-		with torch.no_grad():
-			decoder_outs = self.decoder(
-				encoder_out, encoder_out_lens, pre_acoustic_embeds, ys_pad_lens
-			)
-			decoder_out, _ = decoder_outs[0], decoder_outs[1]
-			pred_tokens = decoder_out.argmax(-1)
-			nonpad_positions = ys_pad.ne(self.ignore_id)
-			seq_lens = (nonpad_positions).sum(1)
-			same_num = ((pred_tokens == ys_pad) & nonpad_positions).sum(1)
-			input_mask = torch.ones_like(nonpad_positions)
-			bsz, seq_len = ys_pad.size()
-			for li in range(bsz):
-				target_num = (((seq_lens[li] - same_num[li].sum()).float()) * self.sampling_ratio).long()
-				if target_num > 0:
-					input_mask[li].scatter_(dim=0,
-					                        index=torch.randperm(seq_lens[li])[:target_num].to(input_mask.device),
-					                        value=0)
-			input_mask = input_mask.eq(1)
-			input_mask = input_mask.masked_fill(~nonpad_positions, False)
-			input_mask_expand_dim = input_mask.unsqueeze(2).to(pre_acoustic_embeds.device)
-		
-		sematic_embeds = pre_acoustic_embeds.masked_fill(~input_mask_expand_dim, 0) + ys_pad_embed.masked_fill(
-			input_mask_expand_dim, 0)
-		return sematic_embeds * tgt_mask, decoder_out * tgt_mask
-		
-	def _calc_ctc_loss(
-		self,
-		encoder_out: torch.Tensor,
-		encoder_out_lens: torch.Tensor,
-		ys_pad: torch.Tensor,
-		ys_pad_lens: torch.Tensor,
-	):
-		# Calc CTC loss
-		loss_ctc = self.ctc(encoder_out, encoder_out_lens, ys_pad, ys_pad_lens)
-		
-		# Calc CER using CTC
-		cer_ctc = None
-		if not self.training and self.error_calculator is not None:
-			ys_hat = self.ctc.argmax(encoder_out).data
-			cer_ctc = self.error_calculator(ys_hat.cpu(), ys_pad.cpu(), is_ctc=True)
-		return loss_ctc, cer_ctc
-
-	
-	def init_beam_search(self,
-	                     **kwargs,
-	                     ):
-		from funasr.models.paraformer.search import BeamSearchPara
-		from funasr.models.transformer.scorers.ctc import CTCPrefixScorer
-		from funasr.models.transformer.scorers.length_bonus import LengthBonus
-	
-		# 1. Build ASR model
-		scorers = {}
-		
-		if self.ctc != None:
-			ctc = CTCPrefixScorer(ctc=self.ctc, eos=self.eos)
-			scorers.update(
-				ctc=ctc
-			)
-		token_list = kwargs.get("token_list")
-		scorers.update(
-			length_bonus=LengthBonus(len(token_list)),
-		)
-
-		
-		# 3. Build ngram model
-		# ngram is not supported now
-		ngram = None
-		scorers["ngram"] = ngram
-		
-		weights = dict(
-			decoder=1.0 - kwargs.get("decoding_ctc_weight"),
-			ctc=kwargs.get("decoding_ctc_weight", 0.0),
-			lm=kwargs.get("lm_weight", 0.0),
-			ngram=kwargs.get("ngram_weight", 0.0),
-			length_bonus=kwargs.get("penalty", 0.0),
-		)
-		beam_search = BeamSearchPara(
-			beam_size=kwargs.get("beam_size", 2),
-			weights=weights,
-			scorers=scorers,
-			sos=self.sos,
-			eos=self.eos,
-			vocab_size=len(token_list),
-			token_list=token_list,
-			pre_beam_score_key=None if self.ctc_weight == 1.0 else "full",
-		)
-		# beam_search.to(device=kwargs.get("device", "cpu"), dtype=getattr(torch, kwargs.get("dtype", "float32"))).eval()
-		# for scorer in scorers.values():
-		# 	if isinstance(scorer, torch.nn.Module):
-		# 		scorer.to(device=kwargs.get("device", "cpu"), dtype=getattr(torch, kwargs.get("dtype", "float32"))).eval()
-		self.beam_search = beam_search
-		
-	def generate(self,
-             data_in: list,
-             data_lengths: list=None,
-             key: list=None,
-             tokenizer=None,
-             **kwargs,
-             ):
-		
-		# init beamsearch
-		is_use_ctc = kwargs.get("decoding_ctc_weight", 0.0) > 0.00001 and self.ctc != None
-		is_use_lm = kwargs.get("lm_weight", 0.0) > 0.00001 and kwargs.get("lm_file", None) is not None
-		if self.beam_search is None and (is_use_lm or is_use_ctc):
-			logging.info("enable beam_search")
-			self.init_beam_search(**kwargs)
-			self.nbest = kwargs.get("nbest", 1)
-		
-		meta_data = {}
-		# extract fbank feats
-		time1 = time.perf_counter()
-		audio_sample_list = load_audio_text_image_video(data_in, fs=self.frontend.fs, audio_fs=kwargs.get("fs", 16000))
-		time2 = time.perf_counter()
-		meta_data["load_data"] = f"{time2 - time1:0.3f}"
-		speech, speech_lengths = extract_fbank(audio_sample_list, data_type=kwargs.get("data_type", "sound"), frontend=self.frontend)
-		time3 = time.perf_counter()
-		meta_data["extract_feat"] = f"{time3 - time2:0.3f}"
-		meta_data["batch_data_time"] = speech_lengths.sum().item() * self.frontend.frame_shift * self.frontend.lfr_n / 1000
-		
-		speech.to(device=kwargs["device"]), speech_lengths.to(device=kwargs["device"])
-
-		# Encoder
-		encoder_out, encoder_out_lens = self.encode(speech, speech_lengths)
-		if isinstance(encoder_out, tuple):
-			encoder_out = encoder_out[0]
-		
-		# predictor
-		predictor_outs = self.calc_predictor(encoder_out, encoder_out_lens)
-		pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index = predictor_outs[0], predictor_outs[1], \
-		                                                                predictor_outs[2], predictor_outs[3]
-		pre_token_length = pre_token_length.round().long()
-		if torch.max(pre_token_length) < 1:
-			return []
-		decoder_outs = self.cal_decoder_with_predictor(encoder_out, encoder_out_lens, pre_acoustic_embeds,
-		                                                         pre_token_length)
-		decoder_out, ys_pad_lens = decoder_outs[0], decoder_outs[1]
-
-
-		results = []
-		b, n, d = decoder_out.size()
-		for i in range(b):
-			x = encoder_out[i, :encoder_out_lens[i], :]
-			am_scores = decoder_out[i, :pre_token_length[i], :]
-			if self.beam_search is not None:
-				nbest_hyps = self.beam_search(
-					x=x, am_scores=am_scores, maxlenratio=kwargs.get("maxlenratio", 0.0), minlenratio=kwargs.get("minlenratio", 0.0)
-				)
-				
-				nbest_hyps = nbest_hyps[: self.nbest]
-			else:
-
-				yseq = am_scores.argmax(dim=-1)
-				score = am_scores.max(dim=-1)[0]
-				score = torch.sum(score, dim=-1)
-				# pad with mask tokens to ensure compatibility with sos/eos tokens
-				yseq = torch.tensor(
-					[self.sos] + yseq.tolist() + [self.eos], device=yseq.device
-				)
-				nbest_hyps = [Hypothesis(yseq=yseq, score=score)]
-			for nbest_idx, hyp in enumerate(nbest_hyps):
-				ibest_writer = None
-				if ibest_writer is None and kwargs.get("output_dir") is not None:
-					writer = DatadirWriter(kwargs.get("output_dir"))
-					ibest_writer = writer[f"{nbest_idx+1}best_recog"]
-				# remove sos/eos and get results
-				last_pos = -1
-				if isinstance(hyp.yseq, list):
-					token_int = hyp.yseq[1:last_pos]
-				else:
-					token_int = hyp.yseq[1:last_pos].tolist()
-					
-				# remove blank symbol id, which is assumed to be 0
-				token_int = list(filter(lambda x: x != self.eos and x != self.sos and x != self.blank_id, token_int))
-				
-				# 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, "text_postprocessed": text_postprocessed}
-				results.append(result_i)
-				
-				if ibest_writer is not None:
-					ibest_writer["token"][key[i]] = " ".join(token)
-					ibest_writer["text"][key[i]] = text
-					ibest_writer["text_postprocessed"][key[i]] = text_postprocessed
-		
-		return results, meta_data
-
-
-
-class BiCifParaformer(Paraformer):
-	"""
-	Author: Speech Lab of DAMO Academy, Alibaba Group
-	Paraformer: Fast and Accurate Parallel Transformer for Non-autoregressive End-to-End Speech Recognition
-	https://arxiv.org/abs/2206.08317
-	"""
-	
-	def __init__(
-		self,
-		*args,
-		**kwargs,
-	):
-		super().__init__(*args, **kwargs)
-
-
-	def _calc_pre2_loss(
-		self,
-		encoder_out: torch.Tensor,
-		encoder_out_lens: torch.Tensor,
-		ys_pad: torch.Tensor,
-		ys_pad_lens: torch.Tensor,
-	):
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		if self.predictor_bias == 1:
-			_, ys_pad = add_sos_eos(ys_pad, self.sos, self.eos, self.ignore_id)
-			ys_pad_lens = ys_pad_lens + self.predictor_bias
-		_, _, _, _, pre_token_length2 = self.predictor(encoder_out, ys_pad, encoder_out_mask, ignore_id=self.ignore_id)
-		
-		# loss_pre = self.criterion_pre(ys_pad_lens.type_as(pre_token_length), pre_token_length)
-		loss_pre2 = self.criterion_pre(ys_pad_lens.type_as(pre_token_length2), pre_token_length2)
-		
-		return loss_pre2
-	
-	
-	def _calc_att_loss(
-		self,
-		encoder_out: torch.Tensor,
-		encoder_out_lens: torch.Tensor,
-		ys_pad: torch.Tensor,
-		ys_pad_lens: torch.Tensor,
-	):
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		if self.predictor_bias == 1:
-			_, ys_pad = add_sos_eos(ys_pad, self.sos, self.eos, self.ignore_id)
-			ys_pad_lens = ys_pad_lens + self.predictor_bias
-		pre_acoustic_embeds, pre_token_length, _, pre_peak_index, _ = self.predictor(encoder_out, ys_pad,
-		                                                                             encoder_out_mask,
-		                                                                             ignore_id=self.ignore_id)
-		
-		# 0. sampler
-		decoder_out_1st = None
-		if self.sampling_ratio > 0.0:
-			sematic_embeds, decoder_out_1st = self.sampler(encoder_out, encoder_out_lens, ys_pad, ys_pad_lens,
-			                                               pre_acoustic_embeds)
-		else:
-			sematic_embeds = pre_acoustic_embeds
-		
-		# 1. Forward decoder
-		decoder_outs = self.decoder(
-			encoder_out, encoder_out_lens, sematic_embeds, ys_pad_lens
-		)
-		decoder_out, _ = decoder_outs[0], decoder_outs[1]
-		
-		if decoder_out_1st is None:
-			decoder_out_1st = decoder_out
-		# 2. Compute attention loss
-		loss_att = self.criterion_att(decoder_out, ys_pad)
-		acc_att = th_accuracy(
-			decoder_out_1st.view(-1, self.vocab_size),
-			ys_pad,
-			ignore_label=self.ignore_id,
-		)
-		loss_pre = self.criterion_pre(ys_pad_lens.type_as(pre_token_length), pre_token_length)
-		
-		# Compute cer/wer using attention-decoder
-		if self.training or self.error_calculator is None:
-			cer_att, wer_att = None, None
-		else:
-			ys_hat = decoder_out_1st.argmax(dim=-1)
-			cer_att, wer_att = self.error_calculator(ys_hat.cpu(), ys_pad.cpu())
-		
-		return loss_att, acc_att, cer_att, wer_att, loss_pre
-
-
-	def calc_predictor(self, encoder_out, encoder_out_lens):
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index, pre_token_length2 = self.predictor(encoder_out,
-		                                                                                                  None,
-		                                                                                                  encoder_out_mask,
-		                                                                                                  ignore_id=self.ignore_id)
-		return pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index
-
-
-	def calc_predictor_timestamp(self, encoder_out, encoder_out_lens, token_num):
-		encoder_out_mask = (~make_pad_mask(encoder_out_lens, maxlen=encoder_out.size(1))[:, None, :]).to(
-			encoder_out.device)
-		ds_alphas, ds_cif_peak, us_alphas, us_peaks = self.predictor.get_upsample_timestamp(encoder_out,
-		                                                                                    encoder_out_mask,
-		                                                                                    token_num)
-		return ds_alphas, ds_cif_peak, us_alphas, us_peaks
-	
-	
-	def forward(
-		self,
-		speech: torch.Tensor,
-		speech_lengths: torch.Tensor,
-		text: torch.Tensor,
-		text_lengths: torch.Tensor,
-		**kwargs,
-	) -> Tuple[torch.Tensor, Dict[str, torch.Tensor], torch.Tensor]:
-		"""Frontend + Encoder + Decoder + Calc loss
-		Args:
-				speech: (Batch, Length, ...)
-				speech_lengths: (Batch, )
-				text: (Batch, Length)
-				text_lengths: (Batch,)
-		"""
-		if len(text_lengths.size()) > 1:
-			text_lengths = text_lengths[:, 0]
-		if len(speech_lengths.size()) > 1:
-			speech_lengths = speech_lengths[:, 0]
-		
-		batch_size = speech.shape[0]
-		
-		# Encoder
-		encoder_out, encoder_out_lens = self.encode(speech, speech_lengths)
-
-
-		loss_ctc, cer_ctc = None, None
-		loss_pre = None
-		stats = dict()
-		
-		# decoder: CTC branch
-		if self.ctc_weight != 0.0:
-			loss_ctc, cer_ctc = self._calc_ctc_loss(
-				encoder_out, encoder_out_lens, text, text_lengths
-			)
-			
-			# Collect CTC branch stats
-			stats["loss_ctc"] = loss_ctc.detach() if loss_ctc is not None else None
-			stats["cer_ctc"] = cer_ctc
-
-
-		# decoder: Attention decoder branch
-		loss_att, acc_att, cer_att, wer_att, loss_pre = self._calc_att_loss(
-			encoder_out, encoder_out_lens, text, text_lengths
-		)
-		
-		loss_pre2 = self._calc_pre2_loss(
-			encoder_out, encoder_out_lens, text, text_lengths
-		)
-		
-		# 3. CTC-Att loss definition
-		if self.ctc_weight == 0.0:
-			loss = loss_att + loss_pre * self.predictor_weight + loss_pre2 * self.predictor_weight * 0.5
-		else:
-			loss = self.ctc_weight * loss_ctc + (
-				1 - self.ctc_weight) * loss_att + loss_pre * self.predictor_weight + loss_pre2 * self.predictor_weight * 0.5
-		
-		# Collect Attn branch stats
-		stats["loss_att"] = loss_att.detach() if loss_att is not None else None
-		stats["acc"] = acc_att
-		stats["cer"] = cer_att
-		stats["wer"] = wer_att
-		stats["loss_pre"] = loss_pre.detach().cpu() if loss_pre is not None else None
-		stats["loss_pre2"] = loss_pre2.detach().cpu()
-		
-		stats["loss"] = torch.clone(loss.detach())
-		
-		# force_gatherable: to-device and to-tensor if scalar for DataParallel
-		if self.length_normalized_loss:
-			batch_size = int((text_lengths + self.predictor_bias).sum())
-		
-		loss, stats, weight = force_gatherable((loss, stats, batch_size), loss.device)
-		return loss, stats, weight
-	
-	def generate(self,
-	             data_in: list,
-	             data_lengths: list = None,
-	             key: list = None,
-	             tokenizer=None,
-	             **kwargs,
-	             ):
-		
-		# init beamsearch
-		is_use_ctc = kwargs.get("decoding_ctc_weight", 0.0) > 0.00001 and self.ctc != None
-		is_use_lm = kwargs.get("lm_weight", 0.0) > 0.00001 and kwargs.get("lm_file", None) is not None
-		if self.beam_search is None and (is_use_lm or is_use_ctc):
-			logging.info("enable beam_search")
-			self.init_beam_search(**kwargs)
-			self.nbest = kwargs.get("nbest", 1)
-		
-		meta_data = {}
-		# extract fbank feats
-		time1 = time.perf_counter()
-		audio_sample_list = load_audio_text_image_video(data_in, fs=self.frontend.fs, audio_fs=kwargs.get("fs", 16000))
-		time2 = time.perf_counter()
-		meta_data["load_data"] = f"{time2 - time1:0.3f}"
-		speech, speech_lengths = extract_fbank(audio_sample_list, data_type=kwargs.get("data_type", "sound"),
-		                                       frontend=self.frontend)
-		time3 = time.perf_counter()
-		meta_data["extract_feat"] = f"{time3 - time2:0.3f}"
-		meta_data[
-			"batch_data_time"] = speech_lengths.sum().item() * self.frontend.frame_shift * self.frontend.lfr_n / 1000
-		
-		speech.to(device=kwargs["device"]), speech_lengths.to(device=kwargs["device"])
-		
-		# Encoder
-		encoder_out, encoder_out_lens = self.encode(speech, speech_lengths)
-		if isinstance(encoder_out, tuple):
-			encoder_out = encoder_out[0]
-		
-		# predictor
-		predictor_outs = self.calc_predictor(encoder_out, encoder_out_lens)
-		pre_acoustic_embeds, pre_token_length, alphas, pre_peak_index = predictor_outs[0], predictor_outs[1], \
-		                                                                predictor_outs[2], predictor_outs[3]
-		pre_token_length = pre_token_length.round().long()
-		if torch.max(pre_token_length) < 1:
-			return []
-		decoder_outs = self.cal_decoder_with_predictor(encoder_out, encoder_out_lens, pre_acoustic_embeds,
-		                                               pre_token_length)
-		decoder_out, ys_pad_lens = decoder_outs[0], decoder_outs[1]
-		
-		# BiCifParaformer, test no bias cif2
-
-		_, _, us_alphas, us_peaks = self.calc_predictor_timestamp(encoder_out, encoder_out_lens,
-			                                                                    pre_token_length)
-		
-		results = []
-		b, n, d = decoder_out.size()
-		for i in range(b):
-			x = encoder_out[i, :encoder_out_lens[i], :]
-			am_scores = decoder_out[i, :pre_token_length[i], :]
-			if self.beam_search is not None:
-				nbest_hyps = self.beam_search(
-					x=x, am_scores=am_scores, maxlenratio=kwargs.get("maxlenratio", 0.0),
-					minlenratio=kwargs.get("minlenratio", 0.0)
-				)
-				
-				nbest_hyps = nbest_hyps[: self.nbest]
-			else:
-				
-				yseq = am_scores.argmax(dim=-1)
-				score = am_scores.max(dim=-1)[0]
-				score = torch.sum(score, dim=-1)
-				# pad with mask tokens to ensure compatibility with sos/eos tokens
-				yseq = torch.tensor(
-					[self.sos] + yseq.tolist() + [self.eos], device=yseq.device
-				)
-				nbest_hyps = [Hypothesis(yseq=yseq, score=score)]
-			for nbest_idx, hyp in enumerate(nbest_hyps):
-				ibest_writer = None
-				if ibest_writer is None and kwargs.get("output_dir") is not None:
-					writer = DatadirWriter(kwargs.get("output_dir"))
-					ibest_writer = writer[f"{nbest_idx + 1}best_recog"]
-				# remove sos/eos and get results
-				last_pos = -1
-				if isinstance(hyp.yseq, list):
-					token_int = hyp.yseq[1:last_pos]
-				else:
-					token_int = hyp.yseq[1:last_pos].tolist()
-				
-				# remove blank symbol id, which is assumed to be 0
-				token_int = list(filter(lambda x: x != self.eos and x != self.sos and x != self.blank_id, token_int))
-				
-				# Change integer-ids to tokens
-				token = tokenizer.ids2tokens(token_int)
-				text = tokenizer.tokens2text(token)
-				
-				_, timestamp = ts_prediction_lfr6_standard(us_alphas[i][:encoder_out_lens[i] * 3],
-				                                           us_peaks[i][:encoder_out_lens[i] * 3],
-				                                           copy.copy(token),
-				                                           vad_offset=kwargs.get("begin_time", 0))
-				
-				text_postprocessed, time_stamp_postprocessed, word_lists = postprocess_utils.sentence_postprocess(token, timestamp)
-				
-				result_i = {"key": key[i], "token": token, "text": text, "text_postprocessed": text_postprocessed,
-				            "time_stamp_postprocessed": time_stamp_postprocessed,
-				            "word_lists": word_lists
-				            }
-				results.append(result_i)
-				
-				if ibest_writer is not None:
-					ibest_writer["token"][key[i]] = " ".join(token)
-					ibest_writer["text"][key[i]] = text
-					ibest_writer["text_postprocessed"][key[i]] = text_postprocessed
-					
-		
-		return results, meta_data
-
-
+@tables.register("model_classes", "ParaformerStreaming")
 class ParaformerStreaming(Paraformer):
 	"""
 	Author: Speech Lab of DAMO Academy, Alibaba Group
@@ -872,8 +64,8 @@
 		
 		super().__init__(*args, **kwargs)
 		
-		# import pdb;
-		# pdb.set_trace()
+		import pdb;
+		pdb.set_trace()
 		self.sampling_ratio = kwargs.get("sampling_ratio", 0.2)
 
 
diff --git a/funasr/models/paraformer_streaming/sanm_decoder.py b/funasr/models/paraformer_streaming/sanm_decoder.py
deleted file mode 100644
index 2ae4335..0000000
--- a/funasr/models/paraformer_streaming/sanm_decoder.py
+++ /dev/null
@@ -1,507 +0,0 @@
-from typing import List
-from typing import Tuple
-import logging
-import torch
-import torch.nn as nn
-import numpy as np
-
-from funasr.models.scama import utils as myutils
-from funasr.models.transformer.decoder import BaseTransformerDecoder
-
-from funasr.models.sanm.attention import MultiHeadedAttentionSANMDecoder, MultiHeadedAttentionCrossAtt
-from funasr.models.transformer.embedding import PositionalEncoding
-from funasr.models.transformer.layer_norm import LayerNorm
-from funasr.models.sanm.positionwise_feed_forward import PositionwiseFeedForwardDecoderSANM
-from funasr.models.transformer.utils.repeat import repeat
-
-from funasr.register import tables
-
-class DecoderLayerSANM(nn.Module):
-    """Single decoder layer module.
-
-    Args:
-        size (int): Input dimension.
-        self_attn (torch.nn.Module): Self-attention module instance.
-            `MultiHeadedAttention` instance can be used as the argument.
-        src_attn (torch.nn.Module): Self-attention module instance.
-            `MultiHeadedAttention` instance can be used as the argument.
-        feed_forward (torch.nn.Module): Feed-forward module instance.
-            `PositionwiseFeedForward`, `MultiLayeredConv1d`, or `Conv1dLinear` instance
-            can be used as the argument.
-        dropout_rate (float): Dropout rate.
-        normalize_before (bool): Whether to use layer_norm before the first block.
-        concat_after (bool): Whether to concat attention layer's input and output.
-            if True, additional linear will be applied.
-            i.e. x -> x + linear(concat(x, att(x)))
-            if False, no additional linear will be applied. i.e. x -> x + att(x)
-
-
-    """
-
-    def __init__(
-        self,
-        size,
-        self_attn,
-        src_attn,
-        feed_forward,
-        dropout_rate,
-        normalize_before=True,
-        concat_after=False,
-    ):
-        """Construct an DecoderLayer object."""
-        super(DecoderLayerSANM, self).__init__()
-        self.size = size
-        self.self_attn = self_attn
-        self.src_attn = src_attn
-        self.feed_forward = feed_forward
-        self.norm1 = LayerNorm(size)
-        if self_attn is not None:
-            self.norm2 = LayerNorm(size)
-        if src_attn is not None:
-            self.norm3 = LayerNorm(size)
-        self.dropout = nn.Dropout(dropout_rate)
-        self.normalize_before = normalize_before
-        self.concat_after = concat_after
-        if self.concat_after:
-            self.concat_linear1 = nn.Linear(size + size, size)
-            self.concat_linear2 = nn.Linear(size + size, size)
-
-    def forward(self, tgt, tgt_mask, memory, memory_mask=None, cache=None):
-        """Compute decoded features.
-
-        Args:
-            tgt (torch.Tensor): Input tensor (#batch, maxlen_out, size).
-            tgt_mask (torch.Tensor): Mask for input tensor (#batch, maxlen_out).
-            memory (torch.Tensor): Encoded memory, float32 (#batch, maxlen_in, size).
-            memory_mask (torch.Tensor): Encoded memory mask (#batch, maxlen_in).
-            cache (List[torch.Tensor]): List of cached tensors.
-                Each tensor shape should be (#batch, maxlen_out - 1, size).
-
-        Returns:
-            torch.Tensor: Output tensor(#batch, maxlen_out, size).
-            torch.Tensor: Mask for output tensor (#batch, maxlen_out).
-            torch.Tensor: Encoded memory (#batch, maxlen_in, size).
-            torch.Tensor: Encoded memory mask (#batch, maxlen_in).
-
-        """
-        # tgt = self.dropout(tgt)
-        residual = tgt
-        if self.normalize_before:
-            tgt = self.norm1(tgt)
-        tgt = self.feed_forward(tgt)
-
-        x = tgt
-        if self.self_attn:
-            if self.normalize_before:
-                tgt = self.norm2(tgt)
-            x, _ = self.self_attn(tgt, tgt_mask)
-            x = residual + self.dropout(x)
-
-        if self.src_attn is not None:
-            residual = x
-            if self.normalize_before:
-                x = self.norm3(x)
-
-            x = residual + self.dropout(self.src_attn(x, memory, memory_mask))
-
-        return x, tgt_mask, memory, memory_mask, cache
-
-    def forward_one_step(self, tgt, tgt_mask, memory, memory_mask=None, cache=None):
-        """Compute decoded features.
-
-        Args:
-            tgt (torch.Tensor): Input tensor (#batch, maxlen_out, size).
-            tgt_mask (torch.Tensor): Mask for input tensor (#batch, maxlen_out).
-            memory (torch.Tensor): Encoded memory, float32 (#batch, maxlen_in, size).
-            memory_mask (torch.Tensor): Encoded memory mask (#batch, maxlen_in).
-            cache (List[torch.Tensor]): List of cached tensors.
-                Each tensor shape should be (#batch, maxlen_out - 1, size).
-
-        Returns:
-            torch.Tensor: Output tensor(#batch, maxlen_out, size).
-            torch.Tensor: Mask for output tensor (#batch, maxlen_out).
-            torch.Tensor: Encoded memory (#batch, maxlen_in, size).
-            torch.Tensor: Encoded memory mask (#batch, maxlen_in).
-
-        """
-        # tgt = self.dropout(tgt)
-        residual = tgt
-        if self.normalize_before:
-            tgt = self.norm1(tgt)
-        tgt = self.feed_forward(tgt)
-
-        x = tgt
-        if self.self_attn:
-            if self.normalize_before:
-                tgt = self.norm2(tgt)
-            if self.training:
-                cache = None
-            x, cache = self.self_attn(tgt, tgt_mask, cache=cache)
-            x = residual + self.dropout(x)
-
-        if self.src_attn is not None:
-            residual = x
-            if self.normalize_before:
-                x = self.norm3(x)
-
-            x = residual + self.dropout(self.src_attn(x, memory, memory_mask))
-
-
-        return x, tgt_mask, memory, memory_mask, cache
-
-    def forward_chunk(self, tgt, memory, fsmn_cache=None, opt_cache=None, chunk_size=None, look_back=0):
-        """Compute decoded features.
-
-        Args:
-            tgt (torch.Tensor): Input tensor (#batch, maxlen_out, size).
-            tgt_mask (torch.Tensor): Mask for input tensor (#batch, maxlen_out).
-            memory (torch.Tensor): Encoded memory, float32 (#batch, maxlen_in, size).
-            memory_mask (torch.Tensor): Encoded memory mask (#batch, maxlen_in).
-            cache (List[torch.Tensor]): List of cached tensors.
-                Each tensor shape should be (#batch, maxlen_out - 1, size).
-
-        Returns:
-            torch.Tensor: Output tensor(#batch, maxlen_out, size).
-            torch.Tensor: Mask for output tensor (#batch, maxlen_out).
-            torch.Tensor: Encoded memory (#batch, maxlen_in, size).
-            torch.Tensor: Encoded memory mask (#batch, maxlen_in).
-
-        """
-        residual = tgt
-        if self.normalize_before:
-            tgt = self.norm1(tgt)
-        tgt = self.feed_forward(tgt)
-
-        x = tgt
-        if self.self_attn:
-            if self.normalize_before:
-                tgt = self.norm2(tgt)
-            x, fsmn_cache = self.self_attn(tgt, None, fsmn_cache)
-            x = residual + self.dropout(x)
-
-        if self.src_attn is not None:
-            residual = x
-            if self.normalize_before:
-                x = self.norm3(x)
-
-            x, opt_cache = self.src_attn.forward_chunk(x, memory, opt_cache, chunk_size, look_back)
-            x = residual + x
-
-        return x, memory, fsmn_cache, opt_cache
-
-
-@tables.register("decoder_classes", "ParaformerSANMDecoder")
-class ParaformerSANMDecoder(BaseTransformerDecoder):
-    """
-    Author: Speech Lab of DAMO Academy, Alibaba Group
-    Paraformer: Fast and Accurate Parallel Transformer for Non-autoregressive End-to-End Speech Recognition
-    https://arxiv.org/abs/2006.01713
-    """
-    def __init__(
-        self,
-        vocab_size: int,
-        encoder_output_size: int,
-        attention_heads: int = 4,
-        linear_units: int = 2048,
-        num_blocks: int = 6,
-        dropout_rate: float = 0.1,
-        positional_dropout_rate: float = 0.1,
-        self_attention_dropout_rate: float = 0.0,
-        src_attention_dropout_rate: float = 0.0,
-        input_layer: str = "embed",
-        use_output_layer: bool = True,
-        pos_enc_class=PositionalEncoding,
-        normalize_before: bool = True,
-        concat_after: bool = False,
-        att_layer_num: int = 6,
-        kernel_size: int = 21,
-        sanm_shfit: int = 0,
-        lora_list: List[str] = None,
-        lora_rank: int = 8,
-        lora_alpha: int = 16,
-        lora_dropout: float = 0.1,
-        chunk_multiply_factor: tuple = (1,),
-        tf2torch_tensor_name_prefix_torch: str = "decoder",
-        tf2torch_tensor_name_prefix_tf: str = "seq2seq/decoder",
-    ):
-        super().__init__(
-            vocab_size=vocab_size,
-            encoder_output_size=encoder_output_size,
-            dropout_rate=dropout_rate,
-            positional_dropout_rate=positional_dropout_rate,
-            input_layer=input_layer,
-            use_output_layer=use_output_layer,
-            pos_enc_class=pos_enc_class,
-            normalize_before=normalize_before,
-        )
-
-        attention_dim = encoder_output_size
-
-        if input_layer == "embed":
-            self.embed = torch.nn.Sequential(
-                torch.nn.Embedding(vocab_size, attention_dim),
-                # pos_enc_class(attention_dim, positional_dropout_rate),
-            )
-        elif input_layer == "linear":
-            self.embed = torch.nn.Sequential(
-                torch.nn.Linear(vocab_size, attention_dim),
-                torch.nn.LayerNorm(attention_dim),
-                torch.nn.Dropout(dropout_rate),
-                torch.nn.ReLU(),
-                pos_enc_class(attention_dim, positional_dropout_rate),
-            )
-        else:
-            raise ValueError(f"only 'embed' or 'linear' is supported: {input_layer}")
-
-        self.normalize_before = normalize_before
-        if self.normalize_before:
-            self.after_norm = LayerNorm(attention_dim)
-        if use_output_layer:
-            self.output_layer = torch.nn.Linear(attention_dim, vocab_size)
-        else:
-            self.output_layer = None
-
-        self.att_layer_num = att_layer_num
-        self.num_blocks = num_blocks
-        if sanm_shfit is None:
-            sanm_shfit = (kernel_size - 1) // 2
-        self.decoders = repeat(
-            att_layer_num,
-            lambda lnum: DecoderLayerSANM(
-                attention_dim,
-                MultiHeadedAttentionSANMDecoder(
-                    attention_dim, self_attention_dropout_rate, kernel_size, sanm_shfit=sanm_shfit
-                ),
-                MultiHeadedAttentionCrossAtt(
-                    attention_heads, attention_dim, src_attention_dropout_rate, lora_list, lora_rank, lora_alpha, lora_dropout
-                ),
-                PositionwiseFeedForwardDecoderSANM(attention_dim, linear_units, dropout_rate),
-                dropout_rate,
-                normalize_before,
-                concat_after,
-            ),
-        )
-        if num_blocks - att_layer_num <= 0:
-            self.decoders2 = None
-        else:
-            self.decoders2 = repeat(
-                num_blocks - att_layer_num,
-                lambda lnum: DecoderLayerSANM(
-                    attention_dim,
-                    MultiHeadedAttentionSANMDecoder(
-                        attention_dim, self_attention_dropout_rate, kernel_size, sanm_shfit=0
-                    ),
-                    None,
-                    PositionwiseFeedForwardDecoderSANM(attention_dim, linear_units, dropout_rate),
-                    dropout_rate,
-                    normalize_before,
-                    concat_after,
-                ),
-            )
-
-        self.decoders3 = repeat(
-            1,
-            lambda lnum: DecoderLayerSANM(
-                attention_dim,
-                None,
-                None,
-                PositionwiseFeedForwardDecoderSANM(attention_dim, linear_units, dropout_rate),
-                dropout_rate,
-                normalize_before,
-                concat_after,
-            ),
-        )
-        self.tf2torch_tensor_name_prefix_torch = tf2torch_tensor_name_prefix_torch
-        self.tf2torch_tensor_name_prefix_tf = tf2torch_tensor_name_prefix_tf
-        self.chunk_multiply_factor = chunk_multiply_factor
-
-    def forward(
-        self,
-        hs_pad: torch.Tensor,
-        hlens: torch.Tensor,
-        ys_in_pad: torch.Tensor,
-        ys_in_lens: torch.Tensor,
-        chunk_mask: torch.Tensor = None,
-    ) -> Tuple[torch.Tensor, torch.Tensor]:
-        """Forward decoder.
-
-        Args:
-            hs_pad: encoded memory, float32  (batch, maxlen_in, feat)
-            hlens: (batch)
-            ys_in_pad:
-                input token ids, int64 (batch, maxlen_out)
-                if input_layer == "embed"
-                input tensor (batch, maxlen_out, #mels) in the other cases
-            ys_in_lens: (batch)
-        Returns:
-            (tuple): tuple containing:
-
-            x: decoded token score before softmax (batch, maxlen_out, token)
-                if use_output_layer is True,
-            olens: (batch, )
-        """
-        tgt = ys_in_pad
-        tgt_mask = myutils.sequence_mask(ys_in_lens, device=tgt.device)[:, :, None]
-        
-        memory = hs_pad
-        memory_mask = myutils.sequence_mask(hlens, device=memory.device)[:, None, :]
-        if chunk_mask is not None:
-            memory_mask = memory_mask * chunk_mask
-            if tgt_mask.size(1) != memory_mask.size(1):
-                memory_mask = torch.cat((memory_mask, memory_mask[:, -2:-1, :]), dim=1)
-
-        x = tgt
-        x, tgt_mask, memory, memory_mask, _ = self.decoders(
-            x, tgt_mask, memory, memory_mask
-        )
-        if self.decoders2 is not None:
-            x, tgt_mask, memory, memory_mask, _ = self.decoders2(
-                x, tgt_mask, memory, memory_mask
-            )
-        x, tgt_mask, memory, memory_mask, _ = self.decoders3(
-            x, tgt_mask, memory, memory_mask
-        )
-        if self.normalize_before:
-            x = self.after_norm(x)
-        if self.output_layer is not None:
-            x = self.output_layer(x)
-
-        olens = tgt_mask.sum(1)
-        return x, olens
-
-    def score(self, ys, state, x):
-        """Score."""
-        ys_mask = myutils.sequence_mask(torch.tensor([len(ys)], dtype=torch.int32), device=x.device)[:, :, None]
-        logp, state = self.forward_one_step(
-            ys.unsqueeze(0), ys_mask, x.unsqueeze(0), cache=state
-        )
-        return logp.squeeze(0), state
-
-    def forward_chunk(
-        self,
-        memory: torch.Tensor,
-        tgt: torch.Tensor,
-        cache: dict = None,
-    ) -> Tuple[torch.Tensor, torch.Tensor]:
-        """Forward decoder.
-
-        Args:
-            hs_pad: encoded memory, float32  (batch, maxlen_in, feat)
-            hlens: (batch)
-            ys_in_pad:
-                input token ids, int64 (batch, maxlen_out)
-                if input_layer == "embed"
-                input tensor (batch, maxlen_out, #mels) in the other cases
-            ys_in_lens: (batch)
-        Returns:
-            (tuple): tuple containing:
-
-            x: decoded token score before softmax (batch, maxlen_out, token)
-                if use_output_layer is True,
-            olens: (batch, )
-        """
-        x = tgt
-        if cache["decode_fsmn"] is None:
-            cache_layer_num = len(self.decoders)
-            if self.decoders2 is not None:
-                cache_layer_num += len(self.decoders2)
-            fsmn_cache = [None] * cache_layer_num
-        else:
-            fsmn_cache = cache["decode_fsmn"]
-
-        if cache["opt"] is None:
-            cache_layer_num = len(self.decoders)
-            opt_cache = [None] * cache_layer_num
-        else:
-            opt_cache = cache["opt"]
-
-        for i in range(self.att_layer_num):
-            decoder = self.decoders[i]
-            x, memory, fsmn_cache[i], opt_cache[i] = decoder.forward_chunk(
-                x, memory, fsmn_cache=fsmn_cache[i], opt_cache=opt_cache[i],
-                chunk_size=cache["chunk_size"], look_back=cache["decoder_chunk_look_back"]
-            )
-
-        if self.num_blocks - self.att_layer_num > 1:
-            for i in range(self.num_blocks - self.att_layer_num):
-                j = i + self.att_layer_num
-                decoder = self.decoders2[i]
-                x, memory, fsmn_cache[j], _  = decoder.forward_chunk(
-                    x, memory, fsmn_cache=fsmn_cache[j]
-                )
-
-        for decoder in self.decoders3:
-            x, memory, _, _ = decoder.forward_chunk(
-                x, memory
-            )
-        if self.normalize_before:
-            x = self.after_norm(x)
-        if self.output_layer is not None:
-            x = self.output_layer(x)
-
-        cache["decode_fsmn"] = fsmn_cache
-        if cache["decoder_chunk_look_back"] > 0 or cache["decoder_chunk_look_back"] == -1:
-            cache["opt"] = opt_cache
-        return x
-
-    def forward_one_step(
-        self,
-        tgt: torch.Tensor,
-        tgt_mask: torch.Tensor,
-        memory: torch.Tensor,
-        cache: List[torch.Tensor] = None,
-    ) -> Tuple[torch.Tensor, List[torch.Tensor]]:
-        """Forward one step.
-
-        Args:
-            tgt: input token ids, int64 (batch, maxlen_out)
-            tgt_mask: input token mask,  (batch, maxlen_out)
-                      dtype=torch.uint8 in PyTorch 1.2-
-                      dtype=torch.bool in PyTorch 1.2+ (include 1.2)
-            memory: encoded memory, float32  (batch, maxlen_in, feat)
-            cache: cached output list of (batch, max_time_out-1, size)
-        Returns:
-            y, cache: NN output value and cache per `self.decoders`.
-            y.shape` is (batch, maxlen_out, token)
-        """
-        x = self.embed(tgt)
-        if cache is None:
-            cache_layer_num = len(self.decoders)
-            if self.decoders2 is not None:
-                cache_layer_num += len(self.decoders2)
-            cache = [None] * cache_layer_num
-        new_cache = []
-        # for c, decoder in zip(cache, self.decoders):
-        for i in range(self.att_layer_num):
-            decoder = self.decoders[i]
-            c = cache[i]
-            x, tgt_mask, memory, memory_mask, c_ret = decoder.forward_one_step(
-                x, tgt_mask, memory, None, cache=c
-            )
-            new_cache.append(c_ret)
-
-        if self.num_blocks - self.att_layer_num > 1:
-            for i in range(self.num_blocks - self.att_layer_num):
-                j = i + self.att_layer_num
-                decoder = self.decoders2[i]
-                c = cache[j]
-                x, tgt_mask, memory, memory_mask, c_ret = decoder.forward_one_step(
-                    x, tgt_mask, memory, None, cache=c
-                )
-                new_cache.append(c_ret)
-
-        for decoder in self.decoders3:
-
-            x, tgt_mask, memory, memory_mask, _ = decoder.forward_one_step(
-                x, tgt_mask, memory, None, cache=None
-            )
-
-        if self.normalize_before:
-            y = self.after_norm(x[:, -1])
-        else:
-            y = x[:, -1]
-        if self.output_layer is not None:
-            y = torch.log_softmax(self.output_layer(y), dim=-1)
-
-        return y, new_cache
-

--
Gitblit v1.9.1