From 833c14fd854f22aeb9bc4a9458e6f981cb14ef7f Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 22 Nov 2024 00:11:03 +0700 Subject: [PATCH 01/10] ChatQnA - add files for deploy ChatQnA applications on AMD GPU with vLLM service: 1. ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm.yaml 2. ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm.sh 3. ChatQnA/docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm 4. ChatQnA/docker_compose/amd/gpu/rocm-vllm/REAMDE.md. 5. ChatQnA/tests/test_compose_on_rocm_vllm.sh Fix build.yaml and playwright.config.ts Signed-off-by: Chingis Yundunov --- .../amd/gpu/rocm-vllm/Dockerfile-vllm | 18 + .../amd/gpu/rocm-vllm/README.md | 439 ++++++++++++++++++ .../amd/gpu/rocm-vllm/compose_vllm.yaml | 187 ++++++++ .../amd/gpu/rocm-vllm/set_env_vllm.sh | 39 ++ ChatQnA/docker_image_build/build.yaml | 6 + ChatQnA/tests/test_compose_on_rocm_vllm.sh | 265 +++++++++++ ChatQnA/ui/svelte/playwright.config.ts | 2 +- 7 files changed, 955 insertions(+), 1 deletion(-) create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm.yaml create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm.sh create mode 100644 ChatQnA/tests/test_compose_on_rocm_vllm.sh diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm new file mode 100644 index 0000000000..0b547db9d8 --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm @@ -0,0 +1,18 @@ +FROM rocm/vllm:rocm6.2_mi300_ubuntu20.04_py3.9_vllm_0.6.4 + +# Set the working directory +WORKDIR /workspace + +# Copy the api_server.py into the image +ADD https://raw.githubusercontent.com/ROCm/vllm/a466f09d7f20ca073f21e3f64b8c9487e4c4ff4b/vllm/entrypoints/sync_openai/api_server.py /workspace/api_server.py + +# Expose the port used by the API server +EXPOSE 8011 + +# Set environment variables +ENV HUGGINGFACE_HUB_CACHE=/workspace +ENV WILM_USE_TRITON_FLASH_ATTENTION=0 +ENV PYTORCH_JIT=0 + +# Set the entrypoint to the api_server.py script +ENTRYPOINT ["python3", "/workspace/api_server.py"] diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md new file mode 100644 index 0000000000..66d0c9b01b --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md @@ -0,0 +1,439 @@ +# Build and deploy CodeGen Application on AMD GPU (ROCm) + +## Build MegaService of ChatQnA on AMD ROCm GPU + +This document outlines the deployment process for a ChatQnA application utilizing the [GenAIComps](https://github.com/opea-project/GenAIComps.git) microservice pipeline on AMD ROCm GPU platform. The steps include Docker image creation, container deployment via Docker Compose, and service execution to integrate microservices such as embedding, retriever, rerank, and llm. We will publish the Docker images to Docker Hub, it will simplify the deployment process for this service. + +Quick Start Deployment Steps: + +1. Set up the environment variables. +2. Run Docker Compose. +3. Consume the ChatQnA Service. + +## Quick Start: 1.Setup Environment Variable + +To set up environment variables for deploying ChatQnA services, follow these steps: + +1. Set the required environment variables: + + ```bash + # Example: host_ip="192.168.1.1" + export HOST_IP=${host_ip} + # Example: no_proxy="localhost, 127.0.0.1, 192.168.1.1" + export CHATQNA_HUGGINGFACEHUB_API_TOKEN=${your_hf_api_token} + ``` + +2. If you are in a proxy environment, also set the proxy-related environment variables: + + ```bash + export http_proxy="Your_HTTP_Proxy" + export https_proxy="Your_HTTPs_Proxy" + ``` + +3. Set up other environment variables: + + ```bash + source ./set_env.sh + ``` + +## Quick Start: 2.Run Docker Compose + +```bash +docker compose up -d +``` + +It will automatically download the docker image on `docker hub`: + +```bash +docker pull opea/chatqna:latest +docker pull opea/chatqna-ui:latest +``` + +In following cases, you could build docker image from source by yourself. + +- Failed to download the docker image. + +- If you want to use a specific version of Docker image. + +Please refer to 'Build Docker Images' in below. + +## QuickStart: 3.Consume the ChatQnA Service + +Prepare and upload test document + +``` +# download pdf file +wget https://raw.githubusercontent.com/opea-project/GenAIComps/main/comps/retrievers/redis/data/nke-10k-2023.pdf +# upload pdf file with dataprep +curl -X POST "http://${host_ip}:6007/v1/dataprep" \ + -H "Content-Type: multipart/form-data" \ + -F "files=@./nke-10k-2023.pdf" +``` + +Get MegaSerice(backend) response: + +```bash +curl http://${host_ip}:8888/v1/chatqna \ + -H "Content-Type: application/json" \ + -d '{ + "messages": "What is the revenue of Nike in 2023?" + }' +``` + +## 🚀 Build Docker Images + +First of all, you need to build Docker Images locally. This step can be ignored after the Docker images published to Docker hub. + +### 1. Source Code install GenAIComps + +```bash +git clone https://github.com/opea-project/GenAIComps.git +cd GenAIComps +``` + +### 2. Build Retriever Image + +```bash +docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/redis/langchain/Dockerfile . +``` + +### 3. Build Dataprep Image + +```bash +docker build --no-cache -t opea/dataprep-redis:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/redis/langchain/Dockerfile . +``` + +### 4. Build MegaService Docker Image + +To construct the Mega Service, we utilize the [GenAIComps](https://github.com/opea-project/GenAIComps.git) microservice pipeline within the `chatqna.py` Python script. Build the MegaService Docker image using the command below: + +```bash +git clone https://github.com/opea-project/GenAIExamples.git +cd GenAIExamples/ChatQnA/docker +docker build --no-cache -t opea/chatqna:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile . +cd ../../.. +``` + +### 5. Build UI Docker Image + +Construct the frontend Docker image using the command below: + +```bash +cd GenAIExamples/ChatQnA/ui +docker build --no-cache -t opea/chatqna-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile . +cd ../../../.. +``` + +### 6. Build React UI Docker Image (Optional) + +Construct the frontend Docker image using the command below: + +```bash +cd GenAIExamples/ChatQnA/ui +docker build --no-cache -t opea/chatqna-react-ui:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker/Dockerfile.react . +cd ../../../.. +``` + +### 7. Build Nginx Docker Image + +```bash +cd GenAIComps +docker build -t opea/nginx:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/nginx/Dockerfile . +``` + +### 8. Build vLLM-ROCm Docker Image + +```bash +cd GenAIExamples/ChatQnA +docker build -t opea/llm-vllm-rocm:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm . +``` + +Then run the command `docker images`, you will have the following 5 Docker Images: + +1. `opea/retriever-redis:latest` +2. `opea/dataprep-redis:latest` +3. `opea/chatqna:latest` +4. `opea/chatqna-ui:latest` or `opea/chatqna-react-ui:latest` +5. `opea/nginx:latest` + +## 🚀 Start MicroServices and MegaService + +### Required Models + +By default, the embedding, reranking and LLM models are set to a default value as listed below: + +| Service | Model | +| --------- | ------------------------- | +| Embedding | BAAI/bge-base-en-v1.5 | +| Reranking | BAAI/bge-reranker-base | +| LLM | Intel/neural-chat-7b-v3-3 | + +Change the `xxx_MODEL_ID` below for your needs. + +### Setup Environment Variables + +1. Set the required environment variables: + + ```bash + # Example: host_ip="192.168.1.1" + export host_ip="External_Public_IP" + # Example: no_proxy="localhost, 127.0.0.1, 192.168.1.1" + export no_proxy="Your_No_Proxy" + export CHATQNA_HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token" + # Example: NGINX_PORT=80 + export HOST_IP=${host_ip} + export NGINX_PORT=${your_nginx_port} + export CHATQNA_TGI_SERVICE_IMAGE="ghcr.io/huggingface/text-generation-inference:2.3.1-rocm" + export CHATQNA_EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" + export CHATQNA_RERANK_MODEL_ID="BAAI/bge-reranker-base" + export CHATQNA_LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" + export CHATQNA_TGI_SERVICE_PORT=8008 + export CHATQNA_TEI_EMBEDDING_PORT=8090 + export CHATQNA_TEI_EMBEDDING_ENDPOINT="http://${HOST_IP}:${CHATQNA_TEI_EMBEDDING_PORT}" + export CHATQNA_TEI_RERANKING_PORT=8808 + export CHATQNA_REDIS_VECTOR_PORT=16379 + export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 + export CHATQNA_REDIS_DATAPREP_PORT=6007 + export CHATQNA_REDIS_RETRIEVER_PORT=7000 + export CHATQNA_INDEX_NAME="rag-redis" + export CHATQNA_MEGA_SERVICE_HOST_IP=${HOST_IP} + export CHATQNA_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} + export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://127.0.0.1:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" + export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" + export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" + export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" + export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} + export CHATQNA_FRONTEND_SERVICE_PORT=5173 + export CHATQNA_BACKEND_SERVICE_NAME=chatqna + export CHATQNA_BACKEND_SERVICE_IP=${HOST_IP} + export CHATQNA_BACKEND_SERVICE_PORT=8888 + export CHATQNA_REDIS_URL="redis://${HOST_IP}:${CHATQNA_REDIS_VECTOR_PORT}" + export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} + export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} + export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} + export CHATQNA_NGINX_PORT=5176 + ``` + +2. If you are in a proxy environment, also set the proxy-related environment variables: + + ```bash + export http_proxy="Your_HTTP_Proxy" + export https_proxy="Your_HTTPs_Proxy" + ``` + +3. Note: In order to limit access to a subset of GPUs, please pass each device individually using one or more -device /dev/dri/rendered, where is the card index, starting from 128. (https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/docker.html#docker-restrict-gpus) into tgi-service in compose.yaml file + +Example for set isolation for 1 GPU + +``` + - /dev/dri/card0:/dev/dri/card0 + - /dev/dri/renderD128:/dev/dri/renderD128 +``` + +Example for set isolation for 2 GPUs + +``` + - /dev/dri/card0:/dev/dri/card0 + - /dev/dri/renderD128:/dev/dri/renderD128 + - /dev/dri/card1:/dev/dri/card1 + - /dev/dri/renderD129:/dev/dri/renderD129 +``` + +Please find more information about accessing and restricting AMD GPUs in the link (https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/docker.html#docker-restrict-gpus) + +4. Set up other environment variables: + + ```bash + source ./set_env.sh + ``` + +### Start all the services Docker Containers + +```bash +cd GenAIExamples/ChatQnA/docker_compose/amd/gpu/rocm +docker compose up -d +``` + +### Validate MicroServices and MegaService + +1. TEI Embedding Service + + ```bash + curl ${host_ip}:8090/embed \ + -X POST \ + -d '{"inputs":"What is Deep Learning?"}' \ + -H 'Content-Type: application/json' + ``` + +2. Retriever Microservice + + To consume the retriever microservice, you need to generate a mock embedding vector by Python script. The length of embedding vector + is determined by the embedding model. + Here we use the model `EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5"`, which vector size is 768. + + Check the vecotor dimension of your embedding model, set `your_embedding` dimension equals to it. + + ```bash + export your_embedding=$(python3 -c "import random; embedding = [random.uniform(-1, 1) for _ in range(768)]; print(embedding)") + curl http://${host_ip}:7000/v1/retrieval \ + -X POST \ + -d "{\"text\":\"test\",\"embedding\":${your_embedding}}" \ + -H 'Content-Type: application/json' + ``` + +3. TEI Reranking Service + + ```bash + curl http://${host_ip}:8808/rerank \ + -X POST \ + -d '{"query":"What is Deep Learning?", "texts": ["Deep Learning is not...", "Deep learning is..."]}' \ + -H 'Content-Type: application/json' + ``` + +4. vLLM Service + + In first startup, this service will take more time to download the model files. After it's finished, the service will be ready. + + Try the command below to check whether the vLLM service is ready. + + ```bash + docker logs ${CONTAINER_ID} | grep "Application startup complete" + ``` + + If the service is ready, you will get the response like below. + + ``` + 2024-09-03T02:47:53.402023Z INFO text_generation_router::server: router/src/server.rs:2311: Connected + ``` + + Then try the `cURL` command below to validate TGI. + + ```bash + curl http://${host_ip}:8008/generate \ + -X POST \ + -d '{"inputs":"What is Deep Learning?","parameters":{"max_new_tokens":64, "do_sample": true}}' \ + -H 'Content-Type: application/json' + ``` + +5. MegaService + + ```bash + curl http://${host_ip}:8888/v1/chatqna -H "Content-Type: application/json" -d '{ + "messages": "What is the revenue of Nike in 2023?" + }' + ``` + +6. Nginx Service + + ```bash + curl http://${host_ip}:${NGINX_PORT}/v1/chatqna \ + -H "Content-Type: application/json" \ + -d '{"messages": "What is the revenue of Nike in 2023?"}' + ``` + +7. Dataprep Microservice（Optional） + +If you want to update the default knowledge base, you can use the following commands: + +Update Knowledge Base via Local File Upload: + +```bash +curl -X POST "http://${host_ip}:6007/v1/dataprep" \ + -H "Content-Type: multipart/form-data" \ + -F "files=@./nke-10k-2023.pdf" +``` + +This command updates a knowledge base by uploading a local file for processing. Update the file path according to your environment. + +Add Knowledge Base via HTTP Links: + +```bash +curl -X POST "http://${host_ip}:6007/v1/dataprep" \ + -H "Content-Type: multipart/form-data" \ + -F 'link_list=["https://opea.dev"]' +``` + +This command updates a knowledge base by submitting a list of HTTP links for processing. + +Also, you are able to get the file list that you uploaded: + +```bash +curl -X POST "http://${host_ip}:6007/v1/dataprep/get_file" \ + -H "Content-Type: application/json" +``` + +To delete the file/link you uploaded: + +```bash +# delete link +curl -X POST "http://${host_ip}:6007/v1/dataprep/delete_file" \ + -d '{"file_path": "https://opea.dev"}' \ + -H "Content-Type: application/json" + +# delete file +curl -X POST "http://${host_ip}:6007/v1/dataprep/delete_file" \ + -d '{"file_path": "nke-10k-2023.pdf"}' \ + -H "Content-Type: application/json" + +# delete all uploaded files and links +curl -X POST "http://${host_ip}:6007/v1/dataprep/delete_file" \ + -d '{"file_path": "all"}' \ + -H "Content-Type: application/json" +``` + +## 🚀 Launch the UI + +### Launch with origin port + +To access the frontend, open the following URL in your browser: http://{host_ip}:5173. By default, the UI runs on port 5173 internally. If you prefer to use a different host port to access the frontend, you can modify the port mapping in the `compose.yaml` file as shown below: + +```yaml + chaqna-ui-server: + image: opea/chatqna-ui:latest + ... + ports: + - "80:5173" +``` + +### Launch with Nginx + +If you want to launch the UI using Nginx, open this URL: `http://${host_ip}:${NGINX_PORT}` in your browser to access the frontend. + +## 🚀 Launch the Conversational UI (Optional) + +To access the Conversational UI (react based) frontend, modify the UI service in the `compose.yaml` file. Replace `chaqna-ui-server` service with the `chatqna-react-ui-server` service as per the config below: + +```yaml +chatqna-react-ui-server: + image: opea/chatqna-react-ui:latest + container_name: chatqna-react-ui-server + environment: + - APP_BACKEND_SERVICE_ENDPOINT=${BACKEND_SERVICE_ENDPOINT} + - APP_DATA_PREP_SERVICE_URL=${DATAPREP_SERVICE_ENDPOINT} + ports: + - "5174:80" + depends_on: + - chaqna-backend-server + ipc: host + restart: always +``` + +Once the services are up, open the following URL in your browser: http://{host_ip}:5174. By default, the UI runs on port 80 internally. If you prefer to use a different host port to access the frontend, you can modify the port mapping in the `compose.yaml` file as shown below: + +```yaml + chaqna-react-ui-server: + image: opea/chatqna-react-ui:latest + ... + ports: + - "80:80" +``` + +![project-screenshot](../../../../assets/img/chat_ui_init.png) + +Here is an example of running ChatQnA: + +![project-screenshot](../../../../assets/img/chat_ui_response.png) + +Here is an example of running ChatQnA with Conversational UI (React): + +![project-screenshot](../../../../assets/img/conversation_ui_response.png) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm.yaml b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm.yaml new file mode 100644 index 0000000000..b4135b4d4a --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm.yaml @@ -0,0 +1,187 @@ +# Copyright (C) 2024 Advanced Micro Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +services: + chatqna-redis-vector-db: + image: redis/redis-stack:7.2.0-v9 + container_name: chatqna-redis-vector-db + ports: + - "${CHATQNA_REDIS_VECTOR_PORT:-6379}:6379" + - "${CHATQNA_REDIS_VECTOR_INSIGHT_PORT:-8001}:8001" + chatqna-dataprep-redis-service: + image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest} + container_name: chatqna-dataprep-redis-service + depends_on: + - chatqna-redis-vector-db + - chatqna-tei-embedding-service + ports: + - "${CHATQNA_REDIS_DATAPREP_PORT}:6007" + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + REDIS_URL: ${CHATQNA_REDIS_URL} + INDEX_NAME: ${CHATQNA_INDEX_NAME} + TEI_ENDPOINT: ${CHATQNA_TEI_EMBEDDING_ENDPOINT} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + chatqna-tei-embedding-service: + image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 + container_name: chatqna-tei-embedding-service + ports: + - "${CHATQNA_TEI_EMBEDDING_PORT}:80" + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 1g + ipc: host + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + command: --model-id ${CHATQNA_EMBEDDING_MODEL_ID} --auto-truncate + devices: + - /dev/kfd:/dev/kfd + - /dev/dri/card1:/dev/dri/card1 + - /dev/dri/renderD136:/dev/dri/renderD136 + cap_add: + - SYS_PTRACE + group_add: + - video + security_opt: + - seccomp:unconfined + chatqna-retriever: + image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} + container_name: chatqna-retriever + depends_on: + - chatqna-redis-vector-db + ports: + - "${CHATQNA_REDIS_RETRIEVER_PORT}:7000" + ipc: host + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + REDIS_URL: ${CHATQNA_REDIS_URL} + INDEX_NAME: ${CHATQNA_INDEX_NAME} + TEI_EMBEDDING_ENDPOINT: ${CHATQNA_TEI_EMBEDDING_ENDPOINT} + restart: unless-stopped + chatqna-tei-reranking-service: + image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 + container_name: chatqna-tei-reranking-service + ports: + - "${CHATQNA_TEI_RERANKING_PORT}:80" + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 1g + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_HUB_DISABLE_PROGRESS_BARS: 1 + HF_HUB_ENABLE_HF_TRANSFER: 0 + devices: + - /dev/kfd:/dev/kfd + - /dev/dri/:/dev/dri/ + cap_add: + - SYS_PTRACE + group_add: + - video + security_opt: + - seccomp:unconfined + command: --model-id ${CHATQNA_RERANK_MODEL_ID} --auto-truncate + chatqna-vllm-service: + image: ${REGISTRY:-opea}/llm-vllm-rocm:${TAG:-latest} + container_name: chatqna-vllm-service + ports: + - "${CHATQNA_VLLM_SERVICE_PORT:-8081}:8011" + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_HUB_DISABLE_PROGRESS_BARS: 1 + HF_HUB_ENABLE_HF_TRANSFER: 0 + WILM_USE_TRITON_FLASH_ATTENTION: 0 + PYTORCH_JIT: 0 + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 128G + devices: + - /dev/kfd:/dev/kfd + - /dev/dri/:/dev/dri/ + cap_add: + - SYS_PTRACE + group_add: + - video + security_opt: + - seccomp:unconfined + - apparmor=unconfined + command: "--model ${CHATQNA_LLM_MODEL_ID} --swap-space 16 --disable-log-requests --dtype float16 --tensor-parallel-size 4 --host 0.0.0.0 --port 8011 --num-scheduler-steps 1 --distributed-executor-backend \"mp\"" + ipc: host + chatqna-backend-server: + image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} + container_name: chatqna-backend-server + depends_on: + - chatqna-redis-vector-db + - chatqna-tei-embedding-service + - chatqna-retriever + - chatqna-tei-reranking-service + - chatqna-vllm-service + ports: + - "${CHATQNA_BACKEND_SERVICE_PORT}:8888" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + MEGA_SERVICE_HOST_IP: ${CHATQNA_MEGA_SERVICE_HOST_IP} + EMBEDDING_SERVER_HOST_IP: ${HOST_IP} + EMBEDDING_SERVER_PORT: ${CHATQNA_TEI_EMBEDDING_PORT:-80} + RETRIEVER_SERVICE_HOST_IP: ${HOST_IP} + RERANK_SERVER_HOST_IP: ${HOST_IP} + RERANK_SERVER_PORT: ${CHATQNA_TEI_RERANKING_PORT:-80} + LLM_SERVER_HOST_IP: ${HOST_IP} + LLM_SERVER_PORT: ${CHATQNA_VLLM_SERVICE_PORT:-80} + LLM_MODEL: ${CHATQNA_LLM_MODEL_ID} + ipc: host + restart: always + chatqna-ui-server: + image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest} + container_name: chatqna-ui-server + depends_on: + - chatqna-backend-server + ports: + - "${CHATQNA_FRONTEND_SERVICE_PORT}:5173" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + CHAT_BASE_URL: ${CHATQNA_BACKEND_SERVICE_ENDPOINT} + UPLOAD_FILE_BASE_URL: ${CHATQNA_DATAPREP_SERVICE_ENDPOINT} + GET_FILE: ${CHATQNA_DATAPREP_GET_FILE_ENDPOINT} + DELETE_FILE: ${CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT} + ipc: host + restart: always + chatqna-nginx-server: + image: ${REGISTRY:-opea}/nginx:${TAG:-latest} + container_name: chatqna-nginx-server + depends_on: + - chatqna-backend-server + - chatqna-ui-server + ports: + - "${CHATQNA_NGINX_PORT}:80" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + FRONTEND_SERVICE_IP: ${CHATQNA_FRONTEND_SERVICE_IP} + FRONTEND_SERVICE_PORT: ${CHATQNA_FRONTEND_SERVICE_PORT} + BACKEND_SERVICE_NAME: ${CHATQNA_BACKEND_SERVICE_NAME} + BACKEND_SERVICE_IP: ${CHATQNA_BACKEND_SERVICE_IP} + BACKEND_SERVICE_PORT: ${CHATQNA_BACKEND_SERVICE_PORT} + ipc: host + restart: always + +networks: + default: + driver: bridge diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm.sh new file mode 100644 index 0000000000..da052334bb --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +# SPDX-License-Identifier: Apache-2.0 + +export HOST_IP='192.165.1.21' +export HOST_IP_EXTERNAL='direct-supercomputer1.powerml.co' +export CHATQNA_HUGGINGFACEHUB_API_TOKEN="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" +export CHATQNA_EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" +export CHATQNA_RERANK_MODEL_ID="BAAI/bge-reranker-base" +export CHATQNA_LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct" +export MODEL=${CHATQNA_LLM_MODEL_ID} +export CHATQNA_VLLM_SERVICE_PORT=18008 +export CHATQNA_TEI_EMBEDDING_PORT=18090 +export CHATQNA_TEI_EMBEDDING_ENDPOINT="http://${HOST_IP}:${CHATQNA_TEI_EMBEDDING_PORT}" +export CHATQNA_TEI_RERANKING_PORT=18808 +export CHATQNA_REDIS_VECTOR_PORT=16379 +export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 +export CHATQNA_REDIS_DATAPREP_PORT=18103 +export CHATQNA_REDIS_RETRIEVER_PORT=7000 +export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} +export CHATQNA_FRONTEND_SERVICE_PORT=18101 +export CHATQNA_BACKEND_SERVICE_NAME=chatqna +export CHATQNA_BACKEND_SERVICE_IP=${HOST_IP_EXTERNAL} +export CHATQNA_BACKEND_SERVICE_PORT=18102 +export CHATQNA_INDEX_NAME="rag-redis" +export CHATQNA_MEGA_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" +export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" +export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" +export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" +export CHATQNA_REDIS_URL="redis://${HOST_IP}:${CHATQNA_REDIS_VECTOR_PORT}" +export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_NGINX_PORT=18104 diff --git a/ChatQnA/docker_image_build/build.yaml b/ChatQnA/docker_image_build/build.yaml index a8fa36bc3b..1b3a7826d4 100644 --- a/ChatQnA/docker_image_build/build.yaml +++ b/ChatQnA/docker_image_build/build.yaml @@ -89,6 +89,12 @@ services: dockerfile: comps/llms/text-generation/vllm/langchain/Dockerfile extends: chatqna image: ${REGISTRY:-opea}/llm-vllm:${TAG:-latest} + llm-vllm-rocm: + build: + context: ../ + dockerfile: ./docker_compose/amd/gpu/rocm-vllm/Dockerfile-vllm + extends: chatqna + image: ${REGISTRY:-opea}/llm-vllm-rocm:${TAG:-latest} dataprep-redis: build: context: GenAIComps diff --git a/ChatQnA/tests/test_compose_on_rocm_vllm.sh b/ChatQnA/tests/test_compose_on_rocm_vllm.sh new file mode 100644 index 0000000000..7b328d0c18 --- /dev/null +++ b/ChatQnA/tests/test_compose_on_rocm_vllm.sh @@ -0,0 +1,265 @@ +#!/bin/bash +# Copyright (C) 2024 Advanced Micro Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +set -xe +IMAGE_REPO=${IMAGE_REPO:-"opea"} +IMAGE_TAG=${IMAGE_TAG:-"latest"} +echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" +echo "TAG=IMAGE_TAG=${IMAGE_TAG}" +export REGISTRY=${IMAGE_REPO} +export TAG=${IMAGE_TAG} + +WORKPATH=$(dirname "$PWD") +LOG_PATH="$WORKPATH/tests" +ip_address=$(hostname -I | awk '{print $1}') + +export HOST_IP=${ip_address} +export HOST_IP_EXTERNAL=${ip_address} +export CHATQNA_EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" +export CHATQNA_RERANK_MODEL_ID="BAAI/bge-reranker-base" +export CHATQNA_LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct" +export CHATQNA_VLLM_SERVICE_PORT=9009 +export CHATQNA_TEI_EMBEDDING_PORT=8090 +export CHATQNA_TEI_EMBEDDING_ENDPOINT="http://${HOST_IP}:${CHATQNA_TEI_EMBEDDING_PORT}" +export CHATQNA_TEI_RERANKING_PORT=8808 +export CHATQNA_REDIS_VECTOR_PORT=6379 +export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 +export CHATQNA_REDIS_DATAPREP_PORT=6007 +export CHATQNA_REDIS_RETRIEVER_PORT=7000 +export CHATQNA_INDEX_NAME="rag-redis" +export CHATQNA_MEGA_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} +export CHATQNA_FRONTEND_SERVICE_PORT=5173 +export CHATQNA_BACKEND_SERVICE_NAME=chatqna +export CHATQNA_BACKEND_SERVICE_IP=${HOST_IP} +export CHATQNA_BACKEND_SERVICE_PORT=8888 +export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" +export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" +export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" +export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" +export CHATQNA_REDIS_URL="redis://${HOST_IP}:${CHATQNA_REDIS_VECTOR_PORT}" +export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_NGINX_PORT=8081 +export CHATQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} +export PATH="/home/huggingface/miniconda3/bin:$PATH" + +function build_docker_images() { + cd "$WORKPATH"/docker_image_build + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ + + echo "Build all the images with --no-cache, check docker_image_build.log for details..." + service_list="llm-vllm-rocm chatqna chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis nginx" + docker compose -f build.yaml build ${service_list} --no-cache > "${LOG_PATH}"/docker_image_build.log + +# docker pull vllm-api-server +# docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 + + docker images && sleep 1s +} + +function start_services() { + cd "$WORKPATH"/docker_compose/amd/gpu/rocm-vllm + + # Start Docker Containers + docker compose -f compose_vllm.yaml up -d > "${LOG_PATH}"/start_services_with_compose.log + + n=0 + until [[ "$n" -ge 500 ]]; do + docker logs chatqna-vllm-service >& "${LOG_PATH}"/chatqna-vllm-service_start.log + if grep -q "Application startup complete" "${LOG_PATH}"/chatqna-vllm-service_start.log; then + break + fi + sleep 20s + n=$((n+1)) + done +} + +function validate_service() { + local URL="$1" + local EXPECTED_RESULT="$2" + local SERVICE_NAME="$3" + local DOCKER_NAME="$4" + local INPUT_DATA="$5" + + if [[ $SERVICE_NAME == *"dataprep_upload_file"* ]]; then + cd "$LOG_PATH" + HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST -F 'files=@./dataprep_file.txt' -H 'Content-Type: multipart/form-data' "$URL") + elif [[ $SERVICE_NAME == *"dataprep_upload_link"* ]]; then + HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST -F 'link_list=["https://www.ces.tech/"]' "$URL") + elif [[ $SERVICE_NAME == *"dataprep_get"* ]]; then + HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST -H 'Content-Type: application/json' "$URL") + elif [[ $SERVICE_NAME == *"dataprep_del"* ]]; then + HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST -d '{"file_path": "all"}' -H 'Content-Type: application/json' "$URL") + else + HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST -d "$INPUT_DATA" -H 'Content-Type: application/json' "$URL") + fi + HTTP_STATUS=$(echo "$HTTP_RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://') + RESPONSE_BODY=$(echo "$HTTP_RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g') + + docker logs "${DOCKER_NAME}" >> "${LOG_PATH}"/"${SERVICE_NAME}".log + + # check response status + if [ "$HTTP_STATUS" -ne "200" ]; then + echo "[ $SERVICE_NAME ] HTTP status is not 200. Received status was $HTTP_STATUS" + exit 1 + else + echo "[ $SERVICE_NAME ] HTTP status is 200. Checking content..." + fi + # check response body + if [[ "$RESPONSE_BODY" != *"$EXPECTED_RESULT"* ]]; then + echo "[ $SERVICE_NAME ] Content does not match the expected result: $RESPONSE_BODY" + exit 1 + else + echo "[ $SERVICE_NAME ] Content is as expected." + fi + + sleep 1s +} + +function validate_microservices() { + # Check if the microservices are running correctly. + + # tei for embedding service + validate_service \ + "${ip_address}:8090/embed" \ + "[[" \ + "chatqna-tei-embedding-service" \ + "chatqna-tei-embedding-service" \ + '{"inputs":"What is Deep Learning?"}' + + sleep 1m # retrieval can't curl as expected, try to wait for more time + + # test /v1/dataprep upload file + echo "Deep learning is a subset of machine learning that utilizes neural networks with multiple layers to analyze various levels of abstract data representations. It enables computers to identify patterns and make decisions with minimal human intervention by learning from large amounts of data." > "$LOG_PATH"/dataprep_file.txt + validate_service \ + "http://${ip_address}:6007/v1/dataprep" \ + "Data preparation succeeded" \ + "dataprep_upload_file" \ + "chatqna-dataprep-redis-service" + + # test /v1/dataprep upload link + validate_service \ + "http://${ip_address}:6007/v1/dataprep" \ + "Data preparation succeeded" \ + "dataprep_upload_link" \ + "chatqna-dataprep-redis-service" + + # test /v1/dataprep/get_file + validate_service \ + "http://${ip_address}:6007/v1/dataprep/get_file" \ + '{"name":' \ + "dataprep_get" \ + "chatqna-dataprep-redis-service" + + # test /v1/dataprep/delete_file + validate_service \ + "http://${ip_address}:6007/v1/dataprep/delete_file" \ + '{"status":true}' \ + "dataprep_del" \ + "chatqna-dataprep-redis-service" + + # retrieval microservice + test_embedding=$(python3 -c "import random; embedding = [random.uniform(-1, 1) for _ in range(768)]; print(embedding)") + validate_service \ + "${ip_address}:7000/v1/retrieval" \ + "retrieved_docs" \ + "chatqna-retriever" \ + "chatqna-retriever" \ + "{\"text\":\"What is the revenue of Nike in 2023?\",\"embedding\":${test_embedding}}" + + # tei for rerank microservice + validate_service \ + "${ip_address}:8808/rerank" \ + '{"index":1,"score":' \ + "chatqna-tei-reranking-service" \ + "chatqna-tei-reranking-service" \ + '{"query":"What is Deep Learning?", "texts": ["Deep Learning is not...", "Deep learning is..."]}' + + # tgi for llm service + validate_service \ + "${ip_address}:9009/v1/chat/completions" \ + "\"content\":\"" \ + "chatqna-vllm-service" \ + "chatqna-vllm-service" \ + '{"model": "meta-llama/Meta-Llama-3-8B-Instruct", "messages": [{"role": "user", "content": "What is Deep Learning?"}]}' + +} + +function validate_megaservice() { + # Curl the Mega Service + validate_service \ + "${ip_address}:8888/v1/chatqna" \ + "data: " \ + "chatqna-backend-server" \ + "chatqna-backend-server" \ + '{"messages": "What is the revenue of Nike in 2023?"}' + +} + +function validate_frontend() { + echo "[ TEST INFO ]: --------- frontend test started ---------" + cd "$WORKPATH"/ui/svelte + local conda_env_name="OPEA_e2e" + export PATH=${HOME}/miniforge3/bin/:$PATH + if conda info --envs | grep -q "$conda_env_name"; then + echo "$conda_env_name exist!" + else + conda create -n ${conda_env_name} python=3.12 -y + fi + source activate ${conda_env_name} + echo "[ TEST INFO ]: --------- conda env activated ---------" + + sed -i "s/localhost/$ip_address/g" playwright.config.ts + + conda install -c conda-forge nodejs=22.6.0 -y + npm install && npm ci && npx playwright install --with-deps + node -v && npm -v && pip list + + exit_status=0 + npx playwright test || exit_status=$? + + if [ $exit_status -ne 0 ]; then + echo "[TEST INFO]: ---------frontend test failed---------" + exit $exit_status + else + echo "[TEST INFO]: ---------frontend test passed---------" + fi +} + +function stop_docker() { + cd "$WORKPATH"/docker_compose/amd/gpu/rocm-vllm + docker compose -f compose_vllm.yaml stop && docker compose -f compose_vllm.yaml rm -f +} + +function main() { + + stop_docker + if [[ "$IMAGE_REPO" == "opea" ]]; then build_docker_images; fi + start_time=$(date +%s) + start_services + end_time=$(date +%s) + duration=$((end_time-start_time)) + echo "Mega service start duration is $duration s" && sleep 1s + + + if [ "${mode}" == "perf" ]; then + python3 "$WORKPATH"/tests/chatqna_benchmark.py + elif [ "${mode}" == "" ]; then + validate_microservices + echo "==== microservices validated ====" + validate_megaservice + echo "==== megaservice validated ====" + validate_frontend + echo "==== frontend validated ====" + fi + + stop_docker + echo y | docker system prune + +} + +main diff --git a/ChatQnA/ui/svelte/playwright.config.ts b/ChatQnA/ui/svelte/playwright.config.ts index 937f88bf7b..bbeb13bcf0 100644 --- a/ChatQnA/ui/svelte/playwright.config.ts +++ b/ChatQnA/ui/svelte/playwright.config.ts @@ -38,7 +38,7 @@ export default defineConfig({ /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */ actionTimeout: 0, /* Base URL to use in actions like `await page.goto('/')`. */ - baseURL: "http://localhost:80", + baseURL: "http://localhost:5173", /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ trace: "on-first-retry", From 6b54854f816cf3fcc66e03a6917157a9b5b9ea77 Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 22 Nov 2024 00:25:54 +0700 Subject: [PATCH 02/10] ChatQnA - fix README.md for deploy on AMD GPU with vLLM service Signed-off-by: Chingis Yundunov --- .../amd/gpu/rocm-vllm/README.md | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md index 66d0c9b01b..cbdb8d695c 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md @@ -182,36 +182,35 @@ Change the `xxx_MODEL_ID` below for your needs. export CHATQNA_HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token" # Example: NGINX_PORT=80 export HOST_IP=${host_ip} - export NGINX_PORT=${your_nginx_port} - export CHATQNA_TGI_SERVICE_IMAGE="ghcr.io/huggingface/text-generation-inference:2.3.1-rocm" export CHATQNA_EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" export CHATQNA_RERANK_MODEL_ID="BAAI/bge-reranker-base" - export CHATQNA_LLM_MODEL_ID="Intel/neural-chat-7b-v3-3" - export CHATQNA_TGI_SERVICE_PORT=8008 + export CHATQNA_LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct" + export CHATQNA_VLLM_SERVICE_PORT=9009 export CHATQNA_TEI_EMBEDDING_PORT=8090 export CHATQNA_TEI_EMBEDDING_ENDPOINT="http://${HOST_IP}:${CHATQNA_TEI_EMBEDDING_PORT}" export CHATQNA_TEI_RERANKING_PORT=8808 - export CHATQNA_REDIS_VECTOR_PORT=16379 + export CHATQNA_REDIS_VECTOR_PORT=6379 export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 export CHATQNA_REDIS_DATAPREP_PORT=6007 export CHATQNA_REDIS_RETRIEVER_PORT=7000 export CHATQNA_INDEX_NAME="rag-redis" export CHATQNA_MEGA_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} - export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://127.0.0.1:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" - export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" - export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" - export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://127.0.0.1:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} export CHATQNA_FRONTEND_SERVICE_PORT=5173 export CHATQNA_BACKEND_SERVICE_NAME=chatqna export CHATQNA_BACKEND_SERVICE_IP=${HOST_IP} export CHATQNA_BACKEND_SERVICE_PORT=8888 + export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" + export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" + export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" + export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" export CHATQNA_REDIS_URL="redis://${HOST_IP}:${CHATQNA_REDIS_VECTOR_PORT}" export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} - export CHATQNA_NGINX_PORT=5176 + export CHATQNA_NGINX_PORT=8081 + export CHATQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} ``` 2. If you are in a proxy environment, also set the proxy-related environment variables: @@ -298,12 +297,16 @@ docker compose up -d ```bash docker logs ${CONTAINER_ID} | grep "Application startup complete" + + curl http://${host_ip}:9009/v1/chat/completions \ + -H "Content-Type: application/json" \ + -d '{"model": "meta-llama/Meta-Llama-3-8B-Instruct", "messages": [{"role": "user", "content": "What is Deep Learning?"}]}' ``` If the service is ready, you will get the response like below. ``` - 2024-09-03T02:47:53.402023Z INFO text_generation_router::server: router/src/server.rs:2311: Connected + INFO: Application startup complete. ``` Then try the `cURL` command below to validate TGI. From 263417108b489fa05a2185e686e6c77705be3cd0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:29:04 +0000 Subject: [PATCH 03/10] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md index cbdb8d695c..97f51528d4 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/README.md @@ -297,7 +297,7 @@ docker compose up -d ```bash docker logs ${CONTAINER_ID} | grep "Application startup complete" - + curl http://${host_ip}:9009/v1/chat/completions \ -H "Content-Type: application/json" \ -d '{"model": "meta-llama/Meta-Llama-3-8B-Instruct", "messages": [{"role": "user", "content": "What is Deep Learning?"}]}' From 58f3fa3a6c4acb9999d92047729e14c403ad12cd Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 18:25:31 +0700 Subject: [PATCH 04/10] ProductivitySuite - fix Docker compose file, set envs script for deploy app on AMD GPU Signed-off-by: Chingis Yundunov --- .../amd/gpu/rocm-vllm/compose_vllm_dev.yaml | 168 ++++++++++++++++++ .../amd/gpu/rocm-vllm/set_env_vllm_dev.sh | 39 ++++ 2 files changed, 207 insertions(+) create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml create mode 100644 ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml new file mode 100644 index 0000000000..135357ac93 --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml @@ -0,0 +1,168 @@ +# Copyright (C) 2024 Advanced Micro Devices, Inc. +# SPDX-License-Identifier: Apache-2.0 + +services: + chatqna-redis-vector-db-dev: + image: redis/redis-stack:7.2.0-v9 + container_name: chatqna-redis-vector-db-dev + ports: + - "${CHATQNA_REDIS_VECTOR_PORT:-6379}:6379" + - "${CHATQNA_REDIS_VECTOR_INSIGHT_PORT:-8001}:8001" + chatqna-dataprep-redis-service-dev: + image: ${REGISTRY:-opea}/dataprep-redis:${TAG:-latest} + container_name: chatqna-dataprep-redis-service-dev + depends_on: + - chatqna-redis-vector-db-dev + - chatqna-tei-embedding-service-dev + ports: + - "${CHATQNA_REDIS_DATAPREP_PORT}:6007" + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + REDIS_URL: ${CHATQNA_REDIS_URL} + INDEX_NAME: ${CHATQNA_INDEX_NAME} + TEI_ENDPOINT: ${CHATQNA_TEI_EMBEDDING_ENDPOINT} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + chatqna-tei-embedding-service-dev: + image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 + container_name: chatqna-tei-embedding-service-dev + ports: + - "${CHATQNA_TEI_EMBEDDING_PORT}:80" + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 1g + ipc: host + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + command: --model-id ${CHATQNA_EMBEDDING_MODEL_ID} --auto-truncate + chatqna-retriever-dev: + image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} + container_name: chatqna-retriever-dev + depends_on: + - chatqna-redis-vector-db + ports: + - "${CHATQNA_REDIS_RETRIEVER_PORT}:7000" + ipc: host + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + REDIS_URL: ${CHATQNA_REDIS_URL} + INDEX_NAME: ${CHATQNA_INDEX_NAME} + TEI_EMBEDDING_ENDPOINT: ${CHATQNA_TEI_EMBEDDING_ENDPOINT} + restart: unless-stopped + chatqna-tei-reranking-service-dev: + image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 + container_name: chatqna-tei-reranking-service-dev + ports: + - "${CHATQNA_TEI_RERANKING_PORT}:80" + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 1g + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_HUB_DISABLE_PROGRESS_BARS: 1 + HF_HUB_ENABLE_HF_TRANSFER: 0 + command: --model-id ${CHATQNA_RERANK_MODEL_ID} --auto-truncate + chatqna-vllm-service-dev: + image: ${REGISTRY:-opea}/llm-vllm-rocm:${TAG:-latest} + container_name: chatqna-vllm-service-dev + ports: + - "${CHATQNA_VLLM_SERVICE_PORT:-8081}:8011" + environment: + no_proxy: ${no_proxy} + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + HUGGINGFACEHUB_API_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_TOKEN: ${CHATQNA_HUGGINGFACEHUB_API_TOKEN} + HF_HUB_DISABLE_PROGRESS_BARS: 1 + HF_HUB_ENABLE_HF_TRANSFER: 0 + WILM_USE_TRITON_FLASH_ATTENTION: 0 + PYTORCH_JIT: 0 + volumes: + - "/var/opea/chatqna-service/data:/data" + shm_size: 128G + devices: + - /dev/kfd:/dev/kfd + - /dev/dri/:/dev/dri/ + cap_add: + - SYS_PTRACE + group_add: + - video + security_opt: + - seccomp:unconfined + - apparmor=unconfined + command: "--model ${CHATQNA_LLM_MODEL_ID} --swap-space 16 --disable-log-requests --dtype float16 --tensor-parallel-size 4 --host 0.0.0.0 --port 8011 --num-scheduler-steps 1 --distributed-executor-backend \"mp\"" + ipc: host + chatqna-backend-server-dev: + image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} + container_name: chatqna-backend-server-dev + depends_on: + - chatqna-redis-vector-db + - chatqna-tei-embedding-service + - chatqna-retriever + - chatqna-tei-reranking-service + - chatqna-vllm-service + ports: + - "${CHATQNA_BACKEND_SERVICE_PORT}:8888" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + MEGA_SERVICE_HOST_IP: ${CHATQNA_MEGA_SERVICE_HOST_IP} + EMBEDDING_SERVER_HOST_IP: ${HOST_IP} + EMBEDDING_SERVER_PORT: ${CHATQNA_TEI_EMBEDDING_PORT:-80} + RETRIEVER_SERVICE_HOST_IP: ${HOST_IP} + RERANK_SERVER_HOST_IP: ${HOST_IP} + RERANK_SERVER_PORT: ${CHATQNA_TEI_RERANKING_PORT:-80} + LLM_SERVER_HOST_IP: ${HOST_IP} + LLM_SERVER_PORT: ${CHATQNA_VLLM_SERVICE_PORT:-80} + LLM_MODEL: ${CHATQNA_LLM_MODEL_ID} + ipc: host + restart: always + chatqna-ui-server-dev: + image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest} + container_name: chatqna-ui-server-dev + depends_on: + - chatqna-backend-server + ports: + - "${CHATQNA_FRONTEND_SERVICE_PORT}:5173" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + CHAT_BASE_URL: ${CHATQNA_BACKEND_SERVICE_ENDPOINT} + UPLOAD_FILE_BASE_URL: ${CHATQNA_DATAPREP_SERVICE_ENDPOINT} + GET_FILE: ${CHATQNA_DATAPREP_GET_FILE_ENDPOINT} + DELETE_FILE: ${CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT} + ipc: host + restart: always + chatqna-nginx-server-dev: + image: ${REGISTRY:-opea}/nginx:${TAG:-latest} + container_name: chatqna-nginx-server-dev + depends_on: + - chatqna-backend-server + - chatqna-ui-server + ports: + - "${CHATQNA_NGINX_PORT}:80" + environment: + no_proxy: ${no_proxy} + https_proxy: ${https_proxy} + http_proxy: ${http_proxy} + FRONTEND_SERVICE_IP: ${CHATQNA_FRONTEND_SERVICE_IP} + FRONTEND_SERVICE_PORT: ${CHATQNA_FRONTEND_SERVICE_PORT} + BACKEND_SERVICE_NAME: ${CHATQNA_BACKEND_SERVICE_NAME} + BACKEND_SERVICE_IP: ${CHATQNA_BACKEND_SERVICE_IP} + BACKEND_SERVICE_PORT: ${CHATQNA_BACKEND_SERVICE_PORT} + ipc: host + restart: always + +networks: + default: + driver: bridge diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh new file mode 100644 index 0000000000..6f4c802624 --- /dev/null +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +# SPDX-License-Identifier: Apache-2.0 + +export HOST_IP='192.165.1.21' +export HOST_IP_EXTERNAL='direct-supercomputer1.powerml.co' +export CHATQNA_HUGGINGFACEHUB_API_TOKEN="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" +export CHATQNA_EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5" +export CHATQNA_RERANK_MODEL_ID="BAAI/bge-reranker-base" +export CHATQNA_LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct" +export MODEL=${CHATQNA_LLM_MODEL_ID} +export CHATQNA_VLLM_SERVICE_PORT=18008 +export CHATQNA_TEI_EMBEDDING_PORT=18090 +export CHATQNA_TEI_EMBEDDING_ENDPOINT="http://${HOST_IP}:${CHATQNA_TEI_EMBEDDING_PORT}" +export CHATQNA_TEI_RERANKING_PORT=18808 +export CHATQNA_REDIS_VECTOR_PORT=16379 +export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 +export CHATQNA_REDIS_DATAPREP_PORT=18103 +export CHATQNA_REDIS_RETRIEVER_PORT=17000 +export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} +export CHATQNA_FRONTEND_SERVICE_PORT=18101 +export CHATQNA_BACKEND_SERVICE_NAME=chatqna +export CHATQNA_BACKEND_SERVICE_IP=${HOST_IP_EXTERNAL} +export CHATQNA_BACKEND_SERVICE_PORT=18102 +export CHATQNA_INDEX_NAME="rag-redis" +export CHATQNA_MEGA_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_BACKEND_SERVICE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_BACKEND_SERVICE_PORT}/v1/chatqna" +export CHATQNA_DATAPREP_SERVICE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep" +export CHATQNA_DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/get_file" +export CHATQNA_DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP_EXTERNAL}:${CHATQNA_REDIS_DATAPREP_PORT}/v1/dataprep/delete_file" +export CHATQNA_REDIS_URL="redis://${HOST_IP}:${CHATQNA_REDIS_VECTOR_PORT}" +export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} +export CHATQNA_NGINX_PORT=18104 From c185a8d0d5c42aee3255944d237d0a67cb3b260e Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 18:30:09 +0700 Subject: [PATCH 05/10] ProductivitySuite - fix Docker compose file, set envs script for deploy app on AMD GPU Signed-off-by: Chingis Yundunov --- .../amd/gpu/rocm-vllm/compose_vllm_dev.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml index 135357ac93..f270719e47 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml @@ -42,7 +42,7 @@ services: image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} container_name: chatqna-retriever-dev depends_on: - - chatqna-redis-vector-db + - chatqna-redis-vector-db-dev ports: - "${CHATQNA_REDIS_RETRIEVER_PORT}:7000" ipc: host @@ -104,11 +104,11 @@ services: image: ${REGISTRY:-opea}/chatqna:${TAG:-latest} container_name: chatqna-backend-server-dev depends_on: - - chatqna-redis-vector-db - - chatqna-tei-embedding-service - - chatqna-retriever - - chatqna-tei-reranking-service - - chatqna-vllm-service + - chatqna-redis-vector-db-dev + - chatqna-tei-embedding-service-dev + - chatqna-retriever-dev + - chatqna-tei-reranking-service-dev + - chatqna-vllm-service-dev ports: - "${CHATQNA_BACKEND_SERVICE_PORT}:8888" environment: @@ -130,7 +130,7 @@ services: image: ${REGISTRY:-opea}/chatqna-ui:${TAG:-latest} container_name: chatqna-ui-server-dev depends_on: - - chatqna-backend-server + - chatqna-backend-server-dev ports: - "${CHATQNA_FRONTEND_SERVICE_PORT}:5173" environment: @@ -147,8 +147,8 @@ services: image: ${REGISTRY:-opea}/nginx:${TAG:-latest} container_name: chatqna-nginx-server-dev depends_on: - - chatqna-backend-server - - chatqna-ui-server + - chatqna-backend-server-dev + - chatqna-ui-server-dev ports: - "${CHATQNA_NGINX_PORT}:80" environment: From 5b4a3c668888b16a3c2d0bd3e26811c20e27dc09 Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 18:45:29 +0700 Subject: [PATCH 06/10] ChatQnA - add files deploy for benchmark Signed-off-by: Chingis Yundunov --- ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh index 6f4c802624..da052334bb 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh @@ -19,7 +19,7 @@ export CHATQNA_TEI_RERANKING_PORT=18808 export CHATQNA_REDIS_VECTOR_PORT=16379 export CHATQNA_REDIS_VECTOR_INSIGHT_PORT=8001 export CHATQNA_REDIS_DATAPREP_PORT=18103 -export CHATQNA_REDIS_RETRIEVER_PORT=17000 +export CHATQNA_REDIS_RETRIEVER_PORT=7000 export CHATQNA_FRONTEND_SERVICE_IP=${HOST_IP} export CHATQNA_FRONTEND_SERVICE_PORT=18101 export CHATQNA_BACKEND_SERVICE_NAME=chatqna From 5c5eacd71287b299d08b340214d86fe39ce38ac8 Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 19:00:08 +0700 Subject: [PATCH 07/10] ChatQnA - add files deploy for benchmark Signed-off-by: Chingis Yundunov --- .../docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml | 5 +++-- ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml index f270719e47..f90c44d5a0 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml @@ -89,8 +89,9 @@ services: - "/var/opea/chatqna-service/data:/data" shm_size: 128G devices: - - /dev/kfd:/dev/kfd - - /dev/dri/:/dev/dri/ + - "/dev/kfd:/dev/kfd" + - "/dev/dri/${AMD_GPU_CARD_ID}:/dev/dri/${AMD_GPU_CARD_ID}" + - "/dev/dri/${AMD_GPU_RENDER_ID}:/dev/dri/${AMD_GPU_RENDER_ID}" cap_add: - SYS_PTRACE group_add: diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh index da052334bb..763554bce6 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh @@ -37,3 +37,5 @@ export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_NGINX_PORT=18104 +export AMD_GPU_CARD_ID=card33 +export AMD_GPU_RENDER_ID=renderD160 From ac1765b7b5f488161d7e8935fe73bf71f73520e1 Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 23:55:27 +0700 Subject: [PATCH 08/10] ChatQnA - add files deploy for benchmark Signed-off-by: Chingis Yundunov --- ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh index 763554bce6..a7f0146162 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh @@ -37,5 +37,5 @@ export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_NGINX_PORT=18104 -export AMD_GPU_CARD_ID=card33 -export AMD_GPU_RENDER_ID=renderD160 +export AMD_GPU_CARD_ID=card63 +export AMD_GPU_RENDER_ID=renderD190 From 021f2c28c4f6c70c8bc6bc1e0f037dd8ac70f23f Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 23:59:25 +0700 Subject: [PATCH 09/10] ChatQnA - add files deploy for benchmark Signed-off-by: Chingis Yundunov --- .../amd/gpu/rocm-vllm/compose_vllm_dev.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml index f90c44d5a0..8dd3c38975 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/compose_vllm_dev.yaml @@ -89,9 +89,11 @@ services: - "/var/opea/chatqna-service/data:/data" shm_size: 128G devices: - - "/dev/kfd:/dev/kfd" - - "/dev/dri/${AMD_GPU_CARD_ID}:/dev/dri/${AMD_GPU_CARD_ID}" - - "/dev/dri/${AMD_GPU_RENDER_ID}:/dev/dri/${AMD_GPU_RENDER_ID}" + - /dev/kfd:/dev/kfd + - /dev/dri/card40:/dev/dri/card40 + - /dev/dri/renderD168:/dev/dri/renderD168 + - /dev/dri/card32:/dev/dri/card32 + - /dev/dri/renderD160:/dev/dri/renderD160 cap_add: - SYS_PTRACE group_add: From 751d7e1676ea9a33b33a9d148762a9cefd5e313b Mon Sep 17 00:00:00 2001 From: Chingis Yundunov Date: Fri, 6 Dec 2024 23:59:33 +0700 Subject: [PATCH 10/10] ChatQnA - add files deploy for benchmark Signed-off-by: Chingis Yundunov --- ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh index a7f0146162..ea648eb2fd 100644 --- a/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh +++ b/ChatQnA/docker_compose/amd/gpu/rocm-vllm/set_env_vllm_dev.sh @@ -37,5 +37,5 @@ export CHATQNA_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_RERANK_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_LLM_SERVICE_HOST_IP=${HOST_IP} export CHATQNA_NGINX_PORT=18104 -export AMD_GPU_CARD_ID=card63 -export AMD_GPU_RENDER_ID=renderD190 +#export AMD_GPU_CARD_ID=card63 +#export AMD_GPU_RENDER_ID=renderD190