From 5e155fb081bbf41d8f0a5061201089dd5a7a9041 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 14 Feb 2024 21:44:12 +0100 Subject: [PATCH] fix(python): pin exllama2 (#1711) fix(python): pin python deps Signed-off-by: Ettore Di Giacinto --- Makefile | 2 +- backend/python/diffusers/Makefile | 7 ++++--- backend/python/diffusers/install.sh | 24 ++++++++++++++++++++++++ backend/python/exllama2/install.sh | 14 ++++++++++++-- backend/python/mamba/install.sh | 2 +- backend/python/vall-e-x/install.sh | 5 +---- 6 files changed, 43 insertions(+), 11 deletions(-) create mode 100755 backend/python/diffusers/install.sh mode change 100644 => 100755 backend/python/mamba/install.sh diff --git a/Makefile b/Makefile index 306d60c4..c63d46f8 100644 --- a/Makefile +++ b/Makefile @@ -550,4 +550,4 @@ docker-image-intel: --build-arg BASE_IMAGE=intel/oneapi-basekit:2024.0.1-devel-ubuntu22.04 \ --build-arg IMAGE_TYPE=$(IMAGE_TYPE) \ --build-arg GO_TAGS="none" \ - --build-arg BUILD_TYPE=sycl_f16 -t $(DOCKER_IMAGE) . + --build-arg BUILD_TYPE=sycl_f32 -t $(DOCKER_IMAGE) . diff --git a/backend/python/diffusers/Makefile b/backend/python/diffusers/Makefile index f3f9d4e2..4ec03c71 100644 --- a/backend/python/diffusers/Makefile +++ b/backend/python/diffusers/Makefile @@ -1,8 +1,9 @@ +CONDA_ENV_PATH = "diffusers.yml" + .PHONY: diffusers diffusers: - @echo "Creating virtual environment..." - @conda env create --name diffusers --file diffusers.yml - @echo "Virtual environment created." + @echo "Installing $(CONDA_ENV_PATH)..." + bash install.sh $(CONDA_ENV_PATH) .PHONY: run run: diff --git a/backend/python/diffusers/install.sh b/backend/python/diffusers/install.sh new file mode 100755 index 00000000..0429826e --- /dev/null +++ b/backend/python/diffusers/install.sh @@ -0,0 +1,24 @@ +#!/bin/bash +set -ex + +# Check if environment exist +conda_env_exists(){ + ! conda list --name "${@}" >/dev/null 2>/dev/null +} + +if conda_env_exists "diffusers" ; then + echo "Creating virtual environment..." + conda env create --name diffusers --file $1 + echo "Virtual environment created." +else + echo "Virtual environment already exists." +fi + +if [ "$PIP_CACHE_PURGE" = true ] ; then + export PATH=$PATH:/opt/conda/bin + + # Activate conda environment + source activate diffusers + + pip cache purge +fi \ No newline at end of file diff --git a/backend/python/exllama2/install.sh b/backend/python/exllama2/install.sh index 44d45364..a6df3d37 100755 --- a/backend/python/exllama2/install.sh +++ b/backend/python/exllama2/install.sh @@ -1,15 +1,25 @@ #!/bin/bash - +set -e ## ## A bash script installs the required dependencies of VALL-E-X and prepares the environment export PATH=$PATH:/opt/conda/bin +export SHA=c0ddebaaaf8ffd1b3529c2bb654e650bce2f790f # Activate conda environment source activate transformers echo $CONDA_PREFIX -git clone https://github.com/turboderp/exllamav2 $CONDA_PREFIX/exllamav2 && pushd $CONDA_PREFIX/exllamav2 && pip install -r requirements.txt && popd +git clone https://github.com/turboderp/exllamav2 $CONDA_PREFIX/exllamav2 + +pushd $CONDA_PREFIX/exllamav2 + +git checkout -b build $SHA + +# TODO: this needs to be pinned within the conda environments +pip install -r requirements.txt + +popd cp -rfv $CONDA_PREFIX/exllamav2/* ./ diff --git a/backend/python/mamba/install.sh b/backend/python/mamba/install.sh old mode 100644 new mode 100755 index b69e22e7..e56b83c2 --- a/backend/python/mamba/install.sh +++ b/backend/python/mamba/install.sh @@ -1,5 +1,5 @@ #!/bin/bash - +set -e ## ## A bash script installs the required dependencies of VALL-E-X and prepares the environment export PATH=$PATH:/opt/conda/bin diff --git a/backend/python/vall-e-x/install.sh b/backend/python/vall-e-x/install.sh index 653eab7f..26ccdccd 100644 --- a/backend/python/vall-e-x/install.sh +++ b/backend/python/vall-e-x/install.sh @@ -10,10 +10,7 @@ source activate transformers echo $CONDA_PREFIX -git clone https://github.com/Plachtaa/VALL-E-X.git $CONDA_PREFIX/vall-e-x && pushd $CONDA_PREFIX/vall-e-x && git checkout -b build $SHA && pip install -r requirements.txt && popd - -# Pin some dependencies (the upstream requirements is too much loose) -pip install torchaudio==2.2.0 +git clone https://github.com/Plachtaa/VALL-E-X.git $CONDA_PREFIX/vall-e-x && pushd $CONDA_PREFIX/vall-e-x && git checkout -b build $SHA && popd cp -rfv $CONDA_PREFIX/vall-e-x/* ./