fix Lint check

This commit is contained in:
Edresson 2020-07-29 21:21:42 -03:00 committed by erogol
parent 1d73566e4e
commit 7c12e94ee4
5 changed files with 5 additions and 6 deletions

View File

@ -199,7 +199,7 @@ class MyDataset(Dataset):
for idx in ids_sorted_decreasing] for idx in ids_sorted_decreasing]
# get speaker embeddings # get speaker embeddings
if self.speaker_mapping is not None: if self.speaker_mapping is not None:
wav_files_names = [batch[idx]['wav_file_name'] for idx in ids_sorted_decreasing] wav_files_names = [batch[idx]['wav_file_name'] for idx in ids_sorted_decreasing]
speaker_embedding = [self.speaker_mapping[w]['embedding'] for w in wav_files_names] speaker_embedding = [self.speaker_mapping[w]['embedding'] for w in wav_files_names]
else: else:
speaker_embedding = None speaker_embedding = None

View File

@ -229,14 +229,14 @@ def vctk(root_path, meta_files=None, wavs_path='wav48'):
items = [] items = []
meta_files = glob(f"{os.path.join(root_path,'txt')}/**/*.txt", recursive=True) meta_files = glob(f"{os.path.join(root_path,'txt')}/**/*.txt", recursive=True)
for meta_file in meta_files: for meta_file in meta_files:
txt, speaker_id, txt_file = os.path.relpath(meta_file,root_path).split(os.sep) _, speaker_id, txt_file = os.path.relpath(meta_file, root_path).split(os.sep)
file_id = txt_file.split('.')[0] file_id = txt_file.split('.')[0]
if isinstance(test_speakers, list): # if is list ignore this speakers ids if isinstance(test_speakers, list): # if is list ignore this speakers ids
if speaker_id in test_speakers: if speaker_id in test_speakers:
continue continue
with open(meta_file) as file_text: with open(meta_file) as file_text:
text = file_text.readlines()[0] text = file_text.readlines()[0]
wav_file = os.path.join(root_path, wavs_path, speaker_id,file_id+'.wav') wav_file = os.path.join(root_path, wavs_path, speaker_id, file_id+'.wav')
items.append([text, wav_file, speaker_id]) items.append([text, wav_file, speaker_id])
return items return items

View File

@ -55,7 +55,7 @@ class Tacotron(TacotronAbstract):
self.embeddings_per_sample = True self.embeddings_per_sample = True
# speaker and gst embeddings is concat in decoder input # speaker and gst embeddings is concat in decoder input
if num_speakers > 1: if num_speakers > 1:
decoder_in_features = decoder_in_features + speaker_embedding_dim # add speaker embedding dim decoder_in_features = decoder_in_features + speaker_embedding_dim # add speaker embedding dim
if self.gst: if self.gst:
decoder_in_features = decoder_in_features + gst_embedding_dim # add gst embedding dim decoder_in_features = decoder_in_features + gst_embedding_dim # add gst embedding dim

View File

@ -119,7 +119,7 @@ def english_cleaners(text):
return text return text
def portuguese_cleaners(text): def portuguese_cleaners(text):
'''Basic pipeline for Portuguese text. There is no need to expand abbreviation and '''Basic pipeline for Portuguese text. There is no need to expand abbreviation and
numbers, phonemizer already does that''' numbers, phonemizer already does that'''
text = lowercase(text) text = lowercase(text)
text = replace_symbols(text, lang='pt') text = replace_symbols(text, lang='pt')

View File

@ -147,7 +147,6 @@ def check_argument(name, c, enum_list=None, max_val=None, min_val=None, restrict
if enum_list: if enum_list:
assert c[name].lower() in enum_list, f' [!] {name} is not a valid value' assert c[name].lower() in enum_list, f' [!] {name} is not a valid value'
if isinstance(val_type, list): if isinstance(val_type, list):
valid_types = val_type
is_valid = False is_valid = False
for typ in val_type: for typ in val_type:
if isinstance(c[name], typ): if isinstance(c[name], typ):