From 4b2ea54c9606490e446bed22b03824dcbf809f49 Mon Sep 17 00:00:00 2001
From: Plachta <liusongting07@gmail.com>
Date: Sun, 26 Feb 2023 23:42:15 +0800
Subject: [PATCH] updated pipeline

---
 configs/finetune_speaker.json          | 204 ------------
 configs/modified_finetune_speaker.json | 431 +++++++++----------------
 rearrange_speaker.py                   |   6 +-
 3 files changed, 166 insertions(+), 475 deletions(-)
 delete mode 100644 configs/finetune_speaker.json

diff --git a/configs/finetune_speaker.json b/configs/finetune_speaker.json
deleted file mode 100644
index 29d237f..0000000
--- a/configs/finetune_speaker.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-  "train": {
-    "log_interval": 100,
-    "eval_interval": 1000,
-    "seed": 1234,
-    "epochs": 10000,
-    "learning_rate": 2e-4,
-    "betas": [0.8, 0.99],
-    "eps": 1e-9,
-    "batch_size": 12,
-    "fp16_run": true,
-    "lr_decay": 0.999875,
-    "segment_size": 8192,
-    "init_lr_ratio": 1,
-    "warmup_epochs": 0,
-    "c_mel": 45,
-    "c_kl": 1.0
-  },
-  "data": {
-    "training_files":"final_annotation_train.txt",
-    "validation_files":"final_annotation_val.txt",
-    "text_cleaners":["cjke_cleaners2"],
-    "max_wav_value": 32768.0,
-    "sampling_rate": 22050,
-    "filter_length": 1024,
-    "hop_length": 256,
-    "win_length": 1024,
-    "n_mel_channels": 80,
-    "mel_fmin": 0.0,
-    "mel_fmax": null,
-    "add_blank": true,
-    "n_speakers": 1001,
-    "cleaned_text": true
-  },
-  "model": {
-    "inter_channels": 192,
-    "hidden_channels": 192,
-    "filter_channels": 768,
-    "n_heads": 2,
-    "n_layers": 6,
-    "kernel_size": 3,
-    "p_dropout": 0.1,
-    "resblock": "1",
-    "resblock_kernel_sizes": [3,7,11],
-    "resblock_dilation_sizes": [[1,3,5], [1,3,5], [1,3,5]],
-    "upsample_rates": [8,8,2,2],
-    "upsample_initial_channel": 512,
-    "upsample_kernel_sizes": [16,16,4,4],
-    "n_layers_q": 3,
-    "use_spectral_norm": false,
-    "gin_channels": 256
-  },
-  "symbols": ["_", ",", ".", "!", "?", "-", "~", "\u2026", "N", "Q", "a", "b", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "s", "t", "u", "v", "w", "x", "y", "z", "\u0251", "\u00e6", "\u0283", "\u0291", "\u00e7", "\u026f", "\u026a", "\u0254", "\u025b", "\u0279", "\u00f0", "\u0259", "\u026b", "\u0265", "\u0278", "\u028a", "\u027e", "\u0292", "\u03b8", "\u03b2", "\u014b", "\u0266", "\u207c", "\u02b0", "`", "^", "#", "*", "=", "\u02c8", "\u02cc", "\u2192", "\u2193", "\u2191", " "],
-  "speakers": {"特别周 Special Week (Umamusume Pretty Derby)": 0,
-    "无声铃鹿 Silence Suzuka (Umamusume Pretty Derby)": 1,
-    "东海帝王 Tokai Teio (Umamusume Pretty Derby)": 2,
-    "丸善斯基 Maruzensky (Umamusume Pretty Derby)": 3,
-    "富士奇迹 Fuji Kiseki (Umamusume Pretty Derby)": 4,
-    "小栗帽 Oguri Cap (Umamusume Pretty Derby)": 5,
-    "黄金船 Gold Ship (Umamusume Pretty Derby)": 6,
-    "伏特加 Vodka (Umamusume Pretty Derby)": 7,
-    "大和赤骥 Daiwa Scarlet (Umamusume Pretty Derby)": 8,
-    "大树快车 Taiki Shuttle (Umamusume Pretty Derby)": 9,
-    "草上飞 Grass Wonder (Umamusume Pretty Derby)": 10,
-    "菱亚马逊 Hishi Amazon (Umamusume Pretty Derby)": 11,
-    "目白麦昆 Mejiro Mcqueen (Umamusume Pretty Derby)": 12,
-    "神鹰 El Condor Pasa (Umamusume Pretty Derby)": 13,
-    "好歌剧 T.M. Opera O (Umamusume Pretty Derby)": 14,
-    "成田白仁 Narita Brian (Umamusume Pretty Derby)": 15,
-    "鲁道夫象征 Symboli Rudolf (Umamusume Pretty Derby)": 16,
-    "气槽 Air Groove (Umamusume Pretty Derby)": 17,
-    "爱丽数码 Agnes Digital (Umamusume Pretty Derby)": 18,
-    "青云天空 Seiun Sky (Umamusume Pretty Derby)": 19,
-    "玉藻十字 Tamamo Cross (Umamusume Pretty Derby)": 20,
-    "美妙姿势 Fine Motion (Umamusume Pretty Derby)": 21,
-    "琵琶晨光 Biwa Hayahide (Umamusume Pretty Derby)": 22,
-    "重炮 Mayano Topgun (Umamusume Pretty Derby)": 23,
-    "曼城茶座 Manhattan Cafe (Umamusume Pretty Derby)": 24,
-    "美普波旁 Mihono Bourbon (Umamusume Pretty Derby)": 25,
-    "目白雷恩 Mejiro Ryan (Umamusume Pretty Derby)": 26,
-    "雪之美人 Yukino Bijin (Umamusume Pretty Derby)": 28,
-    "米浴 Rice Shower (Umamusume Pretty Derby)": 29,
-    "艾尼斯风神 Ines Fujin (Umamusume Pretty Derby)": 30,
-    "爱丽速子 Agnes Tachyon (Umamusume Pretty Derby)": 31,
-    "爱慕织姬 Admire Vega (Umamusume Pretty Derby)": 32,
-    "稻荷一 Inari One (Umamusume Pretty Derby)": 33,
-    "胜利奖券 Winning Ticket (Umamusume Pretty Derby)": 34,
-    "空中神宫 Air Shakur (Umamusume Pretty Derby)": 35,
-    "荣进闪耀 Eishin Flash (Umamusume Pretty Derby)": 36,
-    "真机伶 Curren Chan (Umamusume Pretty Derby)": 37,
-    "川上公主 Kawakami Princess (Umamusume Pretty Derby)": 38,
-    "黄金城市 Gold City (Umamusume Pretty Derby)": 39,
-    "樱花进王 Sakura Bakushin O (Umamusume Pretty Derby)": 40,
-    "采珠 Seeking the Pearl (Umamusume Pretty Derby)": 41,
-    "新光风 Shinko Windy (Umamusume Pretty Derby)": 42,
-    "东商变革 Sweep Tosho (Umamusume Pretty Derby)": 43,
-    "超级小溪 Super Creek (Umamusume Pretty Derby)": 44,
-    "醒目飞鹰 Smart Falcon (Umamusume Pretty Derby)": 45,
-    "荒漠英雄 Zenno Rob Roy (Umamusume Pretty Derby)": 46,
-    "东瀛佐敦 Tosen Jordan (Umamusume Pretty Derby)": 47,
-    "中山庆典 Nakayama Festa (Umamusume Pretty Derby)": 48,
-    "成田大进 Narita Taishin (Umamusume Pretty Derby)": 49,
-    "西野花 Nishino Flower (Umamusume Pretty Derby)": 50,
-    "春乌拉拉 Haru Urara (Umamusume Pretty Derby)": 51,
-    "青竹回忆 Bamboo Memory (Umamusume Pretty Derby)": 52,
-    "待兼福来 Matikane Fukukitaru (Umamusume Pretty Derby)": 55,
-    "名将怒涛 Meisho Doto (Umamusume Pretty Derby)": 57,
-    "目白多伯 Mejiro Dober (Umamusume Pretty Derby)": 58,
-    "优秀素质 Nice Nature (Umamusume Pretty Derby)": 59,
-    "帝王光环 King Halo (Umamusume Pretty Derby)": 60,
-    "待兼诗歌剧 Matikane Tannhauser (Umamusume Pretty Derby)": 61,
-    "生野狄杜斯 Ikuno Dictus (Umamusume Pretty Derby)": 62,
-    "目白善信 Mejiro Palmer (Umamusume Pretty Derby)": 63,
-    "大拓太阳神 Daitaku Helios (Umamusume Pretty Derby)": 64,
-    "双涡轮 Twin Turbo (Umamusume Pretty Derby)": 65,
-    "里见光钻 Satono Diamond (Umamusume Pretty Derby)": 66,
-    "北部玄驹 Kitasan Black (Umamusume Pretty Derby)": 67,
-    "樱花千代王 Sakura Chiyono O (Umamusume Pretty Derby)": 68,
-    "天狼星象征 Sirius Symboli (Umamusume Pretty Derby)": 69,
-    "目白阿尔丹 Mejiro Ardan (Umamusume Pretty Derby)": 70,
-    "八重无敌 Yaeno Muteki (Umamusume Pretty Derby)": 71,
-    "鹤丸刚志 Tsurumaru Tsuyoshi (Umamusume Pretty Derby)": 72,
-    "目白光明 Mejiro Bright (Umamusume Pretty Derby)": 73,
-    "樱花桂冠 Sakura Laurel (Umamusume Pretty Derby)": 74,
-    "成田路 Narita Top Road (Umamusume Pretty Derby)": 75,
-    "也文摄辉 Yamanin Zephyr (Umamusume Pretty Derby)": 76,
-    "真弓快车 Aston Machan (Umamusume Pretty Derby)": 80,
-    "骏川手纲 Hayakawa Tazuna (Umamusume Pretty Derby)": 81,
-    "小林历奇 Kopano Rickey (Umamusume Pretty Derby)": 83,
-    "奇锐骏 Wonder Acute (Umamusume Pretty Derby)": 85,
-    "秋川理事长 President Akikawa (Umamusume Pretty Derby)": 86,
-    "綾地 寧々 Ayachi Nene (Sanoba Witch)": 87,
-    "因幡 めぐる Inaba Meguru (Sanoba Witch)": 88,
-    "椎葉 紬 Shiiba Tsumugi (Sanoba Witch)": 89,
-    "仮屋 和奏 Kariya Wakama (Sanoba Witch)": 90,
-    "戸隠 憧子 Togakushi Touko (Sanoba Witch)": 91,
-    "九条裟罗 Kujou Sara (Genshin Impact)": 92,
-    "芭芭拉 Barbara (Genshin Impact)": 93,
-    "派蒙 Paimon (Genshin Impact)": 94,
-    "荒泷一斗 Arataki Itto (Genshin Impact)": 96,
-    "早柚 Sayu (Genshin Impact)": 97,
-    "香菱 Xiangling (Genshin Impact)": 98,
-    "神里绫华 Kamisato Ayaka (Genshin Impact)": 99,
-    "重云 Chongyun (Genshin Impact)": 100,
-    "流浪者 Wanderer (Genshin Impact)": 102,
-    "优菈 Eula (Genshin Impact)": 103,
-    "凝光 Ningguang (Genshin Impact)": 105,
-    "钟离 Zhongli (Genshin Impact)": 106,
-    "雷电将军 Raiden Shogun (Genshin Impact)": 107,
-    "枫原万叶 Kaedehara Kazuha (Genshin Impact)": 108,
-    "赛诺 Cyno (Genshin Impact)": 109,
-    "诺艾尔 Noelle (Genshin Impact)": 112,
-    "八重神子 Yae Miko (Genshin Impact)": 113,
-    "凯亚 Kaeya (Genshin Impact)": 114,
-    "魈 Xiao (Genshin Impact)": 115,
-    "托马 Thoma (Genshin Impact)": 116,
-    "可莉 Klee (Genshin Impact)": 117,
-    "迪卢克 Diluc (Genshin Impact)": 120,
-    "夜兰 Yelan (Genshin Impact)": 121,
-    "鹿野院平藏 Shikanoin Heizou (Genshin Impact)": 123,
-    "辛焱 Xinyan (Genshin Impact)": 124,
-    "丽莎 Lisa (Genshin Impact)": 125,
-    "云堇 Yun Jin (Genshin Impact)": 126,
-    "坎蒂丝 Candace (Genshin Impact)": 127,
-    "罗莎莉亚 Rosaria (Genshin Impact)": 128,
-    "北斗 Beidou (Genshin Impact)": 129,
-    "珊瑚宫心海 Sangonomiya Kokomi (Genshin Impact)": 132,
-    "烟绯 Yanfei (Genshin Impact)": 133,
-    "久岐忍 Kuki Shinobu (Genshin Impact)": 136,
-    "宵宫 Yoimiya (Genshin Impact)": 139,
-    "安柏 Amber (Genshin Impact)": 143,
-    "迪奥娜 Diona (Genshin Impact)": 144,
-    "班尼特 Bennett (Genshin Impact)": 146,
-    "雷泽 Razor (Genshin Impact)": 147,
-    "阿贝多 Albedo (Genshin Impact)": 151,
-    "温迪 Venti (Genshin Impact)": 152,
-    "空 Player Male (Genshin Impact)": 153,
-    "神里绫人 Kamisato Ayato (Genshin Impact)": 154,
-    "琴 Jean (Genshin Impact)": 155,
-    "艾尔海森 Alhaitham (Genshin Impact)": 156,
-    "莫娜 Mona (Genshin Impact)": 157,
-    "妮露 Nilou (Genshin Impact)": 159,
-    "胡桃 Hu Tao (Genshin Impact)": 160,
-    "甘雨 Ganyu (Genshin Impact)": 161,
-    "纳西妲 Nahida (Genshin Impact)": 162,
-    "刻晴 Keqing (Genshin Impact)": 165,
-    "荧 Player Female (Genshin Impact)": 169,
-    "埃洛伊 Aloy (Genshin Impact)": 179,
-    "柯莱 Collei (Genshin Impact)": 182,
-    "多莉 Dori (Genshin Impact)": 184,
-    "提纳里 Tighnari (Genshin Impact)": 186,
-    "砂糖 Sucrose (Genshin Impact)": 188,
-    "行秋 Xingqiu (Genshin Impact)": 190,
-    "奥兹 Oz (Genshin Impact)": 193,
-    "五郎 Gorou (Genshin Impact)": 198,
-    "达达利亚 Tartalia (Genshin Impact)": 202,
-    "七七 Qiqi (Genshin Impact)": 207,
-    "申鹤 Shenhe (Genshin Impact)": 217,
-    "莱依拉 Layla (Genshin Impact)": 228,
-    "菲谢尔 Fishl (Genshin Impact)": 230,
-    "User": 999
-  }
-
-}
\ No newline at end of file
diff --git a/configs/modified_finetune_speaker.json b/configs/modified_finetune_speaker.json
index cb193cb..d7feddb 100644
--- a/configs/modified_finetune_speaker.json
+++ b/configs/modified_finetune_speaker.json
@@ -1,16 +1,13 @@
 {
   "train": {
-    "log_interval": 100,
+    "log_interval": 200,
     "eval_interval": 1000,
     "seed": 1234,
     "epochs": 10000,
-    "learning_rate": 0.0002,
-    "betas": [
-      0.8,
-      0.99
-    ],
-    "eps": 1e-09,
-    "batch_size": 12,
+    "learning_rate": 2e-4,
+    "betas": [0.8, 0.99],
+    "eps": 1e-9,
+    "batch_size": 16,
     "fp16_run": true,
     "lr_decay": 0.999875,
     "segment_size": 8192,
@@ -20,11 +17,9 @@
     "c_kl": 1.0
   },
   "data": {
-    "training_files": "final_annotation_train.txt",
-    "validation_files": "final_annotation_val.txt",
-    "text_cleaners": [
-      "cjke_cleaners2"
-    ],
+    "training_files":"../CH_JA_EN_mix_voice/clipped_3_vits_trilingual_annotations.train.txt.cleaned",
+    "validation_files":"../CH_JA_EN_mix_voice/clipped_3_vits_trilingual_annotations.val.txt.cleaned",
+    "text_cleaners":["cjke_cleaners2"],
     "max_wav_value": 32768.0,
     "sampling_rate": 22050,
     "filter_length": 1024,
@@ -34,7 +29,7 @@
     "mel_fmin": 0.0,
     "mel_fmax": null,
     "add_blank": true,
-    "n_speakers": 1003,
+    "n_speakers": 999,
     "cleaned_text": true
   },
   "model": {
@@ -46,266 +41,162 @@
     "kernel_size": 3,
     "p_dropout": 0.1,
     "resblock": "1",
-    "resblock_kernel_sizes": [
-      3,
-      7,
-      11
-    ],
-    "resblock_dilation_sizes": [
-      [
-        1,
-        3,
-        5
-      ],
-      [
-        1,
-        3,
-        5
-      ],
-      [
-        1,
-        3,
-        5
-      ]
-    ],
-    "upsample_rates": [
-      8,
-      8,
-      2,
-      2
-    ],
+    "resblock_kernel_sizes": [3,7,11],
+    "resblock_dilation_sizes": [[1,3,5], [1,3,5], [1,3,5]],
+    "upsample_rates": [8,8,2,2],
     "upsample_initial_channel": 512,
-    "upsample_kernel_sizes": [
-      16,
-      16,
-      4,
-      4
-    ],
+    "upsample_kernel_sizes": [16,16,4,4],
     "n_layers_q": 3,
     "use_spectral_norm": false,
     "gin_channels": 256
   },
-  "symbols": [
-    "_",
-    ",",
-    ".",
-    "!",
-    "?",
-    "-",
-    "~",
-    "\u2026",
-    "N",
-    "Q",
-    "a",
-    "b",
-    "d",
-    "e",
-    "f",
-    "g",
-    "h",
-    "i",
-    "j",
-    "k",
-    "l",
-    "m",
-    "n",
-    "o",
-    "p",
-    "s",
-    "t",
-    "u",
-    "v",
-    "w",
-    "x",
-    "y",
-    "z",
-    "\u0251",
-    "\u00e6",
-    "\u0283",
-    "\u0291",
-    "\u00e7",
-    "\u026f",
-    "\u026a",
-    "\u0254",
-    "\u025b",
-    "\u0279",
-    "\u00f0",
-    "\u0259",
-    "\u026b",
-    "\u0265",
-    "\u0278",
-    "\u028a",
-    "\u027e",
-    "\u0292",
-    "\u03b8",
-    "\u03b2",
-    "\u014b",
-    "\u0266",
-    "\u207c",
-    "\u02b0",
-    "`",
-    "^",
-    "#",
-    "*",
-    "=",
-    "\u02c8",
-    "\u02cc",
-    "\u2192",
-    "\u2193",
-    "\u2191",
-    " "
-  ],
-  "speakers": {
-    "\u7279\u522b\u5468 Special Week (Umamusume Pretty Derby)": 0,
-    "\u65e0\u58f0\u94c3\u9e7f Silence Suzuka (Umamusume Pretty Derby)": 1,
-    "\u4e1c\u6d77\u5e1d\u738b Tokai Teio (Umamusume Pretty Derby)": 2,
-    "\u4e38\u5584\u65af\u57fa Maruzensky (Umamusume Pretty Derby)": 3,
-    "\u5bcc\u58eb\u5947\u8ff9 Fuji Kiseki (Umamusume Pretty Derby)": 4,
-    "\u5c0f\u6817\u5e3d Oguri Cap (Umamusume Pretty Derby)": 5,
-    "\u9ec4\u91d1\u8239 Gold Ship (Umamusume Pretty Derby)": 6,
-    "\u4f0f\u7279\u52a0 Vodka (Umamusume Pretty Derby)": 7,
-    "\u5927\u548c\u8d64\u9aa5 Daiwa Scarlet (Umamusume Pretty Derby)": 8,
-    "\u5927\u6811\u5feb\u8f66 Taiki Shuttle (Umamusume Pretty Derby)": 9,
-    "\u8349\u4e0a\u98de Grass Wonder (Umamusume Pretty Derby)": 10,
-    "\u83f1\u4e9a\u9a6c\u900a Hishi Amazon (Umamusume Pretty Derby)": 11,
-    "\u76ee\u767d\u9ea6\u6606 Mejiro Mcqueen (Umamusume Pretty Derby)": 12,
-    "\u795e\u9e70 El Condor Pasa (Umamusume Pretty Derby)": 13,
-    "\u597d\u6b4c\u5267 T.M. Opera O (Umamusume Pretty Derby)": 14,
-    "\u6210\u7530\u767d\u4ec1 Narita Brian (Umamusume Pretty Derby)": 15,
-    "\u9c81\u9053\u592b\u8c61\u5f81 Symboli Rudolf (Umamusume Pretty Derby)": 16,
-    "\u6c14\u69fd Air Groove (Umamusume Pretty Derby)": 17,
-    "\u7231\u4e3d\u6570\u7801 Agnes Digital (Umamusume Pretty Derby)": 18,
-    "\u9752\u4e91\u5929\u7a7a Seiun Sky (Umamusume Pretty Derby)": 19,
-    "\u7389\u85fb\u5341\u5b57 Tamamo Cross (Umamusume Pretty Derby)": 20,
-    "\u7f8e\u5999\u59ff\u52bf Fine Motion (Umamusume Pretty Derby)": 21,
-    "\u7435\u7436\u6668\u5149 Biwa Hayahide (Umamusume Pretty Derby)": 22,
-    "\u91cd\u70ae Mayano Topgun (Umamusume Pretty Derby)": 23,
-    "\u66fc\u57ce\u8336\u5ea7 Manhattan Cafe (Umamusume Pretty Derby)": 24,
-    "\u7f8e\u666e\u6ce2\u65c1 Mihono Bourbon (Umamusume Pretty Derby)": 25,
-    "\u76ee\u767d\u96f7\u6069 Mejiro Ryan (Umamusume Pretty Derby)": 26,
-    "\u96ea\u4e4b\u7f8e\u4eba Yukino Bijin (Umamusume Pretty Derby)": 28,
-    "\u7c73\u6d74 Rice Shower (Umamusume Pretty Derby)": 29,
-    "\u827e\u5c3c\u65af\u98ce\u795e Ines Fujin (Umamusume Pretty Derby)": 30,
-    "\u7231\u4e3d\u901f\u5b50 Agnes Tachyon (Umamusume Pretty Derby)": 31,
-    "\u7231\u6155\u7ec7\u59ec Admire Vega (Umamusume Pretty Derby)": 32,
-    "\u7a3b\u8377\u4e00 Inari One (Umamusume Pretty Derby)": 33,
-    "\u80dc\u5229\u5956\u5238 Winning Ticket (Umamusume Pretty Derby)": 34,
-    "\u7a7a\u4e2d\u795e\u5bab Air Shakur (Umamusume Pretty Derby)": 35,
-    "\u8363\u8fdb\u95ea\u8000 Eishin Flash (Umamusume Pretty Derby)": 36,
-    "\u771f\u673a\u4f36 Curren Chan (Umamusume Pretty Derby)": 37,
-    "\u5ddd\u4e0a\u516c\u4e3b Kawakami Princess (Umamusume Pretty Derby)": 38,
-    "\u9ec4\u91d1\u57ce\u5e02 Gold City (Umamusume Pretty Derby)": 39,
-    "\u6a31\u82b1\u8fdb\u738b Sakura Bakushin O (Umamusume Pretty Derby)": 40,
-    "\u91c7\u73e0 Seeking the Pearl (Umamusume Pretty Derby)": 41,
-    "\u65b0\u5149\u98ce Shinko Windy (Umamusume Pretty Derby)": 42,
-    "\u4e1c\u5546\u53d8\u9769 Sweep Tosho (Umamusume Pretty Derby)": 43,
-    "\u8d85\u7ea7\u5c0f\u6eaa Super Creek (Umamusume Pretty Derby)": 44,
-    "\u9192\u76ee\u98de\u9e70 Smart Falcon (Umamusume Pretty Derby)": 45,
-    "\u8352\u6f20\u82f1\u96c4 Zenno Rob Roy (Umamusume Pretty Derby)": 46,
-    "\u4e1c\u701b\u4f50\u6566 Tosen Jordan (Umamusume Pretty Derby)": 47,
-    "\u4e2d\u5c71\u5e86\u5178 Nakayama Festa (Umamusume Pretty Derby)": 48,
-    "\u6210\u7530\u5927\u8fdb Narita Taishin (Umamusume Pretty Derby)": 49,
-    "\u897f\u91ce\u82b1 Nishino Flower (Umamusume Pretty Derby)": 50,
-    "\u6625\u4e4c\u62c9\u62c9 Haru Urara (Umamusume Pretty Derby)": 51,
-    "\u9752\u7af9\u56de\u5fc6 Bamboo Memory (Umamusume Pretty Derby)": 52,
-    "\u5f85\u517c\u798f\u6765 Matikane Fukukitaru (Umamusume Pretty Derby)": 55,
-    "\u540d\u5c06\u6012\u6d9b Meisho Doto (Umamusume Pretty Derby)": 57,
-    "\u76ee\u767d\u591a\u4f2f Mejiro Dober (Umamusume Pretty Derby)": 58,
-    "\u4f18\u79c0\u7d20\u8d28 Nice Nature (Umamusume Pretty Derby)": 59,
-    "\u5e1d\u738b\u5149\u73af King Halo (Umamusume Pretty Derby)": 60,
-    "\u5f85\u517c\u8bd7\u6b4c\u5267 Matikane Tannhauser (Umamusume Pretty Derby)": 61,
-    "\u751f\u91ce\u72c4\u675c\u65af Ikuno Dictus (Umamusume Pretty Derby)": 62,
-    "\u76ee\u767d\u5584\u4fe1 Mejiro Palmer (Umamusume Pretty Derby)": 63,
-    "\u5927\u62d3\u592a\u9633\u795e Daitaku Helios (Umamusume Pretty Derby)": 64,
-    "\u53cc\u6da1\u8f6e Twin Turbo (Umamusume Pretty Derby)": 65,
-    "\u91cc\u89c1\u5149\u94bb Satono Diamond (Umamusume Pretty Derby)": 66,
-    "\u5317\u90e8\u7384\u9a79 Kitasan Black (Umamusume Pretty Derby)": 67,
-    "\u6a31\u82b1\u5343\u4ee3\u738b Sakura Chiyono O (Umamusume Pretty Derby)": 68,
-    "\u5929\u72fc\u661f\u8c61\u5f81 Sirius Symboli (Umamusume Pretty Derby)": 69,
-    "\u76ee\u767d\u963f\u5c14\u4e39 Mejiro Ardan (Umamusume Pretty Derby)": 70,
-    "\u516b\u91cd\u65e0\u654c Yaeno Muteki (Umamusume Pretty Derby)": 71,
-    "\u9e64\u4e38\u521a\u5fd7 Tsurumaru Tsuyoshi (Umamusume Pretty Derby)": 72,
-    "\u76ee\u767d\u5149\u660e Mejiro Bright (Umamusume Pretty Derby)": 73,
-    "\u6a31\u82b1\u6842\u51a0 Sakura Laurel (Umamusume Pretty Derby)": 74,
-    "\u6210\u7530\u8def Narita Top Road (Umamusume Pretty Derby)": 75,
-    "\u4e5f\u6587\u6444\u8f89 Yamanin Zephyr (Umamusume Pretty Derby)": 76,
-    "\u771f\u5f13\u5feb\u8f66 Aston Machan (Umamusume Pretty Derby)": 80,
-    "\u9a8f\u5ddd\u624b\u7eb2 Hayakawa Tazuna (Umamusume Pretty Derby)": 81,
-    "\u5c0f\u6797\u5386\u5947 Kopano Rickey (Umamusume Pretty Derby)": 83,
-    "\u5947\u9510\u9a8f Wonder Acute (Umamusume Pretty Derby)": 85,
-    "\u79cb\u5ddd\u7406\u4e8b\u957f President Akikawa (Umamusume Pretty Derby)": 86,
-    "\u7dbe\u5730 \u5be7\u3005 Ayachi Nene (Sanoba Witch)": 87,
-    "\u56e0\u5e61 \u3081\u3050\u308b Inaba Meguru (Sanoba Witch)": 88,
-    "\u690e\u8449 \u7d2c Shiiba Tsumugi (Sanoba Witch)": 89,
-    "\u4eee\u5c4b \u548c\u594f Kariya Wakama (Sanoba Witch)": 90,
-    "\u6238\u96a0 \u61a7\u5b50 Togakushi Touko (Sanoba Witch)": 91,
-    "\u4e5d\u6761\u88df\u7f57 Kujou Sara (Genshin Impact)": 92,
-    "\u82ad\u82ad\u62c9 Barbara (Genshin Impact)": 93,
-    "\u6d3e\u8499 Paimon (Genshin Impact)": 94,
-    "\u8352\u6cf7\u4e00\u6597 Arataki Itto (Genshin Impact)": 96,
-    "\u65e9\u67da Sayu (Genshin Impact)": 97,
-    "\u9999\u83f1 Xiangling (Genshin Impact)": 98,
-    "\u795e\u91cc\u7eeb\u534e Kamisato Ayaka (Genshin Impact)": 99,
-    "\u91cd\u4e91 Chongyun (Genshin Impact)": 100,
-    "\u6d41\u6d6a\u8005 Wanderer (Genshin Impact)": 102,
-    "\u4f18\u83c8 Eula (Genshin Impact)": 103,
-    "\u51dd\u5149 Ningguang (Genshin Impact)": 105,
-    "\u949f\u79bb Zhongli (Genshin Impact)": 106,
-    "\u96f7\u7535\u5c06\u519b Raiden Shogun (Genshin Impact)": 107,
-    "\u67ab\u539f\u4e07\u53f6 Kaedehara Kazuha (Genshin Impact)": 108,
-    "\u8d5b\u8bfa Cyno (Genshin Impact)": 109,
-    "\u8bfa\u827e\u5c14 Noelle (Genshin Impact)": 112,
-    "\u516b\u91cd\u795e\u5b50 Yae Miko (Genshin Impact)": 113,
-    "\u51ef\u4e9a Kaeya (Genshin Impact)": 114,
-    "\u9b48 Xiao (Genshin Impact)": 115,
-    "\u6258\u9a6c Thoma (Genshin Impact)": 116,
-    "\u53ef\u8389 Klee (Genshin Impact)": 117,
-    "\u8fea\u5362\u514b Diluc (Genshin Impact)": 120,
-    "\u591c\u5170 Yelan (Genshin Impact)": 121,
-    "\u9e7f\u91ce\u9662\u5e73\u85cf Shikanoin Heizou (Genshin Impact)": 123,
-    "\u8f9b\u7131 Xinyan (Genshin Impact)": 124,
-    "\u4e3d\u838e Lisa (Genshin Impact)": 125,
-    "\u4e91\u5807 Yun Jin (Genshin Impact)": 126,
-    "\u574e\u8482\u4e1d Candace (Genshin Impact)": 127,
-    "\u7f57\u838e\u8389\u4e9a Rosaria (Genshin Impact)": 128,
-    "\u5317\u6597 Beidou (Genshin Impact)": 129,
-    "\u73ca\u745a\u5bab\u5fc3\u6d77 Sangonomiya Kokomi (Genshin Impact)": 132,
-    "\u70df\u7eef Yanfei (Genshin Impact)": 133,
-    "\u4e45\u5c90\u5fcd Kuki Shinobu (Genshin Impact)": 136,
-    "\u5bb5\u5bab Yoimiya (Genshin Impact)": 139,
-    "\u5b89\u67cf Amber (Genshin Impact)": 143,
-    "\u8fea\u5965\u5a1c Diona (Genshin Impact)": 144,
-    "\u73ed\u5c3c\u7279 Bennett (Genshin Impact)": 146,
-    "\u96f7\u6cfd Razor (Genshin Impact)": 147,
-    "\u963f\u8d1d\u591a Albedo (Genshin Impact)": 151,
-    "\u6e29\u8fea Venti (Genshin Impact)": 152,
-    "\u7a7a Player Male (Genshin Impact)": 153,
-    "\u795e\u91cc\u7eeb\u4eba Kamisato Ayato (Genshin Impact)": 154,
-    "\u7434 Jean (Genshin Impact)": 155,
-    "\u827e\u5c14\u6d77\u68ee Alhaitham (Genshin Impact)": 156,
-    "\u83ab\u5a1c Mona (Genshin Impact)": 157,
-    "\u59ae\u9732 Nilou (Genshin Impact)": 159,
-    "\u80e1\u6843 Hu Tao (Genshin Impact)": 160,
-    "\u7518\u96e8 Ganyu (Genshin Impact)": 161,
-    "\u7eb3\u897f\u59b2 Nahida (Genshin Impact)": 162,
-    "\u523b\u6674 Keqing (Genshin Impact)": 165,
-    "\u8367 Player Female (Genshin Impact)": 169,
-    "\u57c3\u6d1b\u4f0a Aloy (Genshin Impact)": 179,
-    "\u67ef\u83b1 Collei (Genshin Impact)": 182,
-    "\u591a\u8389 Dori (Genshin Impact)": 184,
-    "\u63d0\u7eb3\u91cc Tighnari (Genshin Impact)": 186,
-    "\u7802\u7cd6 Sucrose (Genshin Impact)": 188,
-    "\u884c\u79cb Xingqiu (Genshin Impact)": 190,
-    "\u5965\u5179 Oz (Genshin Impact)": 193,
-    "\u4e94\u90ce Gorou (Genshin Impact)": 198,
-    "\u8fbe\u8fbe\u5229\u4e9a Tartalia (Genshin Impact)": 202,
-    "\u4e03\u4e03 Qiqi (Genshin Impact)": 207,
-    "\u7533\u9e64 Shenhe (Genshin Impact)": 217,
-    "\u83b1\u4f9d\u62c9 Layla (Genshin Impact)": 228,
-    "\u83f2\u8c22\u5c14 Fishl (Genshin Impact)": 230,
-    "User": 999,
-    "rosalia": 1000,
-    "taffy": 1001,
-    "YaeSakura": 1002
+  "symbols": ["_", ",", ".", "!", "?", "-", "~", "\u2026", "N", "Q", "a", "b", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "s", "t", "u", "v", "w", "x", "y", "z", "\u0251", "\u00e6", "\u0283", "\u0291", "\u00e7", "\u026f", "\u026a", "\u0254", "\u025b", "\u0279", "\u00f0", "\u0259", "\u026b", "\u0265", "\u0278", "\u028a", "\u027e", "\u0292", "\u03b8", "\u03b2", "\u014b", "\u0266", "\u207c", "\u02b0", "`", "^", "#", "*", "=", "\u02c8", "\u02cc", "\u2192", "\u2193", "\u2191", " "],
+  "speakers": {"特别周 Special Week (Umamusume Pretty Derby)": 0,
+    "无声铃鹿 Silence Suzuka (Umamusume Pretty Derby)": 1,
+    "东海帝王 Tokai Teio (Umamusume Pretty Derby)": 2,
+    "丸善斯基 Maruzensky (Umamusume Pretty Derby)": 3,
+    "富士奇迹 Fuji Kiseki (Umamusume Pretty Derby)": 4,
+    "小栗帽 Oguri Cap (Umamusume Pretty Derby)": 5,
+    "黄金船 Gold Ship (Umamusume Pretty Derby)": 6,
+    "伏特加 Vodka (Umamusume Pretty Derby)": 7,
+    "大和赤骥 Daiwa Scarlet (Umamusume Pretty Derby)": 8,
+    "大树快车 Taiki Shuttle (Umamusume Pretty Derby)": 9,
+    "草上飞 Grass Wonder (Umamusume Pretty Derby)": 10,
+    "菱亚马逊 Hishi Amazon (Umamusume Pretty Derby)": 11,
+    "目白麦昆 Mejiro Mcqueen (Umamusume Pretty Derby)": 12,
+    "神鹰 El Condor Pasa (Umamusume Pretty Derby)": 13,
+    "好歌剧 T.M. Opera O (Umamusume Pretty Derby)": 14,
+    "成田白仁 Narita Brian (Umamusume Pretty Derby)": 15,
+    "鲁道夫象征 Symboli Rudolf (Umamusume Pretty Derby)": 16,
+    "气槽 Air Groove (Umamusume Pretty Derby)": 17,
+    "爱丽数码 Agnes Digital (Umamusume Pretty Derby)": 18,
+    "青云天空 Seiun Sky (Umamusume Pretty Derby)": 19,
+    "玉藻十字 Tamamo Cross (Umamusume Pretty Derby)": 20,
+    "美妙姿势 Fine Motion (Umamusume Pretty Derby)": 21,
+    "琵琶晨光 Biwa Hayahide (Umamusume Pretty Derby)": 22,
+    "重炮 Mayano Topgun (Umamusume Pretty Derby)": 23,
+    "曼城茶座 Manhattan Cafe (Umamusume Pretty Derby)": 24,
+    "美普波旁 Mihono Bourbon (Umamusume Pretty Derby)": 25,
+    "目白雷恩 Mejiro Ryan (Umamusume Pretty Derby)": 26,
+    "雪之美人 Yukino Bijin (Umamusume Pretty Derby)": 28,
+    "米浴 Rice Shower (Umamusume Pretty Derby)": 29,
+    "艾尼斯风神 Ines Fujin (Umamusume Pretty Derby)": 30,
+    "爱丽速子 Agnes Tachyon (Umamusume Pretty Derby)": 31,
+    "爱慕织姬 Admire Vega (Umamusume Pretty Derby)": 32,
+    "稻荷一 Inari One (Umamusume Pretty Derby)": 33,
+    "胜利奖券 Winning Ticket (Umamusume Pretty Derby)": 34,
+    "空中神宫 Air Shakur (Umamusume Pretty Derby)": 35,
+    "荣进闪耀 Eishin Flash (Umamusume Pretty Derby)": 36,
+    "真机伶 Curren Chan (Umamusume Pretty Derby)": 37,
+    "川上公主 Kawakami Princess (Umamusume Pretty Derby)": 38,
+    "黄金城市 Gold City (Umamusume Pretty Derby)": 39,
+    "樱花进王 Sakura Bakushin O (Umamusume Pretty Derby)": 40,
+    "采珠 Seeking the Pearl (Umamusume Pretty Derby)": 41,
+    "新光风 Shinko Windy (Umamusume Pretty Derby)": 42,
+    "东商变革 Sweep Tosho (Umamusume Pretty Derby)": 43,
+    "超级小溪 Super Creek (Umamusume Pretty Derby)": 44,
+    "醒目飞鹰 Smart Falcon (Umamusume Pretty Derby)": 45,
+    "荒漠英雄 Zenno Rob Roy (Umamusume Pretty Derby)": 46,
+    "东瀛佐敦 Tosen Jordan (Umamusume Pretty Derby)": 47,
+    "中山庆典 Nakayama Festa (Umamusume Pretty Derby)": 48,
+    "成田大进 Narita Taishin (Umamusume Pretty Derby)": 49,
+    "西野花 Nishino Flower (Umamusume Pretty Derby)": 50,
+    "春乌拉拉 Haru Urara (Umamusume Pretty Derby)": 51,
+    "青竹回忆 Bamboo Memory (Umamusume Pretty Derby)": 52,
+    "待兼福来 Matikane Fukukitaru (Umamusume Pretty Derby)": 55,
+    "名将怒涛 Meisho Doto (Umamusume Pretty Derby)": 57,
+    "目白多伯 Mejiro Dober (Umamusume Pretty Derby)": 58,
+    "优秀素质 Nice Nature (Umamusume Pretty Derby)": 59,
+    "帝王光环 King Halo (Umamusume Pretty Derby)": 60,
+    "待兼诗歌剧 Matikane Tannhauser (Umamusume Pretty Derby)": 61,
+    "生野狄杜斯 Ikuno Dictus (Umamusume Pretty Derby)": 62,
+    "目白善信 Mejiro Palmer (Umamusume Pretty Derby)": 63,
+    "大拓太阳神 Daitaku Helios (Umamusume Pretty Derby)": 64,
+    "双涡轮 Twin Turbo (Umamusume Pretty Derby)": 65,
+    "里见光钻 Satono Diamond (Umamusume Pretty Derby)": 66,
+    "北部玄驹 Kitasan Black (Umamusume Pretty Derby)": 67,
+    "樱花千代王 Sakura Chiyono O (Umamusume Pretty Derby)": 68,
+    "天狼星象征 Sirius Symboli (Umamusume Pretty Derby)": 69,
+    "目白阿尔丹 Mejiro Ardan (Umamusume Pretty Derby)": 70,
+    "八重无敌 Yaeno Muteki (Umamusume Pretty Derby)": 71,
+    "鹤丸刚志 Tsurumaru Tsuyoshi (Umamusume Pretty Derby)": 72,
+    "目白光明 Mejiro Bright (Umamusume Pretty Derby)": 73,
+    "樱花桂冠 Sakura Laurel (Umamusume Pretty Derby)": 74,
+    "成田路 Narita Top Road (Umamusume Pretty Derby)": 75,
+    "也文摄辉 Yamanin Zephyr (Umamusume Pretty Derby)": 76,
+    "真弓快车 Aston Machan (Umamusume Pretty Derby)": 80,
+    "骏川手纲 Hayakawa Tazuna (Umamusume Pretty Derby)": 81,
+    "小林历奇 Kopano Rickey (Umamusume Pretty Derby)": 83,
+    "奇锐骏 Wonder Acute (Umamusume Pretty Derby)": 85,
+    "秋川理事长 President Akikawa (Umamusume Pretty Derby)": 86,
+    "綾地 寧々 Ayachi Nene (Sanoba Witch)": 87,
+    "因幡 めぐる Inaba Meguru (Sanoba Witch)": 88,
+    "椎葉 紬 Shiiba Tsumugi (Sanoba Witch)": 89,
+    "仮屋 和奏 Kariya Wakama (Sanoba Witch)": 90,
+    "戸隠 憧子 Togakushi Touko (Sanoba Witch)": 91,
+    "九条裟罗 Kujou Sara (Genshin Impact)": 92,
+    "芭芭拉 Barbara (Genshin Impact)": 93,
+    "派蒙 Paimon (Genshin Impact)": 94,
+    "荒泷一斗 Arataki Itto (Genshin Impact)": 96,
+    "早柚 Sayu (Genshin Impact)": 97,
+    "香菱 Xiangling (Genshin Impact)": 98,
+    "神里绫华 Kamisato Ayaka (Genshin Impact)": 99,
+    "重云 Chongyun (Genshin Impact)": 100,
+    "流浪者 Wanderer (Genshin Impact)": 102,
+    "优菈 Eula (Genshin Impact)": 103,
+    "凝光 Ningguang (Genshin Impact)": 105,
+    "钟离 Zhongli (Genshin Impact)": 106,
+    "雷电将军 Raiden Shogun (Genshin Impact)": 107,
+    "枫原万叶 Kaedehara Kazuha (Genshin Impact)": 108,
+    "赛诺 Cyno (Genshin Impact)": 109,
+    "诺艾尔 Noelle (Genshin Impact)": 112,
+    "八重神子 Yae Miko (Genshin Impact)": 113,
+    "凯亚 Kaeya (Genshin Impact)": 114,
+    "魈 Xiao (Genshin Impact)": 115,
+    "托马 Thoma (Genshin Impact)": 116,
+    "可莉 Klee (Genshin Impact)": 117,
+    "迪卢克 Diluc (Genshin Impact)": 120,
+    "夜兰 Yelan (Genshin Impact)": 121,
+    "鹿野院平藏 Shikanoin Heizou (Genshin Impact)": 123,
+    "辛焱 Xinyan (Genshin Impact)": 124,
+    "丽莎 Lisa (Genshin Impact)": 125,
+    "云堇 Yun Jin (Genshin Impact)": 126,
+    "坎蒂丝 Candace (Genshin Impact)": 127,
+    "罗莎莉亚 Rosaria (Genshin Impact)": 128,
+    "北斗 Beidou (Genshin Impact)": 129,
+    "珊瑚宫心海 Sangonomiya Kokomi (Genshin Impact)": 132,
+    "烟绯 Yanfei (Genshin Impact)": 133,
+    "久岐忍 Kuki Shinobu (Genshin Impact)": 136,
+    "宵宫 Yoimiya (Genshin Impact)": 139,
+    "安柏 Amber (Genshin Impact)": 143,
+    "迪奥娜 Diona (Genshin Impact)": 144,
+    "班尼特 Bennett (Genshin Impact)": 146,
+    "雷泽 Razor (Genshin Impact)": 147,
+    "阿贝多 Albedo (Genshin Impact)": 151,
+    "温迪 Venti (Genshin Impact)": 152,
+    "空 Player Male (Genshin Impact)": 153,
+    "神里绫人 Kamisato Ayato (Genshin Impact)": 154,
+    "琴 Jean (Genshin Impact)": 155,
+    "艾尔海森 Alhaitham (Genshin Impact)": 156,
+    "莫娜 Mona (Genshin Impact)": 157,
+    "妮露 Nilou (Genshin Impact)": 159,
+    "胡桃 Hu Tao (Genshin Impact)": 160,
+    "甘雨 Ganyu (Genshin Impact)": 161,
+    "纳西妲 Nahida (Genshin Impact)": 162,
+    "刻晴 Keqing (Genshin Impact)": 165,
+    "荧 Player Female (Genshin Impact)": 169,
+    "埃洛伊 Aloy (Genshin Impact)": 179,
+    "柯莱 Collei (Genshin Impact)": 182,
+    "多莉 Dori (Genshin Impact)": 184,
+    "提纳里 Tighnari (Genshin Impact)": 186,
+    "砂糖 Sucrose (Genshin Impact)": 188,
+    "行秋 Xingqiu (Genshin Impact)": 190,
+    "奥兹 Oz (Genshin Impact)": 193,
+    "五郎 Gorou (Genshin Impact)": 198,
+    "达达利亚 Tartalia (Genshin Impact)": 202,
+    "七七 Qiqi (Genshin Impact)": 207,
+    "申鹤 Shenhe (Genshin Impact)": 217,
+    "莱依拉 Layla (Genshin Impact)": 228,
+    "菲谢尔 Fishl (Genshin Impact)": 230
   }
 }
\ No newline at end of file
diff --git a/rearrange_speaker.py b/rearrange_speaker.py
index afe77f7..de0f754 100644
--- a/rearrange_speaker.py
+++ b/rearrange_speaker.py
@@ -23,7 +23,11 @@ if __name__ == "__main__":
         model_sd['model']['emb_g.weight'] = new_emb_g
         with open("./finetune_speaker.json", 'w', encoding='utf-8') as f:
             json.dump(hps, f, indent=2)
-        torch.save("./G_latest.pth", args.model_dir)
+        torch.save(model_sd, "./G_latest.pth")
+    else:
+        with open("./finetune_speaker.json", 'w', encoding='utf-8') as f:
+            json.dump(hps, f, indent=2)
+        torch.save(model_sd, "./G_latest.pth")
     # save another config file copy in MoeGoe format
     hps['speakers'] = valid_speakers
     with open("./moegoe_config.json", 'w', encoding='utf-8') as f: