JotunnBurton commited on
Commit
0fc12b1
·
verified ·
1 Parent(s): 7709d54

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +14 -8
app.py CHANGED
@@ -24,6 +24,19 @@ logger = logging.getLogger(__name__)
24
  limitation = os.getenv("SYSTEM") == "spaces"
25
 
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
  def get_text(text, hps):
28
  language_str = "JP"
29
  norm_text, phone, tone, word2ph = clean_text(text, language_str)
@@ -199,14 +212,7 @@ if __name__ == "__main__":
199
  config_path = hf_hub_download(repo_id=link, filename="config.json")
200
  model_path = hf_hub_download(repo_id=link, filename=f"{name}.pth")
201
  hps = utils.get_hparams_from_file(config_path)
202
- net_g_ms = SynthesizerTrn(
203
- len(symbols),
204
- hps.data.filter_length // 2 + 1,
205
- hps.train.segment_size // hps.data.hop_length,
206
- n_speakers=hps.data.n_speakers,
207
- **hps.model)
208
- utils.load_checkpoint(model_path, net_g_ms, None, skip_optimizer=True)
209
- _ = net_g_ms.eval().to(device)
210
  models.append((name, title, example, list(hps.data.spk2id.keys()), net_g_ms, create_tts_fn(net_g_ms, hps)))
211
 
212
  # ✅ Gradio UI แบบพร้อมใช้กับ Spaces
 
24
  limitation = os.getenv("SYSTEM") == "spaces"
25
 
26
 
27
+ def get_net_g(model_path: str, version: str, device: str, hps):
28
+ # 当前版本模型 net_g
29
+ net_g = SynthesizerTrn(
30
+ len(symbols),
31
+ hps.data.filter_length // 2 + 1,
32
+ hps.train.segment_size // hps.data.hop_length,
33
+ n_speakers=hps.data.n_speakers,
34
+ **hps.model,
35
+ ).to(device)
36
+ _ = net_g.eval()
37
+ _ = utils.load_checkpoint(model_path, net_g, None, skip_optimizer=True)
38
+ return net_g
39
+
40
  def get_text(text, hps):
41
  language_str = "JP"
42
  norm_text, phone, tone, word2ph = clean_text(text, language_str)
 
212
  config_path = hf_hub_download(repo_id=link, filename="config.json")
213
  model_path = hf_hub_download(repo_id=link, filename=f"{name}.pth")
214
  hps = utils.get_hparams_from_file(config_path)
215
+ net_g_ms = get_net_g(model_path, "v1", device, hps)
 
 
 
 
 
 
 
216
  models.append((name, title, example, list(hps.data.spk2id.keys()), net_g_ms, create_tts_fn(net_g_ms, hps)))
217
 
218
  # ✅ Gradio UI แบบพร้อมใช้กับ Spaces