From e33bb15d269bb3e2e41f7a3540d9b92703bb5c50 Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 15 三月 2023 10:51:52 +0800
Subject: [PATCH] Merge branch 'main' into dev_aky
---
funasr/bin/asr_inference_mfcca.py | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/funasr/bin/asr_inference_mfcca.py b/funasr/bin/asr_inference_mfcca.py
index 0da66c5..4176ba6 100644
--- a/funasr/bin/asr_inference_mfcca.py
+++ b/funasr/bin/asr_inference_mfcca.py
@@ -194,8 +194,8 @@
# Input as audio signal
if isinstance(speech, np.ndarray):
speech = torch.tensor(speech)
-
-
+ if(speech.dim()==3):
+ speech = torch.squeeze(speech, 2)
#speech = speech.unsqueeze(0).to(getattr(torch, self.dtype))
speech = speech.to(getattr(torch, self.dtype))
# lenghts: (1,)
@@ -470,6 +470,7 @@
ngram_weight: float = 0.9,
nbest: int = 1,
num_workers: int = 1,
+ param_dict: dict = None,
**kwargs,
):
assert check_argument_types()
@@ -520,6 +521,9 @@
def _forward(data_path_and_name_and_type,
raw_inputs: Union[np.ndarray, torch.Tensor] = None,
output_dir_v2: Optional[str] = None,
+ fs: dict = None,
+ param_dict: dict = None,
+ **kwargs,
):
# 3. Build data-iterator
if data_path_and_name_and_type is None and raw_inputs is not None:
@@ -530,6 +534,8 @@
data_path_and_name_and_type,
dtype=dtype,
batch_size=batch_size,
+ fs=fs,
+ mc=True,
key_file=key_file,
num_workers=num_workers,
preprocess_fn=ASRTask.build_preprocess_fn(speech2text.asr_train_args, False),
@@ -587,16 +593,6 @@
return asr_result_list
return _forward
-
-def set_parameters(language: str = None,
- sample_rate: Union[int, Dict[Any, int]] = None):
- if language is not None:
- global global_asr_language
- global_asr_language = language
- if sample_rate is not None:
- global global_sample_rate
- global_sample_rate = sample_rate
-
def get_parser():
parser = config_argparse.ArgumentParser(
--
Gitblit v1.9.1