From 8fd883d7398e928c6af1a12eac4250cbd530d822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=81=D1=82=D0=BE=20=D0=A5=D0=B0=D1=81?= =?UTF-8?q?=D0=BA=D0=B5=D1=80?= <62063826+IXackerr@users.noreply.github.com> Date: Thu, 11 Apr 2024 09:46:02 +0200 Subject: [PATCH] Move to Gradio 4.23.0 (#1928) --- Retrieval_based_Voice_Conversion_WebUI.ipynb | 2 +- Retrieval_based_Voice_Conversion_WebUI_v2.ipynb | 2 +- infer-web.py | 15 +++------------ requirements-amd.txt | 4 ++-- requirements-dml.txt | 4 ++-- requirements-ipex.txt | 4 ++-- requirements-py311.txt | 4 ++-- requirements.txt | 4 ++-- 8 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Retrieval_based_Voice_Conversion_WebUI.ipynb b/Retrieval_based_Voice_Conversion_WebUI.ipynb index b38d8d2..fa1d84e 100644 --- a/Retrieval_based_Voice_Conversion_WebUI.ipynb +++ b/Retrieval_based_Voice_Conversion_WebUI.ipynb @@ -57,7 +57,7 @@ "!apt-get -y install build-essential python3-dev ffmpeg\n", "!pip3 install --upgrade setuptools wheel\n", "!pip3 install --upgrade pip\n", - "!pip3 install faiss-cpu==1.7.2 fairseq gradio==3.14.0 ffmpeg ffmpeg-python praat-parselmouth pyworld numpy==1.23.5 numba==0.56.4 librosa==0.9.2" + "!pip3 install faiss-cpu==1.7.2 fairseq gradio==4.23.0 ffmpeg ffmpeg-python praat-parselmouth pyworld numpy==1.23.5 numba==0.56.4 librosa==0.9.2" ] }, { diff --git a/Retrieval_based_Voice_Conversion_WebUI_v2.ipynb b/Retrieval_based_Voice_Conversion_WebUI_v2.ipynb index 0cad19f..613e628 100644 --- a/Retrieval_based_Voice_Conversion_WebUI_v2.ipynb +++ b/Retrieval_based_Voice_Conversion_WebUI_v2.ipynb @@ -57,7 +57,7 @@ "!apt-get -y install build-essential python3-dev ffmpeg\n", "!pip3 install --upgrade setuptools wheel\n", "!pip3 install --upgrade pip\n", - "!pip3 install faiss-cpu==1.7.2 fairseq gradio==3.14.0 ffmpeg ffmpeg-python praat-parselmouth pyworld numpy==1.23.5 numba==0.56.4 librosa==0.9.2" + "!pip3 install faiss-cpu==1.7.2 fairseq gradio==4.23.0 ffmpeg ffmpeg-python praat-parselmouth pyworld numpy==1.23.5 numba==0.56.4 librosa==0.9.2" ] }, { diff --git a/infer-web.py b/infer-web.py index 47596d5..5ea767d 100644 --- a/infer-web.py +++ b/infer-web.py @@ -120,16 +120,6 @@ else: gpus = "-".join([i[0] for i in gpu_infos]) -class ToolButton(gr.Button, gr.components.FormComponent): - """Small button with single emoji as text, fits inside gradio forms""" - - def __init__(self, **kwargs): - super().__init__(variant="tool", **kwargs) - - def get_block_name(self): - return "button" - - weight_root = os.getenv("weight_root") weight_uvr5_root = os.getenv("weight_uvr5_root") index_root = os.getenv("index_root") @@ -1609,9 +1599,10 @@ with gr.Blocks(title="RVC WebUI") as app: gr.Markdown(traceback.format_exc()) if config.iscolab: - app.queue(concurrency_count=511, max_size=1022).launch(share=True) + app.queue(max_size=1022).launch(share=True, max_threads=511) else: - app.queue(concurrency_count=511, max_size=1022).launch( + app.queue(max_size=1022).launch( + max_threads=511, server_name="0.0.0.0", inbrowser=not config.noautoopen, server_port=config.listen_port, diff --git a/requirements-amd.txt b/requirements-amd.txt index d0976a7..cbda2da 100644 --- a/requirements-amd.txt +++ b/requirements-amd.txt @@ -7,7 +7,7 @@ librosa==0.9.1 llvmlite==0.39.0 fairseq==0.12.2 faiss-cpu==1.7.3 -gradio==3.34.0 +gradio==4.23.0 Cython pydub>=0.25.1 soundfile>=0.12.1 @@ -42,7 +42,7 @@ httpx onnxruntime onnxruntime-gpu torchcrepe==0.0.20 -fastapi==0.88 +fastapi ffmpy==0.3.1 python-dotenv>=1.0.0 av diff --git a/requirements-dml.txt b/requirements-dml.txt index b4690ae..f65b1a5 100644 --- a/requirements-dml.txt +++ b/requirements-dml.txt @@ -6,7 +6,7 @@ librosa==0.9.1 llvmlite==0.39.0 fairseq==0.12.2 faiss-cpu==1.7.3 -gradio==3.34.0 +gradio==4.23.0 Cython pydub>=0.25.1 soundfile>=0.12.1 @@ -40,7 +40,7 @@ pyworld==0.3.2 httpx onnxruntime-directml torchcrepe==0.0.20 -fastapi==0.88 +fastapi ffmpy==0.3.1 python-dotenv>=1.0.0 av diff --git a/requirements-ipex.txt b/requirements-ipex.txt index 19ff424..ad99974 100644 --- a/requirements-ipex.txt +++ b/requirements-ipex.txt @@ -11,7 +11,7 @@ librosa==0.9.1 llvmlite==0.39.0 fairseq==0.12.2 faiss-cpu==1.7.3 -gradio==3.34.0 +gradio==4.23.0 Cython pydub>=0.25.1 soundfile>=0.12.1 @@ -46,7 +46,7 @@ httpx onnxruntime; sys_platform == 'darwin' onnxruntime-gpu; sys_platform != 'darwin' torchcrepe==0.0.20 -fastapi==0.88 +fastapi ffmpy==0.3.1 python-dotenv>=1.0.0 av diff --git a/requirements-py311.txt b/requirements-py311.txt index 99c6a44..e002fbd 100644 --- a/requirements-py311.txt +++ b/requirements-py311.txt @@ -6,7 +6,7 @@ librosa==0.9.1 llvmlite fairseq @ git+https://github.com/One-sixth/fairseq.git faiss-cpu -gradio==3.34.0 +gradio==4.23.0 Cython pydub>=0.25.1 soundfile>=0.12.1 @@ -41,7 +41,7 @@ httpx onnxruntime; sys_platform == 'darwin' onnxruntime-gpu; sys_platform != 'darwin' torchcrepe==0.0.20 -fastapi==0.88 +fastapi torchfcpe ffmpy==0.3.1 python-dotenv>=1.0.0 diff --git a/requirements.txt b/requirements.txt index f3b4b5e..4283acb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ librosa==0.9.1 llvmlite fairseq faiss-cpu -gradio==3.34.0 +gradio==4.23.0 Cython pydub>=0.25.1 soundfile>=0.12.1 @@ -41,7 +41,7 @@ httpx onnxruntime; sys_platform == 'darwin' onnxruntime-gpu; sys_platform != 'darwin' torchcrepe==0.0.20 -fastapi==0.88 +fastapi torchfcpe ffmpy==0.3.1 python-dotenv>=1.0.0