Merge branch 'develop' of https://github.com/PaddlePaddle/DeepSpeech into ds2_online

examples/aishell/s0/local/server.sh

@@ -15,10 +15,10 @@ if [ $? -ne 0 ]; then
 fi
 
 # download well-trained model
-bash local/download_model.sh
-if [ $? -ne 0 ]; then
-    exit 1
-fi
+#bash local/download_model.sh
+#if [ $? -ne 0 ]; then
+#    exit 1
+#fi
 
 # start demo server
 CUDA_VISIBLE_DEVICES=0 \
@@ -29,7 +29,7 @@ python3 -u ${BIN_DIR}/deploy/server.py \
 --host_ip="localhost" \
 --host_port=8086 \
 --speech_save_dir="demo_cache" \
---checkpoint_path ${1} 
+--checkpoint_path ${1}
 
 if [ $? -ne 0 ]; then
     echo "Failed in starting demo server!"

examples/dataset/librispeech/librispeech.py

@@ -116,7 +116,8 @@ def create_manifest(data_dir, manifest_path):
 
     subset = os.path.splitext(manifest_path)[1][1:]
     manifest_dir = os.path.dirname(manifest_path)
-    meta_path = os.path.join(manifest_dir, dtype) + '.meta'
+    data_dir_name = os.path.split(data_dir)[-1]
+    meta_path = os.path.join(manifest_dir, data_dir_name) + '.meta'
     with open(meta_path, 'w') as f:
         print(f"{subset}:", file=f)
         print(f"{total_num} utts", file=f)

examples/dataset/mini_librispeech/mini_librispeech.py

@@ -95,7 +95,8 @@ def create_manifest(data_dir, manifest_path):
 
     subset = os.path.splitext(manifest_path)[1][1:]
     manifest_dir = os.path.dirname(manifest_path)
-    meta_path = os.path.join(manifest_dir, dtype) + '.meta'
+    data_dir_name = os.path.split(data_dir)[-1]
+    meta_path = os.path.join(manifest_dir, data_dir_name) + '.meta'
     with open(meta_path, 'w') as f:
         print(f"{subset}:", file=f)
         print(f"{total_num} utts", file=f)