diff --git a/crates/service/job/download_job/config/download-job.development.env b/crates/service/job/download_job/config/download-job.development.env index 8481311b80..50f6064bf5 100644 --- a/crates/service/job/download_job/config/download-job.development.env +++ b/crates/service/job/download_job/config/download-job.development.env @@ -9,9 +9,15 @@ BUCKET_TIMEOUT_SECONDS=1200 WEB_DOWNLOADER_COMMAND=./download_internet_file.py WEB_DOWNLOADER_MAYBE_VENV_SCRIPT=./python/bin/activate +WEB_DOWNLOADER_MAYBE_DOCKER_IMAGE=4258e0b8bb0f #WEB_DOWNLOADER_MAYBE_DOCKER_IMAGE=d73f28ce3ff6 #WEB_DOWNLOADER_MAYBE_DOCKER_IMAGE=3fcadd002b0a -WEB_DOWNLOADER_MAYBE_DOCKER_IMAGE=4258e0b8bb0f + +# ================================= # +# # +# RVC (v2) # +# # +# ================================= # RVC_V2_MODEL_CHECK_ROOT_DIRECTORY="/home/bt/dev/storyteller/storyteller-ml/voice_conversion/rvc-v2-brandon" RVC_V2_MODEL_CHECK_COMMAND="python fakeyou_infer.py" @@ -21,37 +27,79 @@ RVC_V2_MODEL_CHECK_MAYBE_DEFAULT_TEST_WAV_PATH="/home/bt/dev/storyteller/storyte #RVC_V2_MODEL_CHECK_MAYBE_DOCKER_IMAGE="8acacf30bb2e" #RVC_V2_MODEL_CHECK_MAYBE_DEFAULT_CONFIG_PATH="/models/voice_conversion/so-vits-svc/example_config.json" +# ================================= # +# # +# SOFTVC # +# # +# ================================= # + SOFTVC_MODEL_CHECK_ROOT_DIRECTORY=/ SOFTVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" SOFTVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE=a79106991ce3 +# ================================= # +# # +# SO-VITS-SVC # +# # +# ================================= # + SO_VITS_SVC_MODEL_CHECK_ROOT_DIRECTORY="/models/voice_conversion/so-vits-svc" SO_VITS_SVC_MODEL_CHECK_COMMAND="python3 -m so_vits_svc_fork.fakeyou_infer" -#SO_VITS_SVC_MODEL_CHECK_COMMAND="/common/so-vits-svc-code/install/python/bin/python3.10 -m so_vits_svc_fork.fakeyou_infer" -#SO_VITS_SVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" SO_VITS_SVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE="8acacf30bb2e" SO_VITS_SVC_MODEL_CHECK_MAYBE_DEFAULT_CONFIG_PATH="/models/voice_conversion/so-vits-svc/example_config.json" SO_VITS_SVC_MODEL_CHECK_MAYBE_DEFAULT_TEST_WAV_PATH="/models/voice_conversion/so-vits-svc/example.wav" +#SO_VITS_SVC_MODEL_CHECK_COMMAND="/common/so-vits-svc-code/install/python/bin/python3.10 -m so_vits_svc_fork.fakeyou_infer" +#SO_VITS_SVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" + +# ================================= # +# # +# TACOTRON2 # +# # +# ================================= # TACOTRON_MODEL_CHECK_ROOT_DIRECTORY=/models/tts TACOTRON_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" TACOTRON_MODEL_CHECK_COMMAND=./vocodes_model_check_tacotron.py TACOTRON_MODEL_CHECK_MAYBE_DOCKER_IMAGE=5642d0fd7fc1 +# ================================= # +# # +# HIFIGAN (SOFTVC) # +# # +# ================================= # + HIFIGAN_SOFTVC_MODEL_CHECK_ROOT_DIRECTORY=/ HIFIGAN_SOFTVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" HIFIGAN_SOFTVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE=a79106991ce3 +# ================================= # +# # +# HIFIGAN # +# # +# ================================= # + HIFIGAN_MODEL_CHECK_ROOT_DIRECTORY=/models/tts HIFIGAN_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" HIFIGAN_MODEL_CHECK_COMMAND=./vocodes_model_check_hifigan.py HIFIGAN_MODEL_CHECK_MAYBE_DOCKER_IMAGE=5642d0fd7fc1 +# ================================= # +# # +# VITS # +# # +# ================================= # + VITS_MODEL_CHECK_ROOT_DIRECTORY="/vits" VITS_MODEL_CHECK_COMMAND="export_ts.py" -#VITS_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" VITS_MODEL_CHECK_MAYBE_PYTHON_INTERPRETER="python3" VITS_MODEL_CHECK_MAYBE_DOCKER_IMAGE="1e2357c3c154" +#VITS_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" + +# ================================= # +# # +# CACHE SETTINGS # +# # +# ================================= # # Huggingface caches data at ~/.cache/huggingface (/root/cache/huggingface), # which isn't the shared volume and will get blown away. diff --git a/crates/service/job/inference_job/config/inference-job.development.env b/crates/service/job/inference_job/config/inference-job.development.env index 920681c216..1c039ab567 100644 --- a/crates/service/job/inference_job/config/inference-job.development.env +++ b/crates/service/job/inference_job/config/inference-job.development.env @@ -6,6 +6,16 @@ BUCKET_TIMEOUT_SECONDS=6000 # NB: Disable if not testing Redis REDIS_FOR_KEEPALIVE_URL="redis://localhost/0" +# ================================= # +# # +# RVC (v2) # +# # +# ================================= # + +RVC_V2_INFERENCE_ROOT_DIRECTORY="/home/bt/dev/storyteller/storyteller-ml/voice_conversion/rvc-v2-brandon" +RVC_V2_INFERENCE_COMMAND="python fakeyou_infer.py" +RVC_V2_INFERENCE_MAYBE_VENV_COMMAND="source python/bin/activate" + # ================================= # # # # SO-VITS-SVC # @@ -15,24 +25,10 @@ REDIS_FOR_KEEPALIVE_URL="redis://localhost/0" # Cache hubert in a recoverable place so do don't constantly re-download it. HUBERT_PATH="/tmp/hubert/checkpoint_best_legacy_500.pt" -#SO_VITS_SVC_INFERENCE_ROOT_DIRECTORY="/models/voice_conversion/so-vits-svc/src" #NB: so-vits-svc-paul-1 SO_VITS_SVC_INFERENCE_ROOT_DIRECTORY="/models/voice_conversion/so-vits-svc/src" #NB: so-vits-svc-paul-2 - -#SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="abd0ded43f90" # so-vits-svc-paul-1: Working as of 2023-04-28 -#SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="27e296e2332c" # so-vits-svc-paul-1: Adds env var for hubert -#SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="bc3f736b2db1" # so-vits-svc-paul-1: Faster inference? -#SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="8f63994cf262" # so-vits-svc-paul-1: Comprehensive logging -#SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="5c49f6535da2" # so-vits-svc-paul-2 SO_VITS_SVC_INFERENCE_MAYBE_DOCKER_IMAGE="247952d65c82" # so-vits-svc-paul-2: --f0-method - -#SO_VITS_SVC_INFERENCE_COMMAND='/common/so-vits-svc-code/install/python/bin/python3.10 -m so_vits_svc_fork.fakeyou_infer' -#SO_VITS_SVC_INFERENCE_COMMAND="python3 -m so_vits_svc_fork.fakeyou_infer" -#SO_VITS_SVC_INFERENCE_COMMAND="/install/python/bin/python3.10 -m so_vits_svc_fork.fakeyou_infer" # NB: so-vits-svc-paul-1 SO_VITS_SVC_INFERENCE_COMMAND="/install/python/bin/python3.10 fakeyou_infer.py" # NB: so-vits-svc-paul-2 - -#SO_VITS_SVC_INFERENCE_MAYBE_DEFAULT_CONFIG_PATH='/common/so-vits-svc-code/models/voice_conversion/so-vits-svc/example_config.json' SO_VITS_SVC_INFERENCE_MAYBE_DEFAULT_CONFIG_PATH="/models/voice_conversion/so-vits-svc/example_config.json" - #SO_VITS_SVC_INFERENCE_MAYBE_VENV_COMMAND="source python/bin/activate" # ================================= # @@ -72,4 +68,3 @@ HF_DATASETS_CACHE="/tmp/huggingface" # nltk also caches data. NLTK_DATA="/tmp/nltk_data" -