From 14ba64c3070bf6eb1b73017d8c713a3c80b864bc Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Thu, 2 Nov 2023 23:47:44 +0100 Subject: [PATCH] conda: add conda to PATH Signed-off-by: Ettore Di Giacinto --- Dockerfile | 2 +- extra/grpc/autogptq/run.sh | 4 +++- extra/grpc/bark/run.sh | 4 ++-- extra/grpc/diffusers/run.sh | 4 +++- extra/grpc/exllama/run.sh | 4 +++- extra/grpc/huggingface/run.sh | 4 +++- extra/grpc/vall-e-x/run.sh | 3 ++- extra/grpc/vllm/run.sh | 4 +++- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae3ffc3e9e66..b03a7cfacaba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -179,7 +179,7 @@ COPY --from=builder /build/local-ai ./ COPY --from=builder /build/backend-assets/grpc/stablediffusion ./backend-assets/grpc/stablediffusion RUN if [ "${IMAGE_TYPE}" = "extras" ]; then \ - make prepare-extra-conda-environments \ + PATH=$PATH:/opt/conda/bin make prepare-extra-conda-environments \ ; fi # Copy VALLE-X as it's not a real "lib" diff --git a/extra/grpc/autogptq/run.sh b/extra/grpc/autogptq/run.sh index 22d1216c9637..fa62974989ae 100755 --- a/extra/grpc/autogptq/run.sh +++ b/extra/grpc/autogptq/run.sh @@ -1,10 +1,12 @@ ## ## A bash script wrapper that runs the autogptq server with conda +PATH=$PATH:/opt/conda/bin + # Activate conda environment source activate autogptq # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/autogptq.py \ No newline at end of file +python $DIR/autogptq.py diff --git a/extra/grpc/bark/run.sh b/extra/grpc/bark/run.sh index a21bfa738866..90633973ef23 100755 --- a/extra/grpc/bark/run.sh +++ b/extra/grpc/bark/run.sh @@ -1,10 +1,10 @@ ## ## A bash script wrapper that runs the ttsbark server with conda - +PATH=$PATH:/opt/conda/bin # Activate conda environment source activate ttsbark # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/ttsbark.py \ No newline at end of file +python $DIR/ttsbark.py diff --git a/extra/grpc/diffusers/run.sh b/extra/grpc/diffusers/run.sh index 4a47783d46ed..28bd195e86a2 100644 --- a/extra/grpc/diffusers/run.sh +++ b/extra/grpc/diffusers/run.sh @@ -1,10 +1,12 @@ ## ## A bash script wrapper that runs the diffusers server with conda +PATH=$PATH:/opt/conda/bin + # Activate conda environment source activate diffusers # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/backend_diffusers.py \ No newline at end of file +python $DIR/backend_diffusers.py diff --git a/extra/grpc/exllama/run.sh b/extra/grpc/exllama/run.sh index e91c2a3a9626..2dcf3cb4152a 100644 --- a/extra/grpc/exllama/run.sh +++ b/extra/grpc/exllama/run.sh @@ -1,10 +1,12 @@ ## ## A bash script wrapper that runs the exllama server with conda +PATH=$PATH:/opt/conda/bin + # Activate conda environment source activate exllama # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/exllama.py \ No newline at end of file +python $DIR/exllama.py diff --git a/extra/grpc/huggingface/run.sh b/extra/grpc/huggingface/run.sh index 3722a358e8a6..c498afdce269 100644 --- a/extra/grpc/huggingface/run.sh +++ b/extra/grpc/huggingface/run.sh @@ -1,10 +1,12 @@ ## ## A bash script wrapper that runs the huggingface server with conda +PATH=$PATH:/opt/conda/bin + # Activate conda environment source activate huggingface # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/huggingface.py \ No newline at end of file +python $DIR/huggingface.py diff --git a/extra/grpc/vall-e-x/run.sh b/extra/grpc/vall-e-x/run.sh index f42c79e60c37..ed629ed7853f 100644 --- a/extra/grpc/vall-e-x/run.sh +++ b/extra/grpc/vall-e-x/run.sh @@ -1,5 +1,6 @@ ## ## A bash script wrapper that runs the ttsvalle server with conda +PATH=$PATH:/opt/conda/bin # Activate conda environment source activate ttsvalle @@ -7,4 +8,4 @@ source activate ttsvalle # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/ttvalle.py \ No newline at end of file +python $DIR/ttvalle.py diff --git a/extra/grpc/vllm/run.sh b/extra/grpc/vllm/run.sh index 1369a048f7cd..a4c17ad24b0a 100644 --- a/extra/grpc/vllm/run.sh +++ b/extra/grpc/vllm/run.sh @@ -1,10 +1,12 @@ ## ## A bash script wrapper that runs the diffusers server with conda +PATH=$PATH:/opt/conda/bin + # Activate conda environment source activate vllm # get the directory where the bash script is located DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -python $DIR/backend_vllm.py \ No newline at end of file +python $DIR/backend_vllm.py