From c825b63d4c6ee51ccf93c85af3bd26a6dd66fa33 Mon Sep 17 00:00:00 2001 From: erogol Date: Mon, 2 Mar 2020 12:53:55 +0100 Subject: [PATCH] better version control for phonemizer --- datasets/preprocess.py | 2 +- utils/text/__init__.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/datasets/preprocess.py b/datasets/preprocess.py index 64efc665..029922d3 100644 --- a/datasets/preprocess.py +++ b/datasets/preprocess.py @@ -84,7 +84,7 @@ def mozilla_de(root_path, meta_file): for line in ttf: cols = line.strip().split('|') wav_file = cols[0].strip() - text = cols[1].strip() + text = cols[1].strip() folder_name = f"BATCH_{wav_file.split('_')[0]}_FINAL" wav_file = os.path.join(root_path, folder_name, wav_file) items.append([text, wav_file, speaker_name]) diff --git a/utils/text/__init__.py b/utils/text/__init__.py index 0e6684d2..0fb47952 100644 --- a/utils/text/__init__.py +++ b/utils/text/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re +from packaging import version import phonemizer from phonemizer.phonemize import phonemize from TTS.utils.text import cleaners @@ -28,7 +29,7 @@ def text2phone(text, language): seperator = phonemizer.separator.Separator(' |', '', '|') #try: punctuations = re.findall(PHONEME_PUNCTUATION_PATTERN, text) - if float(phonemizer.__version__) < 2.1: + if version.parse(phonemizer.__version__) < version.parse('2.1'): ph = phonemize(text, separator=seperator, strip=False, njobs=1, backend='espeak', language=language) ph = ph[:-1].strip() # skip the last empty character # phonemizer does not tackle punctuations. Here we do. @@ -42,7 +43,7 @@ def text2phone(text, language): else: for punct in punctuations: ph = ph.replace('| |\n', '|'+punct+'| |', 1) - elif float(phonemizer.__version__) == 2.1: + elif version.parse(phonemizer.__version__) >= version.parse('2.1'): ph = phonemize(text, separator=seperator, strip=False, njobs=1, backend='espeak', language=language, preserve_punctuation=True) # this is a simple fix for phonemizer. # https://github.com/bootphon/phonemizer/issues/32