From c1dafa83678f8f42f926ef7a54e17399227b26db Mon Sep 17 00:00:00 2001
From: hnluo <haoneng.lhn@alibaba-inc.com>
Date: 星期三, 01 二月 2023 18:35:32 +0800
Subject: [PATCH] Merge pull request #55 from alibaba-damo-academy/dev

---
 egs/aishell/transformer/utils/text2token.py                                                                                |    0 
 egs/aishell/transformer/run.sh                                                                                             |    0 
 egs/aishell/transformer/utils/split_scp.pl                                                                                 |    0 
 egs/aishell/transformer/utils/compute_cmvn.sh                                                                              |    0 
 egs/aishell/data2vec_finetune/utils                                                                                        |    2 +-
 egs/aishell/transformer/conf/decode_asr_transformer.yaml                                                                   |    0 
 egs/aishell/transformer/utils/filter_scp.pl                                                                                |    0 
 egs/aishell/conformer/utils                                                                                                |    2 +-
 egs/aishell/transformer/utils/text_tokenize.sh                                                                             |    0 
 egs/aishell/transformer/utils/apply_lfr_and_cmvn.sh                                                                        |    0 
 egs/aishell/transformer/local/prepare_data.sh                                                                              |    0 
 egs/aishell/transformer/utils/apply_cmvn.sh                                                                                |    0 
 egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/infer_after_finetune.py   |    2 +-
 egs/aishell/transformer/utils/compute_cmvn.py                                                                              |    0 
 egs/aishell/transformer/utils/shuffle_list.pl                                                                              |    0 
 egs/aishell2/conformer/utils                                                                                               |    2 +-
 egs/aishell/transformer/utils/__init__.py                                                                                  |    0 
 egs/aishell/transformer/utils/apply_lfr_and_cmvn.py                                                                        |    0 
 egs/aishell/transformer/conf/train_asr_transformer.yaml                                                                    |    0 
 egs/aishell/transformer/utils/print_args.py                                                                                |    0 
 egs/aishell2/paraformer/utils                                                                                              |    2 +-
 egs/cnceleb/resnet34/utils                                                                                                 |    2 +-
 egs/aishell/transformer/utils/textnorm_zh.py                                                                               |    0 
 egs/aishell/transformer/utils/compute_fbank.sh                                                                             |    0 
 egs/aishell/transformer/utils/combine_cmvn_file.py                                                                         |    0 
 egs/aishell/transformer/utils/apply_cmvn.py                                                                                |    0 
 egs/aishell/transformer/utils/fix_data.sh                                                                                  |    0 
 egs/aishell/transformer/utils/proc_conf_oss.py                                                                             |    0 
 egs/aishell/transformer/utils/compute_fbank.py                                                                             |    0 
 egs/aishell/transformer/utils/extract_embeds.py                                                                            |    0 
 egs/aishell/transformer/utils/proce_text.py                                                                                |    0 
 egs/aishell/transformer/path.sh                                                                                            |    0 
 egs/aishell/transformer/utils/subset_data_dir_tr_cv.sh                                                                     |    0 
 egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-8k-common-vocab8358-tensorflow1/infer_after_finetune.py      |    2 +-
 egs_modelscope/asr/data2vec/speech_data2vec_pretrain-zh-cn-aishell2-16k-pytorch/infer_after_finetune.py                    |    2 +-
 egs/aishell/transformer/utils/text_tokenize.py                                                                             |    0 
 egs/aishell/paraformer/utils                                                                                               |    2 +-
 egs/aishell/transformer/utils/error_rate_zh                                                                                |    0 
 egs/aishell/transformer/utils/parse_options.sh                                                                             |    0 
 egs/aishell/transformer/utils/run.pl                                                                                       |    0 
 egs/aishell2/paraformerbert/utils                                                                                          |    2 +-
 egs/aishell/transformer/utils/gen_ark_list.sh                                                                              |    0 
 egs/aishell/transformer/utils/split_data.py                                                                                |    0 
 egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell1-vocab8404-pytorch/infer_after_finetune.py |    2 +-
 egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell2-vocab8404-pytorch/infer_after_finetune.py |    2 +-
 egs/aishell/transformer/utils/compute_wer.py                                                                               |    0 
 egs/aishell/paraformerbert/utils                                                                                           |    2 +-
 egs/aishell/transformer/local/aishell_data_prep.sh                                                                         |    0 
 egs/aishell/transformer/utils/fix_data_feat.sh                                                                             |    0 
 egs/aishell/transformer/utils/download_model.py                                                                            |    0 
 50 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/egs/aishell/conformer/utils b/egs/aishell/conformer/utils
