修改app解析代码;恢复模型配置
Browse files- app.py +9 -3
- saved_model/19/config.json +2 -2
- saved_model/19/config_example.json +0 -3
app.py
CHANGED
|
@@ -185,11 +185,17 @@ if __name__ == '__main__':
|
|
| 185 |
**hps.model)
|
| 186 |
utils.load_checkpoint(model_path, model, None)
|
| 187 |
model.eval().to(device)
|
| 188 |
-
|
| 189 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 190 |
|
| 191 |
t = info["type"]
|
| 192 |
-
if t == "vits":
|
| 193 |
models_tts.append((name, author, cover_path, speakers, lang, example,
|
| 194 |
hps.symbols, create_tts_fn(model, hps, speaker_ids),
|
| 195 |
create_to_symbol_fn(hps)))
|
|
|
|
| 185 |
**hps.model)
|
| 186 |
utils.load_checkpoint(model_path, model, None)
|
| 187 |
model.eval().to(device)
|
| 188 |
+
if t == "vits-fast":
|
| 189 |
+
for name, id in hps.speakers.items():
|
| 190 |
+
if name != "None":
|
| 191 |
+
speaker_ids.append(id)
|
| 192 |
+
speakers.append(name)
|
| 193 |
+
else:
|
| 194 |
+
speaker_ids = [sid for sid, name in enumerate(hps.speakers) if name != "None"]
|
| 195 |
+
speakers = [name for sid, name in enumerate(hps.speakers) if name != "None"]
|
| 196 |
|
| 197 |
t = info["type"]
|
| 198 |
+
if t == "vits" or t == "vits-fast":
|
| 199 |
models_tts.append((name, author, cover_path, speakers, lang, example,
|
| 200 |
hps.symbols, create_tts_fn(model, hps, speaker_ids),
|
| 201 |
create_to_symbol_fn(hps)))
|
saved_model/19/config.json
CHANGED
|
@@ -1,3 +1,3 @@
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:
|
| 3 |
-
size
|
|
|
|
| 1 |
version https://git-lfs.github.com/spec/v1
|
| 2 |
+
oid sha256:57f68a837d6ca675a8bf46740dfd93f97bab061a9993e3c72d42908bfac09061
|
| 3 |
+
size 2169
|
saved_model/19/config_example.json
DELETED
|
@@ -1,3 +0,0 @@
|
|
| 1 |
-
version https://git-lfs.github.com/spec/v1
|
| 2 |
-
oid sha256:aaa921889da820eee740426dc28f8b11242d5ea64635d75460b04d0f4c830f83
|
| 3 |
-
size 3336
|
|
|
|
|
|
|
|
|
|
|
|