diff --git a/Docker/anaconda_install.sh b/Docker/anaconda_install.sh index f4ac6f7c..a22ae66f 100644 --- a/Docker/anaconda_install.sh +++ b/Docker/anaconda_install.sh @@ -41,4 +41,6 @@ rm anaconda.sh rm $LOG_PATH -"$HOME/anaconda3/bin/conda" clean -p +rm -rf "$HOME/anaconda3/pkgs" + +mkdir "$HOME/anaconda3/pkgs" diff --git a/Docker/setup.sh b/Docker/setup.sh index 43c81eb1..69d813b7 100644 --- a/Docker/setup.sh +++ b/Docker/setup.sh @@ -31,7 +31,7 @@ fi if [ "$USE_FUNASR" = "true" ]; then echo "Downloading funasr..." && $WGET_CMD "https://huggingface.co/XXXXRT/GPT-SoVITS-Pretrained/resolve/main/funasr.zip" && - unzip funasr.zip -d tools/asr/models/ && + unzip -q funasr.zip -d tools/asr/models/ && rm -rf funasr.zip else echo "Skipping funasr download" @@ -40,7 +40,7 @@ fi if [ "$USE_FASTERWHISPER" = "true" ]; then echo "Downloading faster-whisper..." && $WGET_CMD "https://huggingface.co/XXXXRT/GPT-SoVITS-Pretrained/resolve/main/faster-whisper.zip" && - unzip faster-whisper.zip -d tools/asr/models/ && + unzip -q faster-whisper.zip -d tools/asr/models/ && rm -rf faster-whisper.zip else echo "Skipping faster-whisper download" @@ -49,9 +49,9 @@ fi source "$HOME/anaconda3/etc/profile.d/conda.sh" if [ "$LITE" = "true" ]; then - bash install.sh --device "CU${CUDA_VERSION//./}" --source HF --skip-check "$WORKFLOW" + bash install.sh --device "CU${CUDA_VERSION//./}" --source HF elif [ "$LITE" = "false" ]; then - bash install.sh --device "CU${CUDA_VERSION//./}" --source HF --skip-check "$WORKFLOW" --download-uvr5 + bash install.sh --device "CU${CUDA_VERSION//./}" --source HF --download-uvr5 else exit 1 fi diff --git a/Dockerfile b/Dockerfile index ca9e7d8f..11e09c71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG CUDA_VERSION=12.4 ENV CUDA_VERSION=${CUDA_VERSION} -RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ +RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ apt-get install -y -qq --no-install-recommends \ build-essential \ gcc \ diff --git a/docker_build.sh b/docker_build.sh index ea817970..28e731ae 100644 --- a/docker_build.sh +++ b/docker_build.sh @@ -13,8 +13,7 @@ fi trap 'echo "Error Occured at \"$BASH_COMMAND\" with exit code $?"; exit 1' ERR -USE_FUNASR=false -USE_FASTERWHISPER=false +LITE=false CUDA_VERSION=12.4 print_help() { @@ -22,8 +21,7 @@ print_help() { echo "" echo "Options:" echo " --cuda 12.4|12.8 Specify the CUDA VERSION (REQUIRED)" - echo " --funasr Build with FunASR Paraformer Model" - echo " --faster-whisper Build with Faster-Whisper-Large-V3 Model" + echo " --lite Build a Lite Image" echo " -h, --help Show this help message and exit" echo "" echo "Examples:" @@ -55,12 +53,8 @@ while [[ $# -gt 0 ]]; do esac shift 2 ;; - --funasr) - USE_FUNASR=true - shift - ;; - --faster-whisper) - USE_FASTERWHISPER=true + --lite) + LITE=true shift ;; *) @@ -73,7 +67,6 @@ done docker build \ --build-arg CUDA_VERSION=$CUDA_VERSION \ - --build-arg USE_FUNASR=$USE_FUNASR \ - --build-arg USE_FASTERWHISPER=$USE_FASTERWHISPER \ + --build-arg LITE=$LITE \ -t "${USER}/gpt-sovits:local" \ . diff --git a/install.sh b/install.sh index 615bec47..c26abfa5 100644 --- a/install.sh +++ b/install.sh @@ -162,7 +162,7 @@ else echo "Download Pretrained Models" $WGET_CMD "$PRETRINED_URL" - unzip pretrained_models.zip + unzip -q pretrained_models.zip rm -rf pretrained_models.zip mv pretrained_models/* GPT_SoVITS/pretrained_models rm -rf pretrained_models @@ -172,7 +172,7 @@ if [ ! -d "GPT_SoVITS/text/G2PWModel" ]; then echo "Download G2PWModel" $WGET_CMD "$G2PW_URL" - unzip G2PWModel.zip + unzip -q G2PWModel.zip rm -rf G2PWModel.zip mv G2PWModel GPT_SoVITS/text/G2PWModel else @@ -186,7 +186,7 @@ if [ "$DOWNLOAD_UVR5" = "true" ]; then echo "Download UVR5 Model" $WGET_CMD "$UVR5_URL" - unzip uvr5_weights.zip + unzip -q uvr5_weights.zip rm -rf uvr5_weights.zip mv uvr5_weights/* tools/uvr5/uvr5_weights rm -rf uvr5_weights