Skip to content

Commit 9c0d819

Browse files
committed
prepare for online demo
1 parent 47389eb commit 9c0d819

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

Preprocessing/TextFrontend.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from Preprocessing.articulatory_features import get_feature_to_index_lookup
1515
from Preprocessing.articulatory_features import get_phone_to_id
1616
from Preprocessing.french_pos import map_to_wiktionary_pos
17-
from Utility.storage_config import PREPROCESSING_DIR
1817

1918

2019
class ArticulatoryCombinedTextFrontend:
@@ -115,7 +114,7 @@ def __init__(self,
115114
self.g2p_lang = "fr-fr"
116115
self.expand_abbreviations = remove_french_spacing
117116
# add POS Tagger for Blizzard Challenge
118-
flair.cache_root = Path(f"{PREPROCESSING_DIR}/.flair")
117+
flair.cache_root = Path("./Corpora/.flair")
119118
self.pos_tagger = SequenceTagger.load("qanastek/pos-french-camembert-flair")
120119
self.homographs = load_json_from_path("Preprocessing/french_homographs_preprocessed.json")
121120
self.homograph_list = list(self.homographs.keys())

run_model_downloader.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ def report(block_number, read_size, total_size):
1616

1717
def download_models():
1818
#############
19-
print("Downloading Aligner Model")
20-
os.makedirs(os.path.join(MODELS_DIR, "Aligner"), exist_ok=True)
19+
print("Downloading ToucanTTS AD Model")
20+
os.makedirs(os.path.join(MODELS_DIR, "ToucanTTS_AD"), exist_ok=True)
2121
filename, headers = urllib.request.urlretrieve(
22-
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.4/aligner.pt",
23-
filename=os.path.abspath(os.path.join(MODELS_DIR, "Aligner", "aligner.pt")),
22+
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.b/ad.pt",
23+
filename=os.path.abspath(os.path.join(MODELS_DIR, "ToucanTTS_AD", "best.pt")),
2424
reporthook=report)
2525

2626
#############
27-
print("Downloading Multilingual PortaSpeech Model")
28-
os.makedirs(os.path.join(MODELS_DIR, "PortaSpeech_Meta"), exist_ok=True)
27+
print("Downloading ToucanTTS NEB Model")
28+
os.makedirs(os.path.join(MODELS_DIR, "ToucanTTS_NEB"), exist_ok=True)
2929
filename, headers = urllib.request.urlretrieve(
30-
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.4/PortaSpeech_Meta.pt",
31-
filename=os.path.abspath(os.path.join(MODELS_DIR, "PortaSpeech_Meta", "best.pt")),
30+
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.b/neb.pt",
31+
filename=os.path.abspath(os.path.join(MODELS_DIR, "ToucanTTS_NEB", "best.pt")),
3232
reporthook=report)
3333

3434
#############
@@ -43,18 +43,10 @@ def download_models():
4343
print("Downloading Embedding Model")
4444
os.makedirs(os.path.join(MODELS_DIR, "Embedding"), exist_ok=True)
4545
filename, headers = urllib.request.urlretrieve(
46-
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.4/embedding_function.pt",
46+
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.b/embedding_function.pt",
4747
filename=os.path.abspath(os.path.join(MODELS_DIR, "Embedding", "embedding_function.pt")),
4848
reporthook=report)
4949

50-
#############
51-
print("Downloading Embedding GAN")
52-
os.makedirs(os.path.join(MODELS_DIR, "Embedding"), exist_ok=True)
53-
filename, headers = urllib.request.urlretrieve(
54-
url="https://github.com/DigitalPhonetics/IMS-Toucan/releases/download/v2.4/embedding_gan.pt",
55-
filename=os.path.abspath(os.path.join(MODELS_DIR, "Embedding", "embedding_gan.pt")),
56-
reporthook=report)
57-
5850

5951
if __name__ == '__main__':
6052
download_models()

0 commit comments

Comments
 (0)