1berry/wokada-voice-changer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

boot process improvement

Browse Source
This commit is contained in:
wataru 2023-03-14 10:53:34 +09:00
parent 398921dd25
commit c5b9bc3a3f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/MMVCServerSIO.py
View File

@ -76,6 +76,8 @@ args, unknown = parser.parse_known_args()
# if __name__ == thisFilename or args.colab == True: # if __name__ == thisFilename or args.colab == True:
# printMessage(f"PHASE3:{__name__}", level=2) # printMessage(f"PHASE3:{__name__}", level=2)
printMessage(f"Booting PHASE :{__name__}", level=2)
TYPE = args.t TYPE = args.t
PORT = args.p PORT = args.p
CONFIG = args.c CONFIG = args.c
@ -102,16 +104,17 @@ def localServer():
if args.colab == True: if args.colab == True:
os.environ["colab"] = "True" os.environ["colab"] = "True"
voiceChangerManager = VoiceChangerManager.get_instance() if __name__ == 'MMVCServerSIO':
if CONFIG and (MODEL or ONNX_MODEL): voiceChangerManager = VoiceChangerManager.get_instance()
if CONFIG and (MODEL or ONNX_MODEL):
if MODEL_TYPE == "MMVCv15" or MODEL_TYPE == "MMVCv13": if MODEL_TYPE == "MMVCv15" or MODEL_TYPE == "MMVCv13":
voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, None, None) voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, None, None)
else: else:
# !! 注意 !! hubertTorchModelは固定値で上書きされるため、設定しても効果ない。 # !! 注意 !! hubertTorchModelは固定値で上書きされるため、設定しても効果ない。
voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, CLUSTER_MODEL, HUBERT_MODEL) voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, CLUSTER_MODEL, HUBERT_MODEL)
app_fastapi = MMVC_Rest.get_instance(voiceChangerManager) app_fastapi = MMVC_Rest.get_instance(voiceChangerManager)
app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager) app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager)
if __name__ == '__mp_main__': if __name__ == '__mp_main__':