From c5b9bc3a3f832df9f40a7bd3e66fd12e3dc42b30 Mon Sep 17 00:00:00 2001 From: wataru Date: Tue, 14 Mar 2023 10:53:34 +0900 Subject: [PATCH] boot process improvement --- server/MMVCServerSIO.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/server/MMVCServerSIO.py b/server/MMVCServerSIO.py index 60b6399b..c0030173 100755 --- a/server/MMVCServerSIO.py +++ b/server/MMVCServerSIO.py @@ -76,6 +76,8 @@ args, unknown = parser.parse_known_args() # if __name__ == thisFilename or args.colab == True: # printMessage(f"PHASE3:{__name__}", level=2) +printMessage(f"Booting PHASE :{__name__}", level=2) + TYPE = args.t PORT = args.p CONFIG = args.c @@ -102,16 +104,17 @@ def localServer(): if args.colab == True: os.environ["colab"] = "True" -voiceChangerManager = VoiceChangerManager.get_instance() -if CONFIG and (MODEL or ONNX_MODEL): - if MODEL_TYPE == "MMVCv15" or MODEL_TYPE == "MMVCv13": - voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, None, None) - else: - # !! 注意 !! hubertTorchModelは固定値で上書きされるため、設定しても効果ない。 - voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, CLUSTER_MODEL, HUBERT_MODEL) +if __name__ == 'MMVCServerSIO': + voiceChangerManager = VoiceChangerManager.get_instance() + if CONFIG and (MODEL or ONNX_MODEL): + if MODEL_TYPE == "MMVCv15" or MODEL_TYPE == "MMVCv13": + voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, None, None) + else: + # !! 注意 !! hubertTorchModelは固定値で上書きされるため、設定しても効果ない。 + voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, CLUSTER_MODEL, HUBERT_MODEL) -app_fastapi = MMVC_Rest.get_instance(voiceChangerManager) -app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager) + app_fastapi = MMVC_Rest.get_instance(voiceChangerManager) + app_socketio = MMVC_SocketIOApp.get_instance(app_fastapi, voiceChangerManager) if __name__ == '__mp_main__':