From d3d42efeffd43d9487e18ff25cf2f878e967a015 Mon Sep 17 00:00:00 2001 From: jtodo Date: Sat, 29 Apr 2023 19:12:04 +0900 Subject: [PATCH 1/3] Fix colab for RVC --- server/MMVCServerSIO.py | 50 ++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/server/MMVCServerSIO.py b/server/MMVCServerSIO.py index 808a3bcc8..f10c497a7 100755 --- a/server/MMVCServerSIO.py +++ b/server/MMVCServerSIO.py @@ -24,6 +24,7 @@ def setupArgParser(): parser = argparse.ArgumentParser() parser.add_argument("-p", type=int, default=18888, help="port") + parser.add_argument("--colab", type=strtobool, default=False, help="use colab") parser.add_argument("--https", type=strtobool, default=False, help="use https") parser.add_argument( "--httpsKey", type=str, default="ssl.key", help="path for the key of https" @@ -211,23 +212,32 @@ def localServer(): # log_level="warning" ) else: - p = mp.Process(name="p", target=localServer) - p.start() - try: - if sys.platform.startswith("win"): - process = subprocess.Popen( - [NATIVE_CLIENT_FILE_WIN, "-u", f"http://localhost:{PORT}/"] - ) - return_code = process.wait() - print("client closed.") - p.terminate() - elif sys.platform.startswith("darwin"): - process = subprocess.Popen( - [NATIVE_CLIENT_FILE_MAC, "-u", f"http://localhost:{PORT}/"] - ) - return_code = process.wait() - print("client closed.") - p.terminate() - - except Exception as e: - print(e) + # HTTP サーバ起動 + if args.colab == True: + uvicorn.run( + f"{os.path.basename(__file__)[:-3]}:app_socketio", + host="0.0.0.0", + port=int(PORT), + log_level="warning" + ) + else: + p = mp.Process(name="p", target=localServer) + p.start() + try: + if sys.platform.startswith("win"): + process = subprocess.Popen( + [NATIVE_CLIENT_FILE_WIN, "-u", f"http://localhost:{PORT}/"] + ) + return_code = process.wait() + print("client closed.") + p.terminate() + elif sys.platform.startswith("darwin"): + process = subprocess.Popen( + [NATIVE_CLIENT_FILE_MAC, "-u", f"http://localhost:{PORT}/"] + ) + return_code = process.wait() + print("client closed.") + p.terminate() + + except Exception as e: + print(e) From 4f8d77bcec325d402f40a821819679ea64b79f31 Mon Sep 17 00:00:00 2001 From: jtodo Date: Tue, 2 May 2023 00:22:58 +0900 Subject: [PATCH 2/3] Change default provider to CUDAExecutionProvider --- server/voice_changer/RVC/ModelWrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/voice_changer/RVC/ModelWrapper.py b/server/voice_changer/RVC/ModelWrapper.py index a659a05a2..74ad541fd 100644 --- a/server/voice_changer/RVC/ModelWrapper.py +++ b/server/voice_changer/RVC/ModelWrapper.py @@ -4,7 +4,7 @@ import json # providers = ['OpenVINOExecutionProvider', "CUDAExecutionProvider", "DmlExecutionProvider", "CPUExecutionProvider"] -providers = ["CPUExecutionProvider"] +providers = ["CUDAExecutionProvider"] class ModelWrapper: From fa2f8a43627e2d287eb766d542decc2e0fbb93ed Mon Sep 17 00:00:00 2001 From: jtodo Date: Sun, 7 May 2023 17:02:44 +0900 Subject: [PATCH 3/3] Change np.int to np.int16 --- server/voice_changer/RVC/custom_vc_infer_pipeline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/voice_changer/RVC/custom_vc_infer_pipeline.py b/server/voice_changer/RVC/custom_vc_infer_pipeline.py index 0b6310403..2a896f435 100644 --- a/server/voice_changer/RVC/custom_vc_infer_pipeline.py +++ b/server/voice_changer/RVC/custom_vc_infer_pipeline.py @@ -64,7 +64,7 @@ def get_f0(self, audio, p_len, f0_up_key, f0_method, silence_front=0): ) + 1 f0_mel[f0_mel <= 1] = 1 f0_mel[f0_mel > 255] = 255 - f0_coarse = np.rint(f0_mel).astype(np.int) + f0_coarse = np.rint(f0_mel).astype(np.int16) # Volume Extract # volume = self.extractVolume(audio, 512)