Update superb.py

superb.py

@@ -294,42 +294,6 @@ class Superb(datasets.GeneratorBasedBuilder):
         ),
     ]
 
-    @property
-    def manual_download_instructions(self):
-        if self.config.name == "si":
-            return textwrap.dedent(
-                """
-            Please download the VoxCeleb dataset using the following script,
-            which should create `VoxCeleb1/wav/id*` directories for both train and test speakers`:
-            ```
-            mkdir VoxCeleb1
-            cd VoxCeleb1
-
-            wget https://thor.robots.ox.ac.uk/~vgg/data/voxceleb/vox1a/vox1_dev_wav_partaa
-            wget https://thor.robots.ox.ac.uk/~vgg/data/voxceleb/vox1a/vox1_dev_wav_partab
-            wget https://thor.robots.ox.ac.uk/~vgg/data/voxceleb/vox1a/vox1_dev_wav_partac
-            wget https://thor.robots.ox.ac.uk/~vgg/data/voxceleb/vox1a/vox1_dev_wav_partad
-            cat vox1_dev* > vox1_dev_wav.zip
-            unzip vox1_dev_wav.zip
-
-            wget https://thor.robots.ox.ac.uk/~vgg/data/voxceleb/vox1a/vox1_test_wav.zip
-            unzip vox1_test_wav.zip
-
-            # download the official SUPERB train-dev-test split
-            wget https://raw.githubusercontent.com/s3prl/s3prl/master/s3prl/downstream/voxceleb1/veri_test_class.txt
-            ```"""
-            )
-        elif self.config.name == "er":
-            return textwrap.dedent(
-                """
-            Please download the IEMOCAP dataset after submitting the request form here:
-            https://sail.usc.edu/iemocap/iemocap_release.htm
-            Having downloaded the dataset you can extract it with `tar -xvzf IEMOCAP_full_release.tar.gz`
-            which should create a folder called `IEMOCAP_full_release`
-            """
-            )
-        return None
-
     def _info(self):
         return datasets.DatasetInfo(
             description=_DESCRIPTION,
@@ -390,15 +354,19 @@ class Superb(datasets.GeneratorBasedBuilder):
                 ),
             ]
         elif self.config.name == "si":
-            manual_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))
+            archive_path = (
+                dl_manager.download_and_extract("https://huggingface.co/datasets/ProgramComputer/voxceleb/resolve/main/vox1/vox1_dev_wav.zip"),
+                dl_manager.download_and_extract("https://huggingface.co/datasets/ProgramComputer/voxceleb/resolve/main/vox1/vox1_test_wav.zip"),
+                dl_manager.download_and_extract("https://raw.githubusercontent.com/s3prl/s3prl/master/s3prl/downstream/voxceleb1/veri_test_class.txt"),
+            )
             return [
                 datasets.SplitGenerator(
                     name=datasets.Split.TRAIN,
-                    gen_kwargs={"archive_path": manual_dir, "split": 1},
+                    gen_kwargs={"archive_path": archive_path, "split": 1},
                 ),
                 datasets.SplitGenerator(
                     name=datasets.Split.VALIDATION,
-                    gen_kwargs={"archive_path": manual_dir, "split": 2},
+                    gen_kwargs={"archive_path": archive_path, "split": 2},
                 ),
                 datasets.SplitGenerator(name=datasets.Split.TEST, gen_kwargs={"archive_path": manual_dir, "split": 3}),
             ]
@@ -419,7 +387,9 @@ class Superb(datasets.GeneratorBasedBuilder):
                 for split in splits
             ]
         elif self.config.name == "er":
-            manual_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))
+            archive_path = (
+                dl_manager.download_and_extract("https://huggingface.co/datasets/lhoestq/IEMOCAP_full_release/resolve/main/IEMOCAP_full_release.zip")
+            )
             return [
                 datasets.SplitGenerator(
                     name=f"session{i}",
@@ -483,20 +453,22 @@ class Superb(datasets.GeneratorBasedBuilder):
                         "location": location,
                     }
         elif self.config.name == "si":
-            wav_path = os.path.join(archive_path, "wav")
-            splits_path = os.path.join(archive_path, "veri_test_class.txt")
+            *archives_dirs, splits_path = archive_path
             with open(splits_path, "r", encoding="utf-8") as f:
                 for key, line in enumerate(f):
                     split_id, file_path = line.strip().split(" ")
                     if int(split_id) != split:
                         continue
                     speaker_id = file_path.split("/")[0]
-                    audio_path = os.path.join(wav_path, file_path)
-                    yield key, {
-                        "file": audio_path,
-                        "audio": audio_path,
-                        "label": speaker_id,
-                    }
+                    for archive_dir in archives_dirs: # in one or the other
+                        wav_path = os.path.join(archive_dir, "wav")
+                        audio_path = os.path.join(wav_path, file_path)
+                        if os.path.exists(audio_path):
+                            yield key, {
+                                "file": audio_path,
+                                "audio": audio_path,
+                                "label": speaker_id,
+                            }
         elif self.config.name == "sd":
             data = SdData(archive_path)
             args = SdArgs()