index 40e14f5..0853fce 120000
--- a/egs/aishell/conformer/utils
+++ b/egs/aishell/conformer/utils
@@ -1 +1 @@
-../tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell/data2vec_finetune/utils b/egs/aishell/data2vec_finetune/utils
index f245098..0853fce 120000
--- a/egs/aishell/data2vec_finetune/utils
+++ b/egs/aishell/data2vec_finetune/utils
@@ -1 +1 @@
-../../aishell/tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell/paraformer/utils b/egs/aishell/paraformer/utils
index 40e14f5..0853fce 120000
--- a/egs/aishell/paraformer/utils
+++ b/egs/aishell/paraformer/utils
@@ -1 +1 @@
-../tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell/paraformerbert/utils b/egs/aishell/paraformerbert/utils
index 40e14f5..0853fce 120000
--- a/egs/aishell/paraformerbert/utils
+++ b/egs/aishell/paraformerbert/utils
@@ -1 +1 @@
-../tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell/tranformer/conf/decode_asr_transformer.yaml b/egs/aishell/transformer/conf/decode_asr_transformer.yaml
similarity index 100%
rename from egs/aishell/tranformer/conf/decode_asr_transformer.yaml
rename to egs/aishell/transformer/conf/decode_asr_transformer.yaml
diff --git a/egs/aishell/tranformer/conf/train_asr_transformer.yaml b/egs/aishell/transformer/conf/train_asr_transformer.yaml
similarity index 100%
rename from egs/aishell/tranformer/conf/train_asr_transformer.yaml
rename to egs/aishell/transformer/conf/train_asr_transformer.yaml
diff --git a/egs/aishell/tranformer/local/aishell_data_prep.sh b/egs/aishell/transformer/local/aishell_data_prep.sh
similarity index 100%
rename from egs/aishell/tranformer/local/aishell_data_prep.sh
rename to egs/aishell/transformer/local/aishell_data_prep.sh
diff --git a/egs/aishell/tranformer/local/prepare_data.sh b/egs/aishell/transformer/local/prepare_data.sh
similarity index 100%
rename from egs/aishell/tranformer/local/prepare_data.sh
rename to egs/aishell/transformer/local/prepare_data.sh
diff --git a/egs/aishell/tranformer/path.sh b/egs/aishell/transformer/path.sh
similarity index 100%
rename from egs/aishell/tranformer/path.sh
rename to egs/aishell/transformer/path.sh
diff --git a/egs/aishell/tranformer/run.sh b/egs/aishell/transformer/run.sh
similarity index 100%
rename from egs/aishell/tranformer/run.sh
rename to egs/aishell/transformer/run.sh
diff --git a/egs/aishell/tranformer/utils/__init__.py b/egs/aishell/transformer/utils/__init__.py
similarity index 100%
rename from egs/aishell/tranformer/utils/__init__.py
rename to egs/aishell/transformer/utils/__init__.py
diff --git a/egs/aishell/tranformer/utils/apply_cmvn.py b/egs/aishell/transformer/utils/apply_cmvn.py
similarity index 100%
rename from egs/aishell/tranformer/utils/apply_cmvn.py
rename to egs/aishell/transformer/utils/apply_cmvn.py
diff --git a/egs/aishell/tranformer/utils/apply_cmvn.sh b/egs/aishell/transformer/utils/apply_cmvn.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/apply_cmvn.sh
rename to egs/aishell/transformer/utils/apply_cmvn.sh
diff --git a/egs/aishell/tranformer/utils/apply_lfr_and_cmvn.py b/egs/aishell/transformer/utils/apply_lfr_and_cmvn.py
similarity index 100%
rename from egs/aishell/tranformer/utils/apply_lfr_and_cmvn.py
rename to egs/aishell/transformer/utils/apply_lfr_and_cmvn.py
diff --git a/egs/aishell/tranformer/utils/apply_lfr_and_cmvn.sh b/egs/aishell/transformer/utils/apply_lfr_and_cmvn.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/apply_lfr_and_cmvn.sh
rename to egs/aishell/transformer/utils/apply_lfr_and_cmvn.sh
diff --git a/egs/aishell/tranformer/utils/combine_cmvn_file.py b/egs/aishell/transformer/utils/combine_cmvn_file.py
similarity index 100%
rename from egs/aishell/tranformer/utils/combine_cmvn_file.py
rename to egs/aishell/transformer/utils/combine_cmvn_file.py
diff --git a/egs/aishell/tranformer/utils/compute_cmvn.py b/egs/aishell/transformer/utils/compute_cmvn.py
similarity index 100%
rename from egs/aishell/tranformer/utils/compute_cmvn.py
rename to egs/aishell/transformer/utils/compute_cmvn.py
diff --git a/egs/aishell/tranformer/utils/compute_cmvn.sh b/egs/aishell/transformer/utils/compute_cmvn.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/compute_cmvn.sh
rename to egs/aishell/transformer/utils/compute_cmvn.sh
diff --git a/egs/aishell/tranformer/utils/compute_fbank.py b/egs/aishell/transformer/utils/compute_fbank.py
similarity index 100%
rename from egs/aishell/tranformer/utils/compute_fbank.py
rename to egs/aishell/transformer/utils/compute_fbank.py
diff --git a/egs/aishell/tranformer/utils/compute_fbank.sh b/egs/aishell/transformer/utils/compute_fbank.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/compute_fbank.sh
rename to egs/aishell/transformer/utils/compute_fbank.sh
diff --git a/egs/aishell/tranformer/utils/compute_wer.py b/egs/aishell/transformer/utils/compute_wer.py
similarity index 100%
rename from egs/aishell/tranformer/utils/compute_wer.py
rename to egs/aishell/transformer/utils/compute_wer.py
diff --git a/egs/aishell/tranformer/utils/download_model.py b/egs/aishell/transformer/utils/download_model.py
similarity index 100%
rename from egs/aishell/tranformer/utils/download_model.py
rename to egs/aishell/transformer/utils/download_model.py
diff --git a/egs/aishell/tranformer/utils/error_rate_zh b/egs/aishell/transformer/utils/error_rate_zh
similarity index 100%
rename from egs/aishell/tranformer/utils/error_rate_zh
rename to egs/aishell/transformer/utils/error_rate_zh
diff --git a/egs/aishell/tranformer/utils/extract_embeds.py b/egs/aishell/transformer/utils/extract_embeds.py
similarity index 100%
rename from egs/aishell/tranformer/utils/extract_embeds.py
rename to egs/aishell/transformer/utils/extract_embeds.py
diff --git a/egs/aishell/tranformer/utils/filter_scp.pl b/egs/aishell/transformer/utils/filter_scp.pl
similarity index 100%
rename from egs/aishell/tranformer/utils/filter_scp.pl
rename to egs/aishell/transformer/utils/filter_scp.pl
diff --git a/egs/aishell/tranformer/utils/fix_data.sh b/egs/aishell/transformer/utils/fix_data.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/fix_data.sh
rename to egs/aishell/transformer/utils/fix_data.sh
diff --git a/egs/aishell/tranformer/utils/fix_data_feat.sh b/egs/aishell/transformer/utils/fix_data_feat.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/fix_data_feat.sh
rename to egs/aishell/transformer/utils/fix_data_feat.sh
diff --git a/egs/aishell/tranformer/utils/gen_ark_list.sh b/egs/aishell/transformer/utils/gen_ark_list.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/gen_ark_list.sh
rename to egs/aishell/transformer/utils/gen_ark_list.sh
diff --git a/egs/aishell/tranformer/utils/parse_options.sh b/egs/aishell/transformer/utils/parse_options.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/parse_options.sh
rename to egs/aishell/transformer/utils/parse_options.sh
diff --git a/egs/aishell/tranformer/utils/print_args.py b/egs/aishell/transformer/utils/print_args.py
similarity index 100%
rename from egs/aishell/tranformer/utils/print_args.py
rename to egs/aishell/transformer/utils/print_args.py
diff --git a/egs/aishell/tranformer/utils/proc_conf_oss.py b/egs/aishell/transformer/utils/proc_conf_oss.py
similarity index 100%
rename from egs/aishell/tranformer/utils/proc_conf_oss.py
rename to egs/aishell/transformer/utils/proc_conf_oss.py
diff --git a/egs/aishell/tranformer/utils/proce_text.py b/egs/aishell/transformer/utils/proce_text.py
similarity index 100%
rename from egs/aishell/tranformer/utils/proce_text.py
rename to egs/aishell/transformer/utils/proce_text.py
diff --git a/egs/aishell/tranformer/utils/run.pl b/egs/aishell/transformer/utils/run.pl
similarity index 100%
rename from egs/aishell/tranformer/utils/run.pl
rename to egs/aishell/transformer/utils/run.pl
diff --git a/egs/aishell/tranformer/utils/shuffle_list.pl b/egs/aishell/transformer/utils/shuffle_list.pl
similarity index 100%
rename from egs/aishell/tranformer/utils/shuffle_list.pl
rename to egs/aishell/transformer/utils/shuffle_list.pl
diff --git a/egs/aishell/tranformer/utils/split_data.py b/egs/aishell/transformer/utils/split_data.py
similarity index 100%
rename from egs/aishell/tranformer/utils/split_data.py
rename to egs/aishell/transformer/utils/split_data.py
diff --git a/egs/aishell/tranformer/utils/split_scp.pl b/egs/aishell/transformer/utils/split_scp.pl
similarity index 100%
rename from egs/aishell/tranformer/utils/split_scp.pl
rename to egs/aishell/transformer/utils/split_scp.pl
diff --git a/egs/aishell/tranformer/utils/subset_data_dir_tr_cv.sh b/egs/aishell/transformer/utils/subset_data_dir_tr_cv.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/subset_data_dir_tr_cv.sh
rename to egs/aishell/transformer/utils/subset_data_dir_tr_cv.sh
diff --git a/egs/aishell/tranformer/utils/text2token.py b/egs/aishell/transformer/utils/text2token.py
similarity index 100%
rename from egs/aishell/tranformer/utils/text2token.py
rename to egs/aishell/transformer/utils/text2token.py
diff --git a/egs/aishell/tranformer/utils/text_tokenize.py b/egs/aishell/transformer/utils/text_tokenize.py
similarity index 100%
rename from egs/aishell/tranformer/utils/text_tokenize.py
rename to egs/aishell/transformer/utils/text_tokenize.py
diff --git a/egs/aishell/tranformer/utils/text_tokenize.sh b/egs/aishell/transformer/utils/text_tokenize.sh
similarity index 100%
rename from egs/aishell/tranformer/utils/text_tokenize.sh
rename to egs/aishell/transformer/utils/text_tokenize.sh
diff --git a/egs/aishell/tranformer/utils/textnorm_zh.py b/egs/aishell/transformer/utils/textnorm_zh.py
similarity index 100%
rename from egs/aishell/tranformer/utils/textnorm_zh.py
rename to egs/aishell/transformer/utils/textnorm_zh.py
diff --git a/egs/aishell2/conformer/utils b/egs/aishell2/conformer/utils
index f245098..0853fce 120000
--- a/egs/aishell2/conformer/utils
+++ b/egs/aishell2/conformer/utils
@@ -1 +1 @@
-../../aishell/tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell2/paraformer/utils b/egs/aishell2/paraformer/utils
index f245098..0853fce 120000
--- a/egs/aishell2/paraformer/utils
+++ b/egs/aishell2/paraformer/utils
@@ -1 +1 @@
-../../aishell/tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/aishell2/paraformerbert/utils b/egs/aishell2/paraformerbert/utils
index f245098..0853fce 120000
--- a/egs/aishell2/paraformerbert/utils
+++ b/egs/aishell2/paraformerbert/utils
@@ -1 +1 @@
-../../aishell/tranformer/utils
\ No newline at end of file
+../transformer/utils/
\ No newline at end of file
diff --git a/egs/cnceleb/resnet34/utils b/egs/cnceleb/resnet34/utils
index f245098..fe070dd 120000
--- a/egs/cnceleb/resnet34/utils
+++ b/egs/cnceleb/resnet34/utils
@@ -1 +1 @@
-../../aishell/tranformer/utils
\ No newline at end of file
+../../aishell/transformer/utils
\ No newline at end of file
diff --git a/egs_modelscope/asr/data2vec/speech_data2vec_pretrain-zh-cn-aishell2-16k-pytorch/infer_after_finetune.py b/egs_modelscope/asr/data2vec/speech_data2vec_pretrain-zh-cn-aishell2-16k-pytorch/infer_after_finetune.py
index b37fc97..e163999 100644
--- a/egs_modelscope/asr/data2vec/speech_data2vec_pretrain-zh-cn-aishell2-16k-pytorch/infer_after_finetune.py
+++ b/egs_modelscope/asr/data2vec/speech_data2vec_pretrain-zh-cn-aishell2-16k-pytorch/infer_after_finetune.py
@@ -37,7 +37,7 @@
 
     # computer CER if GT text is set
     text_in = os.path.join(params["data_dir"], "text")
