Update app.py

app.py

@@ -1,35 +1,3 @@
-import ONNXVITS_models
-import utils
-from text import text_to_sequence
-import torch
-import commons
-
-def get_text(text, hps):
-    text_norm = text_to_sequence(text, hps.symbols, hps.data.text_cleaners)
-    if hps.data.add_blank:
-        text_norm = commons.intersperse(text_norm, 0)
-    text_norm = torch.LongTensor(text_norm)
-    return text_norm
-
-hps = utils.get_hparams_from_file("lovelive/config.json")
-symbols = hps.symbols
-net_g = ONNXVITS_models.SynthesizerTrn(
-    len(symbols),
-    hps.data.filter_length // 2 + 1,
-    hps.train.segment_size // hps.data.hop_length,
-    n_speakers=hps.data.n_speakers,
-    **hps.model)
-_ = net_g.eval()
-_ = utils.load_checkpoint("lovelive/G_525000.pth", net_g)
-
-text1 = get_text("[JA]ありがとうございます。[JA]", hps)
-stn_tst = text1
-with torch.no_grad():
-    x_tst = stn_tst.unsqueeze(0)
-    x_tst_lengths = torch.LongTensor([stn_tst.size(0)])
-    sid = torch.tensor([0])
-    o = net_g(x_tst, x_tst_lengths, sid=sid, noise_scale=.667, noise_scale_w=0.8, length_scale=1)
-'''
 import romajitable
 import re
 import numpy as np
@@ -39,7 +7,7 @@ import IPython.display as ipd
 import torch
 import commons
 import utils
-import ONNXVITS_infer
+from models import SynthesizerTrn
 from text.symbols import symbols
 from text import text_to_sequence
 import gradio as gr
@@ -181,7 +149,7 @@ lan = ["中文","日文","自动"]
 idols = ["高咲侑","歩夢","かすみ","しずく","果林","愛","せつ菜","璃奈","栞子","エマ","ランジュ","ミア","派蒙"]
 dev = torch.device("cpu")
 hps_ms = utils.get_hparams_from_file("lovelive/config.json")
-net_g_ms = ONNXVITS_infer.SynthesizerTrn(
+net_g_ms = SynthesizerTrn(
     len(symbols),
     hps_ms.data.filter_length // 2 + 1,
     hps_ms.train.segment_size // hps_ms.data.hop_length,
@@ -193,7 +161,7 @@ app = gr.Blocks()
 with app:
     with gr.Tabs():
 
-        with gr.TabItem("虹团vits模型，现可按句分割实现长文本合成，onnx导出后存在质量损失，建议本地运行vits模型"):
+        with gr.TabItem("虹团vits模型，现可按句分割实现长文本合成，可自行用export_to_onnx.py导出"):
 
             tts_input1 = gr.TextArea(label="去标贝新模型，老版本在lovelive文件夹中", value="数千怀言者已经为你集结，列队在通往主舰桥的过道上。他们歌唱着你们名字，高声呼喊，以一种原始的、咆哮般的合唱作为对你的致敬。你从他们中间走过，一边点头，一边接受他们的赞美，你沉溺其中，几乎被他们巨大的音量所震撼。\n他们之中没有一个胆敢直视你。没有一个能够承受。你对他们超人类的眼睛来说都太过光辉。从他们中间走过时，你巨大的影子从他们身上掠过，他们立时将目光挪开，眼含泪水，吟诵你的大名时甚至不敢看你一眼。他们的吟唱中含有愤怒。几乎是疯狂的绝望。那感觉就好像他们害怕停下来，害怕自己会喘息停顿，好像尖叫出你的名字是唯一能让他们活着的事情。\n或许确实如此。作为对他们崇拜的回应，你谦虚地抬抬手，随后走进主舰桥。\nI In a word, Horus is a joker.")
             language = gr.Dropdown(label="选择语言，目前勉强可以做到自动识别",choices=lan, value="自动", interactive=True)
@@ -205,5 +173,4 @@ with app:
             tts_output2 = gr.Audio(label="Output")
             tts_submit.click(infer, [language,tts_input1,speaker1,para_input1,para_input2,para_input3], [tts_output2])
     #app.launch(share=True)
-    app.launch()
-'''
+    app.launch()