Tidied speaker ID lookup

Author: OscarVanL

examples/fastspeech2_libritts/fastspeech2_dataset.py

@@ -118,10 +118,6 @@ def __init__(
         self.energy_load_fn = energy_load_fn
         self.mel_length_threshold = mel_length_threshold
         self.speakers_map = speakers_map
-        self.speakers = [
-            self.speakers_map[i.split("_")[0]] for i in self.utt_ids
-        ]  # TODO change but at the moment mfa folder name = speaker name
-
         self.f0_stat = np.load(f0_stat)
         self.energy_stat = np.load(energy_stat)
 
@@ -145,7 +141,7 @@ def generator(self, utt_ids):
             duration_file = self.duration_files[i]
             f0_file = self.f0_files[i]
             energy_file = self.energy_files[i]
-            speaker_id = self.speakers[i]
+            speaker_id = self.speakers_map[utt_id.split("_")[0]]
 
             items = {
                 "utt_ids": utt_id,