-    if text_in is not None:
+    if os.path.exists(text_in):
         text_proc_file = os.path.join(decoding_path, "1best_recog/token")
         compute_wer(text_in, text_proc_file, os.path.join(decoding_path, "text.cer"))
 
diff --git a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell1-vocab8404-pytorch/infer_after_finetune.py b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell1-vocab8404-pytorch/infer_after_finetune.py
index abe4d56..6c34ed0 100644
--- a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell1-vocab8404-pytorch/infer_after_finetune.py
+++ b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell1-vocab8404-pytorch/infer_after_finetune.py
@@ -38,7 +38,7 @@
 
     # computer CER if GT text is set
     text_in = os.path.join(params["data_dir"], "text")
-    if text_in is not None:
+    if os.path.exists(text_in):
         text_proc_file = os.path.join(decoding_path, "1best_recog/token")
         compute_wer(text_in, text_proc_file, os.path.join(decoding_path, "text.cer"))
 
diff --git a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell2-vocab8404-pytorch/infer_after_finetune.py b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell2-vocab8404-pytorch/infer_after_finetune.py
index 547b223..6140bb7 100644
--- a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell2-vocab8404-pytorch/infer_after_finetune.py
+++ b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-aishell2-vocab8404-pytorch/infer_after_finetune.py
@@ -38,7 +38,7 @@
 
     # computer CER if GT text is set
     text_in = os.path.join(params["data_dir"], "text")
