From 03875965c8a650571903283810c822005b01d22b Mon Sep 17 00:00:00 2001
From: lzr265946 <lzr265946@alibaba-inc.com>
Date: 星期四, 09 二月 2023 15:13:14 +0800
Subject: [PATCH] remove global vars
---
funasr/bin/asr_inference.py | 10 ----------
funasr/utils/asr_utils.py | 16 ++++------------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/funasr/bin/asr_inference.py b/funasr/bin/asr_inference.py
index d419018..16fa3e5 100644
--- a/funasr/bin/asr_inference.py
+++ b/funasr/bin/asr_inference.py
@@ -464,16 +464,6 @@
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(
description="ASR Decoding",
diff --git a/funasr/utils/asr_utils.py b/funasr/utils/asr_utils.py
index 76b20a5..a3ff3e3 100644
--- a/funasr/utils/asr_utils.py
+++ b/funasr/utils/asr_utils.py
@@ -186,22 +186,11 @@
return wav_list
-
-def set_parameters(language: str = None):
- if language is not None:
- global global_asr_language
- global_asr_language = language
-
-
def compute_wer(hyp_list: List[Any],
ref_list: List[Any],
lang: str = None) -> Dict[str, Any]:
assert len(hyp_list) > 0, 'hyp list is empty'
assert len(ref_list) > 0, 'ref list is empty'
-
- if lang is not None:
- global global_asr_language
- global_asr_language = lang
rst = {
'Wrd': 0,
@@ -216,12 +205,15 @@
'wrong_sentences': 0
}
+ if lang is None:
+ lang = global_asr_language
+
for h_item in hyp_list:
for r_item in ref_list:
if h_item['key'] == r_item['key']:
out_item = compute_wer_by_line(h_item['value'],
r_item['value'],
- global_asr_language)
+ lang)
rst['Wrd'] += out_item['nwords']
rst['Corr'] += out_item['cor']
rst['wrong_words'] += out_item['wrong']
--
Gitblit v1.9.1