From 132270151807ee4e22feecf0eb60f99b95c9e1fd Mon Sep 17 00:00:00 2001 From: "chen, suyue" Date: Thu, 12 Sep 2024 22:01:38 +0800 Subject: [PATCH] update torch cpu installation (#681) Signed-off-by: chensuyue Signed-off-by: Tiep Le --- .github/workflows/docker/compose/dataprep-compose-cd.yaml | 6 +++--- .github/workflows/docker/compose/dataprep-compose.yaml | 4 ++-- .github/workflows/docker/compose/embeddings-compose-cd.yaml | 2 +- .github/workflows/docker/compose/embeddings-compose.yaml | 4 ++-- .github/workflows/docker/compose/llms-compose-cd.yaml | 4 ++-- comps/llms/summarization/tgi/langchain/Dockerfile | 3 +++ comps/reranks/mosec/langchain/dependency/Dockerfile | 2 +- comps/retrievers/pgvector/langchain/Dockerfile | 3 +++ comps/vectorstores/pathway/Dockerfile | 4 +++- comps/vectorstores/pathway/requirements.txt | 2 +- 10 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker/compose/dataprep-compose-cd.yaml b/.github/workflows/docker/compose/dataprep-compose-cd.yaml index 7bf008732..fb08b51fa 100644 --- a/.github/workflows/docker/compose/dataprep-compose-cd.yaml +++ b/.github/workflows/docker/compose/dataprep-compose-cd.yaml @@ -19,11 +19,11 @@ services: build: dockerfile: comps/dataprep/pinecone/langchain/Dockerfile image: ${REGISTRY:-opea}/dataprep-pinecone:${TAG:-latest} - dataprep-redis: #need to rename + dataprep-multimodal-redis: build: dockerfile: comps/dataprep/multimodal/redis/langchain/Dockerfile - image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest} - dataprep-vdmsxx: #need to rename + image: ${REGISTRY:-opea}/dataprep-multimodal-redis:${TAG:-latest} + dataprep-vdms: build: dockerfile: comps/dataprep/vdms/langchain/Dockerfile image: ${REGISTRY:-opea}/dataprep-vdms:${TAG:-latest} diff --git a/.github/workflows/docker/compose/dataprep-compose.yaml b/.github/workflows/docker/compose/dataprep-compose.yaml index bb5f08218..3c0346103 100644 --- a/.github/workflows/docker/compose/dataprep-compose.yaml +++ b/.github/workflows/docker/compose/dataprep-compose.yaml @@ -17,7 +17,7 @@ services: build: dockerfile: comps/dataprep/redis/langchain_ray/Dockerfile image: ${REGISTRY:-opea}/dataprep-on-ray-redis:${TAG:-latest} - dataprep-vdms: + dataprep-multimodal-vdms: build: dockerfile: comps/dataprep/vdms/multimodal_langchain/Dockerfile - image: ${REGISTRY:-opea}/dataprep-vdms:${TAG:-latest} + image: ${REGISTRY:-opea}/dataprep-multimodal-vdms:${TAG:-latest} diff --git a/.github/workflows/docker/compose/embeddings-compose-cd.yaml b/.github/workflows/docker/compose/embeddings-compose-cd.yaml index 422038466..2d897459b 100644 --- a/.github/workflows/docker/compose/embeddings-compose-cd.yaml +++ b/.github/workflows/docker/compose/embeddings-compose-cd.yaml @@ -22,7 +22,7 @@ services: build: dockerfile: comps/embeddings/multimodal/bridgetower/Dockerfile.intel_hpu image: ${REGISTRY:-opea}/bridgetower-embedder-gaudi:${TAG:-latest} - embedding-multimodalxx: #need to rename + embedding-multimodal: build: dockerfile: comps/embeddings/multimodal/multimodal_langchain/Dockerfile image: ${REGISTRY:-opea}/embedding-multimodal:${TAG:-latest} diff --git a/.github/workflows/docker/compose/embeddings-compose.yaml b/.github/workflows/docker/compose/embeddings-compose.yaml index a97c8460f..5f701b4c6 100644 --- a/.github/workflows/docker/compose/embeddings-compose.yaml +++ b/.github/workflows/docker/compose/embeddings-compose.yaml @@ -8,7 +8,7 @@ services: build: dockerfile: comps/embeddings/tei/langchain/Dockerfile image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest} - embedding-multimodal: + embedding-multimodal-clip: build: dockerfile: comps/embeddings/multimodal_clip/Dockerfile - image: ${REGISTRY:-opea}/embedding-multimodal:${TAG:-latest} + image: ${REGISTRY:-opea}/embedding-multimodal-clip:${TAG:-latest} diff --git a/.github/workflows/docker/compose/llms-compose-cd.yaml b/.github/workflows/docker/compose/llms-compose-cd.yaml index aa34c2d77..cbf463bd1 100644 --- a/.github/workflows/docker/compose/llms-compose-cd.yaml +++ b/.github/workflows/docker/compose/llms-compose-cd.yaml @@ -11,10 +11,10 @@ services: context: vllm-openvino dockerfile: Dockerfile.openvino image: ${REGISTRY:-opea}/vllm-openvino:${TAG:-latest} - llm-nativexx: #need to rename + llm-eval: build: dockerfile: comps/llms/utils/lm-eval/Dockerfile - image: ${REGISTRY:-opea}/llm-native:${TAG:-latest} + image: ${REGISTRY:-opea}/llm-eval:${TAG:-latest} llm-vllm-llamaindex: build: dockerfile: comps/llms/text-generation/vllm/llama_index/Dockerfile diff --git a/comps/llms/summarization/tgi/langchain/Dockerfile b/comps/llms/summarization/tgi/langchain/Dockerfile index 0fbc4e5ad..9691a5784 100644 --- a/comps/llms/summarization/tgi/langchain/Dockerfile +++ b/comps/llms/summarization/tgi/langchain/Dockerfile @@ -3,6 +3,8 @@ FROM python:3.11-slim +ARG ARCH="cpu" + RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \ libgl1-mesa-glx \ libjemalloc-dev @@ -16,6 +18,7 @@ USER user COPY comps /home/user/comps RUN pip install --no-cache-dir --upgrade pip && \ + if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/llms/summarization/tgi/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/reranks/mosec/langchain/dependency/Dockerfile b/comps/reranks/mosec/langchain/dependency/Dockerfile index 25dbeafec..dd54c1ff6 100644 --- a/comps/reranks/mosec/langchain/dependency/Dockerfile +++ b/comps/reranks/mosec/langchain/dependency/Dockerfile @@ -15,7 +15,7 @@ RUN apt update && apt install -y python3 python3-pip RUN pip3 install torch==2.2.2 torchvision --trusted-host download.pytorch.org --index-url https://download.pytorch.org/whl/cpu RUN pip3 install intel-extension-for-pytorch==2.2.0 -RUN pip3 install transformers sentence-transformers +RUN pip3 install transformers sentence-transformers==3.0.1 RUN pip3 install llmspec mosec RUN cd /home/user/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-reranker-base --local-dir /home/user/bge-reranker-large diff --git a/comps/retrievers/pgvector/langchain/Dockerfile b/comps/retrievers/pgvector/langchain/Dockerfile index b752aaaf8..484db5af7 100644 --- a/comps/retrievers/pgvector/langchain/Dockerfile +++ b/comps/retrievers/pgvector/langchain/Dockerfile @@ -3,6 +3,8 @@ FROM python:3.11-slim +ARG ARCH="cpu" + RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \ libgl1-mesa-glx \ libjemalloc-dev @@ -16,6 +18,7 @@ COPY comps /home/user/comps USER user RUN pip install --no-cache-dir --upgrade pip && \ + if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ pip install --no-cache-dir -r /home/user/comps/retrievers/pgvector/langchain/requirements.txt ENV PYTHONPATH=$PYTHONPATH:/home/user diff --git a/comps/vectorstores/pathway/Dockerfile b/comps/vectorstores/pathway/Dockerfile index 31cd06a82..3b775e31e 100644 --- a/comps/vectorstores/pathway/Dockerfile +++ b/comps/vectorstores/pathway/Dockerfile @@ -5,6 +5,7 @@ FROM pathwaycom/pathway:0.13.2-slim ENV DOCKER_BUILDKIT=1 ENV PYTHONUNBUFFERED=1 +ARG ARCH="cpu" RUN apt-get update && apt-get install -y \ poppler-utils \ @@ -16,7 +17,8 @@ WORKDIR /app COPY requirements.txt /app/ -RUN pip install --no-cache-dir -r requirements.txt +RUN if [ ${ARCH} = "cpu" ]; then pip install --no-cache-dir torch torchvision --index-url https://download.pytorch.org/whl/cpu; fi && \ + pip install --no-cache-dir -r requirements.txt COPY vectorstore_pathway.py /app/ diff --git a/comps/vectorstores/pathway/requirements.txt b/comps/vectorstores/pathway/requirements.txt index 3d88eddf6..df17635f4 100644 --- a/comps/vectorstores/pathway/requirements.txt +++ b/comps/vectorstores/pathway/requirements.txt @@ -1,4 +1,4 @@ langchain_openai pathway[xpack-llm] >= 0.14.1 -sentence_transformers +sentence-transformers unstructured[all-docs] >= 0.10.28,<0.15