-    if text_in is not None:
+    if os.path.exists(text_in):
         text_proc_file = os.path.join(decoding_path, "1best_recog/token")
         compute_wer(text_in, text_proc_file, os.path.join(decoding_path, "text.cer"))
 
diff --git a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/infer_after_finetune.py b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/infer_after_finetune.py
index 30483a0..94393ec 100644
--- a/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/infer_after_finetune.py
+++ b/egs_modelscope/asr/paraformer/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch/infer_after_finetune.py
@@ -38,7 +38,7 @@
 
     # computer CER if GT text is set
     text_in = os.path.join(params["data_dir"], "text")
-    if text_in is not None:
+    if os.path.exists(text_in):
         text_proc_file = os.path.join(decoding_path, "1best_recog/token")
         compute_wer(text_in, text_proc_file, os.path.join(decoding_path, "text.cer"))
 
diff --git a/egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-8k-common-vocab8358-tensorflow1/infer_after_finetune.py b/egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-8k-common-vocab8358-tensorflow1/infer_after_finetune.py
index cd13d76..96102cc 100644
--- a/egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-8k-common-vocab8358-tensorflow1/infer_after_finetune.py
+++ b/egs_modelscope/asr/paraformer/speech_paraformer_asr_nat-zh-cn-8k-common-vocab8358-tensorflow1/infer_after_finetune.py
@@ -38,7 +38,7 @@
 
     # computer CER if GT text is set
     text_in = os.path.join(params["data_dir"], "text")
-    if text_in is not None:
+    if os.path.exists(text_in):
         text_proc_file = os.path.join(decoding_path, "1best_recog/token")
         compute_wer(text_in, text_proc_file, os.path.join(decoding_path, "text.cer"))
 

--
Gitblit v1.9.1