Skip to content

Commit

Permalink
Bugfix for dependencies hell with audiocraft and re-enabling it
Browse files Browse the repository at this point in the history
  • Loading branch information
@Woolverine94
Woolverine94 committed Oct 18, 2024
1 parent 6194ea7 commit 4bf784b
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 63 deletions.
21 changes: 20 additions & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
numba==0.59.1
torchmetrics==1.3.2
dora_search==0.1.12
contourpy==1.2.1
librosa==0.10.0
llvmlite==0.42.0
soxr==0.5.0.post1
tb-nightly==2.16.0a20231101
opencv-contrib-python==4.8.1.78
onnx==1.15.0
pystoi==0.4.1
jax==0.4.24
jaxlib==0.4.25
encodec==0.1.1
pyarrow==14.0.0
datasets==2.14.6
albumentations==1.3.1
xformers==0.0.22.post7
mdurl==0.1.2
huggingface-hub==0.25.2
gradio==3.50.2
transformers==4.44.2
Expand All @@ -12,7 +31,7 @@ imageio-ffmpeg
numpy==1.25.2
gfpgan
optimum
# git+https://github.com/facebookresearch/audiocraft
git+https://github.com/facebookresearch/audiocraft
git+https://github.com/ai-forever/Real-ESRGAN.git
insightface
onnxruntime
Expand Down
6 changes: 3 additions & 3 deletions ressources/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
from .faceswapper import *
from .r_esrgan import *
from .gfpgan import *
# from .musicgen import *
# from .musicgen_mel import *
from .musicgen import *
from .musicgen_mel import *
from .musicldm import *
# from .audiogen import *
from .audiogen import *
from .harmonai import *
from .bark import *
from .txt2vid_ms import *
Expand Down
115 changes: 56 additions & 59 deletions webui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7602,8 +7602,7 @@ def url_params_theme(url):
with gr.Accordion(biniou_lang_settings, open=False):
with gr.Row():
with gr.Column():
model_musicgen= gr.Dropdown(choices="", value="", label=biniou_lang_model_label, info=biniou_lang_model_info)
# model_musicgen= gr.Dropdown(choices=modellist_musicgen, value=modellist_musicgen[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
model_musicgen= gr.Dropdown(choices=modellist_musicgen, value=modellist_musicgen[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
with gr.Column():
duration_musicgen = gr.Slider(1, 160, step=1, value=5, label=biniou_lang_audio_length_label)
with gr.Column():
Expand Down Expand Up @@ -7658,27 +7657,27 @@ def url_params_theme(url):
btn_musicgen = gr.Button(f"{biniou_lang_generate} 🚀", variant="primary")
with gr.Column():
btn_musicgen_cancel = gr.Button(f"{biniou_lang_cancel} 🛑", variant="stop")
# btn_musicgen_cancel.click(fn=initiate_stop_musicgen, inputs=None, outputs=None)
btn_musicgen_cancel.click(fn=initiate_stop_musicgen, inputs=None, outputs=None)
with gr.Column():
btn_musicgen_clear_input = gr.ClearButton(components=prompt_musicgen, value=f"{biniou_lang_clear_inputs} 🧹")
with gr.Column():
btn_musicgen_clear_output = gr.ClearButton(components=out_musicgen, value=f"{biniou_lang_clear_outputs} 🧹")
# btn_musicgen.click(
# fn=music_musicgen,
# inputs=[
# prompt_musicgen,
# model_musicgen,
# duration_musicgen,
# num_batch_musicgen,
# temperature_musicgen,
# top_k_musicgen,
# top_p_musicgen,
# use_sampling_musicgen,
# cfg_coef_musicgen,
# ],
# outputs=out_musicgen,
# show_progress="full",
# )
btn_musicgen.click(
fn=music_musicgen,
inputs=[
prompt_musicgen,
model_musicgen,
duration_musicgen,
num_batch_musicgen,
temperature_musicgen,
top_k_musicgen,
top_p_musicgen,
use_sampling_musicgen,
cfg_coef_musicgen,
],
outputs=out_musicgen,
show_progress="full",
)
with gr.Accordion(biniou_lang_send_label, open=False):
with gr.Row():
with gr.Column():
Expand Down Expand Up @@ -7733,8 +7732,7 @@ def url_params_theme(url):
with gr.Accordion(biniou_lang_settings, open=False):
with gr.Row():
with gr.Column():
model_musicgen_mel= gr.Dropdown(choices="", value="", label=biniou_lang_model_label, info=biniou_lang_model_info)
# model_musicgen_mel= gr.Dropdown(choices=modellist_musicgen_mel, value=modellist_musicgen_mel[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
model_musicgen_mel= gr.Dropdown(choices=modellist_musicgen_mel, value=modellist_musicgen_mel[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
with gr.Column():
duration_musicgen_mel = gr.Slider(1, 160, step=1, value=5, label=biniou_lang_audio_length_label)
with gr.Column():
Expand Down Expand Up @@ -7795,29 +7793,29 @@ def url_params_theme(url):
btn_musicgen_mel = gr.Button(f"{biniou_lang_generate} 🚀", variant="primary")
with gr.Column():
btn_musicgen_mel_cancel = gr.Button(f"{biniou_lang_cancel} 🛑", variant="stop")
# btn_musicgen_mel_cancel.click(fn=initiate_stop_musicgen_mel, inputs=None, outputs=None)
btn_musicgen_mel_cancel.click(fn=initiate_stop_musicgen_mel, inputs=None, outputs=None)
with gr.Column():
btn_musicgen_mel_clear_input = gr.ClearButton(components=[prompt_musicgen_mel, source_audio_musicgen_mel], value=f"{biniou_lang_clear_inputs} 🧹")
with gr.Column():
btn_musicgen_mel_clear_output = gr.ClearButton(components=out_musicgen_mel, value=f"{biniou_lang_clear_outputs} 🧹")
# btn_musicgen_mel.click(
# fn=music_musicgen_mel,
# inputs=[
# prompt_musicgen_mel,
# model_musicgen_mel,
# duration_musicgen_mel,
# num_batch_musicgen_mel,
# temperature_musicgen_mel,
# top_k_musicgen_mel,
# top_p_musicgen_mel,
# use_sampling_musicgen_mel,
# cfg_coef_musicgen_mel,
# source_audio_musicgen_mel,
# source_type_musicgen_mel,
# ],
# outputs=out_musicgen_mel,
# show_progress="full",
# )
btn_musicgen_mel.click(
fn=music_musicgen_mel,
inputs=[
prompt_musicgen_mel,
model_musicgen_mel,
duration_musicgen_mel,
num_batch_musicgen_mel,
temperature_musicgen_mel,
top_k_musicgen_mel,
top_p_musicgen_mel,
use_sampling_musicgen_mel,
cfg_coef_musicgen_mel,
source_audio_musicgen_mel,
source_type_musicgen_mel,
],
outputs=out_musicgen_mel,
show_progress="full",
)
with gr.Accordion(biniou_lang_send_label, open=False):
with gr.Row():
with gr.Column():
Expand Down Expand Up @@ -8002,8 +8000,7 @@ def url_params_theme(url):
with gr.Accordion(biniou_lang_settings, open=False):
with gr.Row():
with gr.Column():
model_audiogen= gr.Dropdown(choices="", value="", label=biniou_lang_model_label, info=biniou_lang_model_info)
# model_audiogen= gr.Dropdown(choices=modellist_audiogen, value=modellist_audiogen[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
model_audiogen= gr.Dropdown(choices=modellist_audiogen, value=modellist_audiogen[0], label=biniou_lang_model_label, info=biniou_lang_model_info)
with gr.Column():
duration_audiogen = gr.Slider(1, 160, step=1, value=5, label=biniou_lang_audio_length_label)
with gr.Column():
Expand Down Expand Up @@ -8057,27 +8054,27 @@ def url_params_theme(url):
btn_audiogen = gr.Button(f"{biniou_lang_generate} 🚀", variant="primary")
with gr.Column():
btn_audiogen_cancel = gr.Button(f"{biniou_lang_cancel} 🛑", variant="stop")
# btn_audiogen_cancel.click(fn=initiate_stop_audiogen, inputs=None, outputs=None)
btn_audiogen_cancel.click(fn=initiate_stop_audiogen, inputs=None, outputs=None)
with gr.Column():
btn_audiogen_clear_input = gr.ClearButton(components=prompt_audiogen, value=f"{biniou_lang_clear_inputs} 🧹")
with gr.Column():
btn_audiogen_clear_output = gr.ClearButton(components=out_audiogen, value=f"{biniou_lang_clear_outputs} 🧹")
# btn_audiogen.click(
# fn=music_audiogen,
# inputs=[
# prompt_audiogen,
# model_audiogen,
# duration_audiogen,
# num_batch_audiogen,
# temperature_audiogen,
# top_k_audiogen,
# top_p_audiogen,
# use_sampling_audiogen,
# cfg_coef_audiogen,
# ],
# outputs=out_audiogen,
# show_progress="full",
# )
btn_audiogen.click(
fn=music_audiogen,
inputs=[
prompt_audiogen,
model_audiogen,
duration_audiogen,
num_batch_audiogen,
temperature_audiogen,
top_k_audiogen,
top_p_audiogen,
use_sampling_audiogen,
cfg_coef_audiogen,
],
outputs=out_audiogen,
show_progress="full",
)
with gr.Accordion(biniou_lang_send_label, open=False):
with gr.Row():
with gr.Column():
Expand Down

0 comments on commit 4bf784b

Please sign in to comment.