From a092a655908e405c404a0c1dc2224917589db047 Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Fri, 6 Aug 2021 16:39:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=94=B9symbol=E6=AA=94=E5=90=8D=E8=BC=83?= =?UTF-8?q?=E6=B8=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/dobi.yaml | 10 +++++----- .../tshamsoo/{symbols.py => text_symbols.py} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename fatchord-WaveRNN/tshamsoo/{symbols.py => text_symbols.py} (100%) diff --git a/fatchord-WaveRNN/dobi.yaml b/fatchord-WaveRNN/dobi.yaml index b4b3a8a..3b95f13 100644 --- a/fatchord-WaveRNN/dobi.yaml +++ b/fatchord-WaveRNN/dobi.yaml @@ -119,7 +119,7 @@ job=preprocess-tacotron-job: cp /tshamsoo/hparams.py . cp /tshamsoo/preprocess-tacotron.py . cp /tshamsoo/text_init.py utils/text/__init__.py - cp /tshamsoo/symbols.py utils/text/symbols.py + cp /tshamsoo/text_symbols.py utils/text/symbols.py python preprocess-tacotron.py --path /giliau/ ' mounts: [giliau, tshamsoo, data, ] @@ -133,7 +133,7 @@ job=tacotron-job: bash -eux -c ' cp /tshamsoo/hparams.py . cp /tshamsoo/text_init.py utils/text/__init__.py - cp /tshamsoo/symbols.py utils/text/symbols.py + cp /tshamsoo/text_symbols.py utils/text/symbols.py python train_tacotron.py ' mounts: [tshamsoo, data, checkpoints, ] @@ -147,7 +147,7 @@ job=tacotron-gta-job: bash -eux -c ' cp /tshamsoo/hparams.py . cp /tshamsoo/text_init.py utils/text/__init__.py - cp /tshamsoo/symbols.py utils/text/symbols.py + cp /tshamsoo/text_symbols.py utils/text/symbols.py python train_tacotron.py --force_gta ' mounts: [tshamsoo, data, checkpoints, ] @@ -173,7 +173,7 @@ job=wavernn-job: bash -eux -c ' cp /tshamsoo/hparams.py . cp /tshamsoo/text_init.py utils/text/__init__.py - cp /tshamsoo/symbols.py utils/text/symbols.py + cp /tshamsoo/text_symbols.py utils/text/symbols.py sed -i "s/dataset.pkl/dataset_wavernn.pkl/g" utils/dataset.py python train_wavernn.py --gta ' @@ -189,7 +189,7 @@ job=huatsiann-job: bash -eux -c ' cp /tshamsoo/hparams.py . cp /tshamsoo/text_init.py utils/text/__init__.py - cp /tshamsoo/symbols.py utils/text/symbols.py + cp /tshamsoo/text_symbols.py utils/text/symbols.py sed -i "s/required=True, //g" gen_tacotron.py time python gen_tacotron.py --input_text "$KU" griffinlim time python gen_tacotron.py --input_text "$KU" wavernn diff --git a/fatchord-WaveRNN/tshamsoo/symbols.py b/fatchord-WaveRNN/tshamsoo/text_symbols.py similarity index 100% rename from fatchord-WaveRNN/tshamsoo/symbols.py rename to fatchord-WaveRNN/tshamsoo/text_symbols.py From 66dcece2ce7bdc7d0ea4af90daab187593930806 Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Fri, 6 Aug 2021 16:47:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8A=A0=E5=8F=A3=E8=AA=9E=E8=AA=BF?= =?UTF-8?q?=E6=AC=B2--=C3=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/tshamsoo/text_symbols.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fatchord-WaveRNN/tshamsoo/text_symbols.py b/fatchord-WaveRNN/tshamsoo/text_symbols.py index 5c25e9d..24be157 100644 --- a/fatchord-WaveRNN/tshamsoo/text_symbols.py +++ b/fatchord-WaveRNN/tshamsoo/text_symbols.py @@ -3,17 +3,24 @@ ''' Defines the set of symbols used in text input to the model. -The default is a set of ASCII characters that works well for English or text that has been run through Unidecode. For other data, you can modify _characters. See TRAINING_DATA.md for details. ''' -from utils.text import cmudict +The default is a set of ASCII characters that works well for English or text +that has been run through Unidecode. +See TRAINING_DATA.md for details. +''' _pad = '_' -_punctuation = '!\'(),.:;? ' -_special = '-' -_letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' -_ipa = 'ŋəɛɨʔʰ̩ⁿ' +_punctuation = r' -\.,;:?!"\'\(\)“”‘’~─' +_letters = sorted(set( + 'abcdefghijklmnopqrstuvwxyzáàâǎāa̍a̋éèêěēe̍e̋íìîǐīı̍i̍i̋' + 'óòôǒōo̍őó͘ò͘ô͘ǒ͘ō͘o̍͘ő͘úùûǔūu̍űḿm̀m̂m̌m̄m̍m̋ńǹn̂ňn̄n̍n̋ⁿ' +)) +_tsong = _letters + _letters.upper() _sooji = '0123456789' +_piantiau = '規本隨再固三仔海' # Export all symbols: -symbols = [_pad] + list(_special) + list(_punctuation) + list(_letters) + list(_ipa) + list(_sooji) - +symbols = ( + [_pad] + list(_punctuation) + + list(_tsong) + list(_sooji) + list(_piantiau) +) From 3de1926eac3e6cc2e03a4788405c1f2cc7325ca4 Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Fri, 6 Aug 2021 16:51:17 +0800 Subject: [PATCH 3/9] =?UTF-8?q?dobi=E8=A8=AD=E5=AE=9A=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/dobi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fatchord-WaveRNN/dobi.yaml b/fatchord-WaveRNN/dobi.yaml index 3b95f13..cec3751 100644 --- a/fatchord-WaveRNN/dobi.yaml +++ b/fatchord-WaveRNN/dobi.yaml @@ -8,7 +8,7 @@ meta: env=siatting: variables: - - PANPUN=0.2.1 + - PANPUN=1.0 - BANGTSI=https://www.dropbox.com/s/rye2sd0wo718bj5/SuiSiann-0.2.1.tar?dl=0 - PINLUT=16k From b7a226dfa86875e262a322aa9ecf3cffc0a7bd0f Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Fri, 6 Aug 2021 16:56:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8F=A3=E8=AA=9E=E8=AA=BF=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=A8=93=E7=B7=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/tshamsoo/preprocess-tacotron.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/fatchord-WaveRNN/tshamsoo/preprocess-tacotron.py b/fatchord-WaveRNN/tshamsoo/preprocess-tacotron.py index 258e2ae..7cfed8f 100644 --- a/fatchord-WaveRNN/tshamsoo/preprocess-tacotron.py +++ b/fatchord-WaveRNN/tshamsoo/preprocess-tacotron.py @@ -14,12 +14,6 @@ from utils.paths import Paths -from 臺灣言語工具.解析整理.拆文分析器 import 拆文分析器 -from 臺灣言語工具.音標系統.閩南語.臺灣閩南語羅馬字拼音 import 臺灣閩南語羅馬字拼音 -from 臺灣言語工具.語音合成.閩南語音韻規則 import 閩南語音韻規則 -from 臺灣言語工具.語音合成 import 台灣話口語講法 - - # Helper functions for argument types def valid_n_workers(num): n = int(num) @@ -73,11 +67,7 @@ def suisiann(path: Union[str, Path], wav_files): mia = basename(tsua['音檔']) if mia in u_tihleh: imtong = splitext(mia)[0] - hj = tsua['漢字'] - lmj = tsua['羅馬字'] - text_dict[imtong] = 台灣話口語講法( - 拆文分析器.建立句物件(hj, lmj) - ) + text_dict[imtong] = tsua['口語調'] return text_dict From 610e1971aafb6ac2714ff0de5e91bde58fe1b2d4 Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Fri, 6 Aug 2021 16:58:57 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=81=9A=E5=A4=A7=E5=AF=AB=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/tshamsoo/text_symbols.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fatchord-WaveRNN/tshamsoo/text_symbols.py b/fatchord-WaveRNN/tshamsoo/text_symbols.py index 24be157..0bcde12 100644 --- a/fatchord-WaveRNN/tshamsoo/text_symbols.py +++ b/fatchord-WaveRNN/tshamsoo/text_symbols.py @@ -14,7 +14,7 @@ 'abcdefghijklmnopqrstuvwxyzáàâǎāa̍a̋éèêěēe̍e̋íìîǐīı̍i̍i̋' 'óòôǒōo̍őó͘ò͘ô͘ǒ͘ō͘o̍͘ő͘úùûǔūu̍űḿm̀m̂m̌m̄m̍m̋ńǹn̂ňn̄n̍n̋ⁿ' )) -_tsong = _letters + _letters.upper() +_tsong = _letters + list(''.join(_letters).upper()) _sooji = '0123456789' _piantiau = '規本隨再固三仔海' From f8cf93dfef1346130e62f00c857ab05dd40f6d83 Mon Sep 17 00:00:00 2001 From: fafoy Date: Thu, 19 Aug 2021 15:28:44 +0800 Subject: [PATCH 6/9] =?UTF-8?q?Le=20kai=20=E5=8F=A3=E8=AA=9E=E8=AA=BF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/dobi.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fatchord-WaveRNN/dobi.yaml b/fatchord-WaveRNN/dobi.yaml index cec3751..bdc0753 100644 --- a/fatchord-WaveRNN/dobi.yaml +++ b/fatchord-WaveRNN/dobi.yaml @@ -182,7 +182,7 @@ job=wavernn-job: job=huatsiann-job: use: hunlian-khuanking env: - - KU={env.KU:tak10-ke7 tsə2-hue1 lai7 tsʰit8-tʰə5 !} + - KU={env.KU:ta̍k規-ke規 tsò規-hué規 lâi規 tshit規-thô本!} - PANPUN={env.PANPUN} - CUDA_VISIBLE_DEVICES=1 command: | @@ -191,9 +191,9 @@ job=huatsiann-job: cp /tshamsoo/text_init.py utils/text/__init__.py cp /tshamsoo/text_symbols.py utils/text/symbols.py sed -i "s/required=True, //g" gen_tacotron.py - time python gen_tacotron.py --input_text "$KU" griffinlim - time python gen_tacotron.py --input_text "$KU" wavernn - time python gen_tacotron.py --input_text "$KU" wavernn --unbatched + time python gen_tacotron.py --input_text "$KU" --save_attention griffinlim + time python gen_tacotron.py --input_text "$KU" --save_attention wavernn + time python gen_tacotron.py --input_text "$KU" --save_attention wavernn --unbatched ' mounts: [tshamsoo, checkpoints, outputs, ] From 789a97462add8eebe3af4b5d455955df81599e8f Mon Sep 17 00:00:00 2001 From: fafoy Date: Mon, 30 Aug 2021 11:16:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=A3=9Cinside=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/dobi.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fatchord-WaveRNN/dobi.yaml b/fatchord-WaveRNN/dobi.yaml index bdc0753..b0f25bb 100644 --- a/fatchord-WaveRNN/dobi.yaml +++ b/fatchord-WaveRNN/dobi.yaml @@ -182,9 +182,10 @@ job=wavernn-job: job=huatsiann-job: use: hunlian-khuanking env: - - KU={env.KU:ta̍k規-ke規 tsò規-hué規 lâi規 tshit規-thô本!} + - KU={env.KU:to規-guân規 bûn規-huà本 beh再 siū規 lâng規 khíng規-tīng本.} +# - KU={env.KU:ta̍k規-ke規 tsò規-hué規 lâi規 tshit規-thô本!} - PANPUN={env.PANPUN} - - CUDA_VISIBLE_DEVICES=1 + - CUDA_VISIBLE_DEVICES=0 command: | bash -eux -c ' cp /tshamsoo/hparams.py . From 9667327300cf46ee8caadc922651a2f6096a65f1 Mon Sep 17 00:00:00 2001 From: Fafofafoy Date: Tue, 30 Nov 2021 10:29:34 +0800 Subject: [PATCH 8/9] piann khang-peh. --- fatchord-WaveRNN/tshamsoo/text_symbols.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fatchord-WaveRNN/tshamsoo/text_symbols.py b/fatchord-WaveRNN/tshamsoo/text_symbols.py index ea4763e..9d5338b 100644 --- a/fatchord-WaveRNN/tshamsoo/text_symbols.py +++ b/fatchord-WaveRNN/tshamsoo/text_symbols.py @@ -1,4 +1,3 @@ - """ from https://github.com/keithito/tacotron """ ''' From cda0c7909166fcd4c7ef412cbcd5f7f2ae7e8963 Mon Sep 17 00:00:00 2001 From: Fafoy Date: Thu, 15 Sep 2022 17:02:51 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=94=B9=E7=94=A8=E7=92=B0=E5=A2=83?= =?UTF-8?q?=E8=AE=8A=E6=95=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fatchord-WaveRNN/dobi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fatchord-WaveRNN/dobi.yaml b/fatchord-WaveRNN/dobi.yaml index 13cb269..488e4cd 100644 --- a/fatchord-WaveRNN/dobi.yaml +++ b/fatchord-WaveRNN/dobi.yaml @@ -185,7 +185,7 @@ job=huatsiann-job: - KU={env.KU:to規-guân規 bûn規-huà本 beh再 siū規 lâng規 khíng規-tīng本.} # - KU={env.KU:ta̍k規-ke規 tsò規-hué規 lâi規 tshit規-thô本!} - PANPUN={env.PANPUN} - - CUDA_VISIBLE_DEVICES=0 + - CUDA_VISIBLE_DEVICES={env.CUDA_VISIBLE_DEVICES:0} command: | bash -eux -c ' cp /tshamsoo/hparams.py .