From 4e37a5fda20f0878b593b8ba2b9ea46db63743b5 Mon Sep 17 00:00:00 2001
From: 嘉渊 <wangjiaming.wjm@alibaba-inc.com>
Date: 星期四, 11 五月 2023 14:16:28 +0800
Subject: [PATCH] update repo

---
 funasr/utils/prepare_data.py |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/funasr/utils/prepare_data.py b/funasr/utils/prepare_data.py
index c9a99e5..347aab5 100644
--- a/funasr/utils/prepare_data.py
+++ b/funasr/utils/prepare_data.py
@@ -36,10 +36,8 @@
                 f_text.write(sample_name + " " + text_dict[sample_name] + "\n")
             else:
                 filter_count += 1
-    logging.info(
-        "{}/{} samples in {} are filtered because of the mismatch between wav.scp and text".format(len(wav_lines),
-                                                                                                   filter_count,
-                                                                                                   dataset))
+    logging.info("{}/{} samples in {} are filtered because of the mismatch between wav.scp and text".
+                 format(filter_count, len(wav_lines), dataset))
 
 
 def wav2num_frame(wav_path, frontend_conf):
@@ -72,7 +70,7 @@
                 f.flush()
 
 
-def calc_shape(args, dataset, nj=32):
+def calc_shape(args, dataset, nj=64):
     shape_path = os.path.join(args.data_dir, dataset, "speech_shape")
     if os.path.exists(shape_path):
         logging.info('Shape file for small dataset already exists.')
@@ -92,7 +90,7 @@
     start = 0
     for i in range(nj):
         end = start + num_job_lines
-        file = os.path.join(shape_path, "wav.scp.{}".format(str(i + 1)))
+        file = os.path.join(split_shape_path, "wav.scp.{}".format(str(i + 1)))
         with open(file, "w") as f:
             if i == nj - 1:
                 f.writelines(lines[start:])
@@ -117,7 +115,7 @@
     logging.info('Generating shape files done.')
 
 
-def generate_data_list(data_dir, dataset, nj=100):
+def generate_data_list(data_dir, dataset, nj=64):
     list_file = os.path.join(data_dir, dataset, "data.list")
     if os.path.exists(list_file):
         logging.info('Data list for large dataset already exists.')
@@ -160,19 +158,31 @@
     distributed = distributed_option.distributed
     if not distributed or distributed_option.dist_rank == 0:
         filter_wav_text(args.data_dir, args.train_set)
-        filter_wav_text(args.data_dir, args.dev_set)
+        filter_wav_text(args.data_dir, args.valid_set)
 
-        if args.dataset_type == "small" and args.train_shape_file is None:
+        if args.dataset_type == "small":
             calc_shape(args, args.train_set)
-            calc_shape(args, args.dev_set)
+            calc_shape(args, args.valid_set)
 
-        if args.dataset_type == "large" and args.train_data_file is None:
+        if args.dataset_type == "large":
             generate_data_list(args.data_dir, args.train_set)
-            generate_data_list(args.data_dir, args.dev_set)
+            generate_data_list(args.data_dir, args.valid_set)
 
-    args.train_shape_file = [os.path.join(args.data_dir, args.train_set, "speech_shape")]
-    args.valid_shape_file = [os.path.join(args.data_dir, args.dev_set, "speech_shape")]
-    args.train_data_file = os.path.join(args.data_dir, args.train_set, "data.list")
-    args.valid_data_file = os.path.join(args.data_dir, args.dev_set, "data.list")
+    if args.dataset_type == "small":
+        args.train_shape_file = [os.path.join(args.data_dir, args.train_set, "speech_shape")]
+        args.valid_shape_file = [os.path.join(args.data_dir, args.valid_set, "speech_shape")]
+        data_names = args.dataset_conf.get("data_names", "speech,text").split(",")
+        data_types = args.dataset_conf.get("data_types", "sound,text").split(",")
+        args.train_data_path_and_name_and_type = [
+            ["{}/{}/wav.scp".format(args.data_dir, args.train_set), data_names[0], data_types[0]],
+            ["{}/{}/text".format(args.data_dir, args.train_set), data_names[1], data_types[1]]
+        ]
+        args.valid_data_path_and_name_and_type = [
+            ["{}/{}/wav.scp".format(args.data_dir, args.valid_set), data_names[0], data_types[0]],
+            ["{}/{}/text".format(args.data_dir, args.valid_set), data_names[1], data_types[1]]
+        ]
+    else:
+        args.train_data_file = os.path.join(args.data_dir, args.train_set, "data.list")
+        args.valid_data_file = os.path.join(args.data_dir, args.valid_set, "data.list")
     if distributed:
         dist.barrier()

--
Gitblit v1.9.1