Skip to content

Commit cf90566

Browse files
author
Ji Chen
committed
fix test error and remove assets libritts
1 parent d046701 commit cf90566

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

test/assets/LibriTTS/train-clean-100/84/121123/84_121123_000007_000001.normalized.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/assets/LibriTTS/train-clean-100/84/121123/84_121123_000007_000001.original.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.

test/test_datasets.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ def setUpClass(cls):
9595
for label in cls.labels:
9696
filename = f'{"_".join(str(l) for l in label)}.wav'
9797
path = os.path.join(base_dir, filename)
98-
9998
data = get_whitenoise(sample_rate=8000, duration=6, n_channels=1, dtype='int16')
10099
save_wav(path, data, 8000)
101100
cls.data.append(normalize_wav(data))
@@ -153,7 +152,7 @@ def setUpClass(cls):
153152
def test_libritts(self):
154153
dataset = LIBRITTS(self.root_dir)
155154
samples = list(dataset)
156-
samples.sort(key=lambda s: s[2])
155+
samples.sort(key=lambda s: s[4])
157156

158157
for i, (waveform,
159158
sample_rate,

torchaudio/datasets/libritts.py

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,23 @@
1313
URL = "train-clean-100"
1414
FOLDER_IN_ARCHIVE = "LibriTTS"
1515
_CHECKSUMS = {
16-
"http://www.openslr.org/60/dev-clean.tar.gz":
17-
"0c3076c1e5245bb3f0af7d82087ee207",
18-
"http://www.openslr.org/60/dev-other.tar.gz":
19-
"815555d8d75995782ac3ccd7f047213d",
20-
"http://www.openslr.org/60/test-clean.tar.gz":
21-
"7bed3bdb047c4c197f1ad3bc412db59f",
22-
"http://www.openslr.org/60/test-other.tar.gz":
23-
"ae3258249472a13b5abef2a816f733e4",
24-
"http://www.openslr.org/60/train-clean-100.tar.gz":
25-
"4a8c202b78fe1bc0c47916a98f3a2ea8",
26-
"http://www.openslr.org/60/train-clean-360.tar.gz":
27-
"a84ef10ddade5fd25df69596a2767b2d",
28-
"http://www.openslr.org/60/train-other-500.tar.gz":
29-
"7b181dd5ace343a5f38427999684aa6f",
16+
"http://www.openslr.org/60/dev-clean.tar.gz": "0c3076c1e5245bb3f0af7d82087ee207",
17+
"http://www.openslr.org/60/dev-other.tar.gz": "815555d8d75995782ac3ccd7f047213d",
18+
"http://www.openslr.org/60/test-clean.tar.gz": "7bed3bdb047c4c197f1ad3bc412db59f",
19+
"http://www.openslr.org/60/test-other.tar.gz": "ae3258249472a13b5abef2a816f733e4",
20+
"http://www.openslr.org/60/train-clean-100.tar.gz": "4a8c202b78fe1bc0c47916a98f3a2ea8",
21+
"http://www.openslr.org/60/train-clean-360.tar.gz": "a84ef10ddade5fd25df69596a2767b2d",
22+
"http://www.openslr.org/60/train-other-500.tar.gz": "7b181dd5ace343a5f38427999684aa6f",
3023
}
3124

3225

33-
def load_libritts_item(fileid: str,
34-
path: str,
35-
ext_audio: str,
36-
ext_original_txt: str,
37-
ext_normalized_txt: str) -> Tuple[Tensor, int, str, str, int, int, str]:
26+
def load_libritts_item(
27+
fileid: str,
28+
path: str,
29+
ext_audio: str,
30+
ext_original_txt: str,
31+
ext_normalized_txt: str,
32+
) -> Tuple[Tensor, int, str, str, int, int, str]:
3833
speaker_id, chapter_id, segment_id, utterance_id = fileid.split("_")
3934
utterance_id = fileid
4035

@@ -55,7 +50,7 @@ def load_libritts_item(fileid: str,
5550
original_utterance = ft.readline()
5651

5752
# Load normalized text
58-
with open(normalized_text, 'r') as ft:
53+
with open(normalized_text, "r") as ft:
5954
normalized_utterance = ft.readline()
6055

6156
return (
@@ -79,11 +74,13 @@ class LIBRITTS(Dataset):
7974
_ext_normalized_txt = ".normalized.txt"
8075
_ext_audio = ".wav"
8176

82-
def __init__(self,
83-
root: str,
84-
url: str = URL,
85-
folder_in_archive: str = FOLDER_IN_ARCHIVE,
86-
download: bool = False) -> None:
77+
def __init__(
78+
self,
79+
root: str,
80+
url: str = URL,
81+
folder_in_archive: str = FOLDER_IN_ARCHIVE,
82+
download: bool = False,
83+
) -> None:
8784

8885
if url in [
8986
"dev-clean",
@@ -122,7 +119,13 @@ def __init__(self,
122119

123120
def __getitem__(self, n: int) -> Tuple[Tensor, int, str, str, int, int, str]:
124121
fileid = self._walker[n]
125-
return load_libritts_item(fileid, self._path, self._ext_audio, self._ext_original_txt, self._ext_normalized_txt)
122+
return load_libritts_item(
123+
fileid,
124+
self._path,
125+
self._ext_audio,
126+
self._ext_original_txt,
127+
self._ext_normalized_txt,
128+
)
126129

127130
def __len__(self) -> int:
128131
return len(self._walker)

0 commit comments

Comments
 (0)