fix conflicts

examples/librispeech/asr4/run.sh

@@ -7,7 +7,7 @@ set -e
 gpus=0
 stage=0
 stop_stage=4
-conf_path=conf/hubertASR.yaml
+conf_path=conf/wav2vec2ASR.yaml
 ips=            #xx.xx.xx.xx,xx.xx.xx.xx
 decode_conf_path=conf/tuning/decode.yaml
 avg_num=1
@@ -44,4 +44,4 @@ fi
 if [ ${stage} -le 4 ] && [ ${stop_stage} -ge 4 ]; then
     # test a single .wav file
     CUDA_VISIBLE_DEVICES=0 ./local/test_wav.sh ${conf_path} ${decode_conf_path} exp/${ckpt}/checkpoints/${avg_ckpt} ${audio_file} || exit -1
-fi
+fi

paddlespeech/resource/pretrained_models.py

@@ -87,28 +87,12 @@ ssl_dynamic_pretrained_models = {
             'chinese-wav2vec2-large.pdparams',
         },
     },
-    # "wav2vec2ASR_aishell1-zh-16k": {
-    #     '1.3': {
-    #         'url':
-    #         'https://paddlespeech.bj.bcebos.com/s2t/aishell/asr3/wav2vec2ASR-large-aishell1_ckpt_1.3.0.model.tar.gz',
-    #         'md5':
-    #         'ac8fa0a6345e6a7535f6fabb5e59e218',
-    #         'cfg_path':
-    #         'model.yaml',
-    #         'ckpt_path':
-    #         'exp/wav2vec2ASR/checkpoints/avg_1',
-    #         'model':
-    #         'exp/wav2vec2ASR/checkpoints/avg_1.pdparams',
-    #         'params':
-    #         'exp/wav2vec2ASR/checkpoints/avg_1.pdparams',
-    #     },
-    # },
     "wav2vec2ASR_aishell1-zh-16k": {
-        '1.4': {
+        '1.3': {
             'url':
-            'https://paddlespeech.bj.bcebos.com/s2t/aishell/asr3/wav2vec2ASR-large-aishell1_ckpt_1.4.0.model.tar.gz',
+            'https://paddlespeech.bj.bcebos.com/s2t/aishell/asr3/wav2vec2ASR-large-aishell1_ckpt_1.3.0.model.tar.gz',
             'md5':
-            '9f0bc943adb822789bf61e674b229d17',
+            'ac8fa0a6345e6a7535f6fabb5e59e218',
             'cfg_path':
             'model.yaml',
             'ckpt_path':
@@ -118,29 +102,11 @@ ssl_dynamic_pretrained_models = {
             'params':
             'exp/wav2vec2ASR/checkpoints/avg_1.pdparams',
         },
-    },
-    "hubert-en-16k": {
         '1.4': {
             'url':
-            'https://paddlespeech.bj.bcebos.com/s2t/librispeech/asr3/hubert-large-lv60_ckpt_1.4.0.model.tar.gz',
-            'md5':
-            '9f0bc943adb822789bf61e674b229d17',
-            'cfg_path':
-            'model.yaml',
-            'ckpt_path':
-            'hubert-large-lv60',
-            'model':
-            'hubert-large-lv60.pdparams',
-            'params':
-            'hubert-large-lv60.pdparams',
-        },
-    },
-    "hubertASR_librispeech_100-en-16k": {
-        '1.4': {
-            'url':
-            'https://paddlespeech.bj.bcebos.com/s2t/librispeech/asr3/hubertASR-large-100h-librispeech_ckpt_1.4.0.model.tar.gz',
+            'https://paddlespeech.bj.bcebos.com/s2t/aishell/asr3/wav2vec2ASR-large-aishell1_ckpt_1.4.0.model.tar.gz',
             'md5':
-            '9f0bc943adb822789bf61e674b229d17',
+            '150e51b8ea5d255ccce6b395de8d916a',
             'cfg_path':
             'model.yaml',
             'ckpt_path':
@@ -555,6 +521,38 @@ asr_onnx_pretrained_models = {
             '29e02312deb2e59b3c8686c7966d4fe3'
         },
     },
+    "hubert-en-16k": {
+        '1.4': {
+            'url':
+            'https://paddlespeech.bj.bcebos.com/s2t/librispeech/asr3/hubert-large-lv60_ckpt_1.4.0.model.tar.gz',
+            'md5':
+            '9f0bc943adb822789bf61e674b229d17',
+            'cfg_path':
+            'model.yaml',
+            'ckpt_path':
+            'hubert-large-lv60',
+            'model':
+            'hubert-large-lv60.pdparams',
+            'params':
+            'hubert-large-lv60.pdparams',
+        },
+    },
+    "hubertASR_librispeech_100-en-16k": {
+        '1.4': {
+            'url':
+            'https://paddlespeech.bj.bcebos.com/s2t/librispeech/asr3/hubertASR-large-100h-librispeech_ckpt_1.4.0.model.tar.gz',
+            'md5':
+            '9f0bc943adb822789bf61e674b229d17',
+            'cfg_path':
+            'model.yaml',
+            'ckpt_path':
+            'exp/wav2vec2ASR/checkpoints/avg_1',
+            'model':
+            'exp/wav2vec2ASR/checkpoints/avg_1.pdparams',
+            'params':
+            'exp/wav2vec2ASR/checkpoints/avg_1.pdparams',
+        },
+    },
 }
 
 whisper_dynamic_pretrained_models = {