From 2868fe3df4e92a6ae3e327faf6e57ea492e04124 Mon Sep 17 00:00:00 2001
From: 志浩 <neo.dzh@alibaba-inc.com>
Date: 星期四, 16 三月 2023 19:24:21 +0800
Subject: [PATCH] Merge branch 'main' into dev_dzh
---
funasr/datasets/iterable_dataset.py | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/funasr/datasets/iterable_dataset.py b/funasr/datasets/iterable_dataset.py
index 00697fd..c8c51d4 100644
--- a/funasr/datasets/iterable_dataset.py
+++ b/funasr/datasets/iterable_dataset.py
@@ -8,6 +8,7 @@
from typing import Iterator
from typing import Tuple
from typing import Union
+from typing import List
import kaldiio
import numpy as np
@@ -129,7 +130,7 @@
non_iterable_list = []
self.path_name_type_list = []
- if not isinstance(path_name_type_list[0], Tuple):
+ if not isinstance(path_name_type_list[0], (Tuple, List)):
path = path_name_type_list[0]
name = path_name_type_list[1]
_type = path_name_type_list[2]
@@ -243,10 +244,15 @@
array = torch.from_numpy(array)
array = torchaudio.transforms.Resample(orig_freq=audio_fs,
new_freq=model_fs)(array)
- if self.mc:
- data[name] = array.transpose(0, 1).numpy()
+ array = array.numpy()
+
+ if _type == "sound":
+ if self.mc:
+ data[name] = array.transpose((1, 0))
+ else:
+ data[name] = array[0]
else:
- data[name] = array[0].numpy()
+ data[name] = array
if self.preprocess is not None:
data = self.preprocess(uid, data)
@@ -346,11 +352,12 @@
array = torch.from_numpy(array)
array = torchaudio.transforms.Resample(orig_freq=audio_fs,
new_freq=model_fs)(array)
+ array = array.numpy()
if _type == "sound":
if self.mc:
- data[name] = array.transpose(0, 1).numpy()
+ data[name] = array.transpose((1, 0))
else:
- data[name] = array[0].numpy()
+ data[name] = array[0]
else:
data[name] = array
if self.non_iterable_dataset is not None:
--
Gitblit v1.9.1