From 1c0b1731c5013c720966beeb86f3af3efa55f048 Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Fri, 16 May 2025 15:19:07 +0800 Subject: [PATCH] Integrate VisualQnA set_env to ut scripts. (#1947) Signed-off-by: ZePan110 Co-authored-by: chen, suyue --- .../docker_compose/amd/gpu/rocm/set_env.sh | 6 +-- .../amd/gpu/rocm/set_env_vllm.sh | 6 +-- VisualQnA/tests/README.md | 45 +++++++++++++++++++ VisualQnA/tests/test_compose_on_gaudi.sh | 1 - VisualQnA/tests/test_compose_on_rocm.sh | 20 +-------- VisualQnA/tests/test_compose_tgi_on_gaudi.sh | 13 +----- VisualQnA/tests/test_compose_tgi_on_xeon.sh | 12 +---- VisualQnA/tests/test_compose_vllm_on_rocm.sh | 19 +------- 8 files changed, 58 insertions(+), 64 deletions(-) create mode 100644 VisualQnA/tests/README.md diff --git a/VisualQnA/docker_compose/amd/gpu/rocm/set_env.sh b/VisualQnA/docker_compose/amd/gpu/rocm/set_env.sh index eecc6d057..1cdf88a26 100644 --- a/VisualQnA/docker_compose/amd/gpu/rocm/set_env.sh +++ b/VisualQnA/docker_compose/amd/gpu/rocm/set_env.sh @@ -6,7 +6,7 @@ export HOST_IP=${host_ip} export EXTERNAL_HOST_IP=${host_ip} export VISUALQNA_TGI_SERVICE_PORT="8399" -export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${Your_HUGGINGFACEHUB_API_TOKEN} +export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export VISUALQNA_CARD_ID="card1" export VISUALQNA_RENDER_ID="renderD136" export LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot" @@ -16,8 +16,8 @@ export MEGA_SERVICE_HOST_IP=${HOST_IP} export LVM_SERVICE_HOST_IP=${HOST_IP} export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:${BACKEND_SERVICE_PORT}/v1/visualqna" export FRONTEND_SERVICE_IP=${HOST_IP} -export FRONTEND_SERVICE_PORT=18001 +export FRONTEND_SERVICE_PORT=5173 export BACKEND_SERVICE_NAME=visualqna export BACKEND_SERVICE_IP=${HOST_IP} -export BACKEND_SERVICE_PORT=18002 +export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=18003 diff --git a/VisualQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh b/VisualQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh index 7786abe49..68a1bb0b9 100644 --- a/VisualQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh +++ b/VisualQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh @@ -6,7 +6,7 @@ export HOST_IP=${host_ip} export EXTERNAL_HOST_IP=${host_ip} export VISUALQNA_VLLM_SERVICE_PORT="8081" -export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${Your_HUGGINGFACEHUB_API_TOKEN} +export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export VISUALQNA_CARD_ID="card1" export VISUALQNA_RENDER_ID="renderD136" export VISUALQNA_LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot" @@ -16,8 +16,8 @@ export MEGA_SERVICE_HOST_IP=${HOST_IP} export LVM_SERVICE_HOST_IP=${HOST_IP} export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:${BACKEND_SERVICE_PORT}/v1/visualqna" export FRONTEND_SERVICE_IP=${HOST_IP} -export FRONTEND_SERVICE_PORT=18001 +export FRONTEND_SERVICE_PORT=5173 export BACKEND_SERVICE_NAME=visualqna export BACKEND_SERVICE_IP=${HOST_IP} -export BACKEND_SERVICE_PORT=18002 +export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=18003 diff --git a/VisualQnA/tests/README.md b/VisualQnA/tests/README.md new file mode 100644 index 000000000..8d07371b5 --- /dev/null +++ b/VisualQnA/tests/README.md @@ -0,0 +1,45 @@ +# VisualQnA E2E test scripts + +## Set the required environment variable + +```bash +export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token" +``` + +## Run test + +On Intel Xeon with Vllm: + +```bash +bash test_compose_on_xeon.sh +``` + +On Intel Gaudi with Vllm: + +```bash +bash test_compose_on_gaudi.sh +``` + +On Intel Xeon with TGI: + +```bash +bash test_compose_tgi_on_xeon.sh +``` + +On Intel Gaudi with TGI: + +```bash +bash test_compose_tgi_on_gaudi.sh +``` + +On AMD ROCm with TGI: + +```bash +bash test_compose_on_rocm.sh +``` + +On AMD ROCm with vLLM: + +```bash +bash test_compose_vllm_on_rocm.sh +``` diff --git a/VisualQnA/tests/test_compose_on_gaudi.sh b/VisualQnA/tests/test_compose_on_gaudi.sh index 237ad3b7d..1df520183 100644 --- a/VisualQnA/tests/test_compose_on_gaudi.sh +++ b/VisualQnA/tests/test_compose_on_gaudi.sh @@ -32,7 +32,6 @@ function build_docker_images() { service_list="visualqna visualqna-ui lvm nginx vllm-gaudi" docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log - docker images && sleep 1s } diff --git a/VisualQnA/tests/test_compose_on_rocm.sh b/VisualQnA/tests/test_compose_on_rocm.sh index ea53c0ab3..e7034baed 100644 --- a/VisualQnA/tests/test_compose_on_rocm.sh +++ b/VisualQnA/tests/test_compose_on_rocm.sh @@ -15,26 +15,10 @@ ip_address=$(hostname -I | awk '{print $1}') export MODEL_CACHE=${model_cache:-"/var/lib/GenAI/data"} export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} -export HOST_IP=${ip_address} -export VISUALQNA_TGI_SERVICE_PORT="8399" -export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} -export VISUALQNA_CARD_ID="card1" -export VISUALQNA_RENDER_ID="renderD136" -export LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot" +export host_ip=${ip_address} export MODEL="llava-hf/llava-v1.6-mistral-7b-hf" -export LVM_ENDPOINT="http://${HOST_IP}:8399" -export LVM_SERVICE_PORT=9399 -export MEGA_SERVICE_HOST_IP=${HOST_IP} -export LVM_SERVICE_HOST_IP=${HOST_IP} -export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${BACKEND_SERVICE_PORT}/v1/visualqna" -export FRONTEND_SERVICE_IP=${HOST_IP} -export FRONTEND_SERVICE_PORT=5173 -export BACKEND_SERVICE_NAME=visualqna -export BACKEND_SERVICE_IP=${HOST_IP} -export BACKEND_SERVICE_PORT=8888 -export NGINX_PORT=18003 export PATH="~/miniconda3/bin:$PATH" -export MODEL_CACHE=${model_cache:-"/var/opea/multimodalqna-service/data"} +source $WORKPATH/docker_compose/amd/gpu/rocm/set_env.sh function build_docker_images() { opea_branch=${opea_branch:-"main"} diff --git a/VisualQnA/tests/test_compose_tgi_on_gaudi.sh b/VisualQnA/tests/test_compose_tgi_on_gaudi.sh index 495f76481..b469166a8 100644 --- a/VisualQnA/tests/test_compose_tgi_on_gaudi.sh +++ b/VisualQnA/tests/test_compose_tgi_on_gaudi.sh @@ -34,20 +34,11 @@ function build_docker_images() { function start_services() { cd $WORKPATH/docker_compose/intel/hpu/gaudi - export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" - export LVM_ENDPOINT="http://${ip_address}:8399" export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} - export LVM_SERVICE_PORT=9399 - export MEGA_SERVICE_HOST_IP=${ip_address} - export LVM_SERVICE_HOST_IP=${ip_address} - export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/visualqna" - export FRONTEND_SERVICE_IP=${ip_address} - export FRONTEND_SERVICE_PORT=5173 - export BACKEND_SERVICE_NAME=visualqna - export BACKEND_SERVICE_IP=${ip_address} - export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=80 export host_ip=${ip_address} + source ./set_env.sh + export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env diff --git a/VisualQnA/tests/test_compose_tgi_on_xeon.sh b/VisualQnA/tests/test_compose_tgi_on_xeon.sh index a8cc02a23..29a009904 100644 --- a/VisualQnA/tests/test_compose_tgi_on_xeon.sh +++ b/VisualQnA/tests/test_compose_tgi_on_xeon.sh @@ -34,20 +34,10 @@ function build_docker_images() { function start_services() { cd $WORKPATH/docker_compose/intel/cpu/xeon/ - export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf" - export LVM_ENDPOINT="http://${ip_address}:8399" export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} - export LVM_SERVICE_PORT=9399 - export MEGA_SERVICE_HOST_IP=${ip_address} - export LVM_SERVICE_HOST_IP=${ip_address} - export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/visualqna" - export FRONTEND_SERVICE_IP=${ip_address} - export FRONTEND_SERVICE_PORT=5173 - export BACKEND_SERVICE_NAME=visualqna - export BACKEND_SERVICE_IP=${ip_address} - export BACKEND_SERVICE_PORT=8888 export NGINX_PORT=80 export host_ip=${ip_address} + source ./set_env.sh sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env diff --git a/VisualQnA/tests/test_compose_vllm_on_rocm.sh b/VisualQnA/tests/test_compose_vllm_on_rocm.sh index 606bb9e25..06e3fec7e 100644 --- a/VisualQnA/tests/test_compose_vllm_on_rocm.sh +++ b/VisualQnA/tests/test_compose_vllm_on_rocm.sh @@ -14,26 +14,11 @@ ip_address=$(hostname -I | awk '{print $1}') export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} -export HOST_IP=${ip_address} -export VISUALQNA_VLLM_SERVICE_PORT="8081" -export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} -export VISUALQNA_CARD_ID="card1" -export VISUALQNA_RENDER_ID="renderD136" -export VISUALQNA_LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot" +export host_ip=${ip_address} export MODEL="llava-hf/llava-v1.6-mistral-7b-hf" -export LVM_ENDPOINT="http://${HOST_IP}:${VISUALQNA_VLLM_SERVICE_PORT}" -export LVM_SERVICE_PORT=9399 -export MEGA_SERVICE_HOST_IP=${HOST_IP} -export LVM_SERVICE_HOST_IP=${HOST_IP} -export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${BACKEND_SERVICE_PORT}/v1/visualqna" -export FRONTEND_SERVICE_IP=${HOST_IP} -export FRONTEND_SERVICE_PORT=5173 -export BACKEND_SERVICE_NAME=visualqna -export BACKEND_SERVICE_IP=${HOST_IP} -export BACKEND_SERVICE_PORT=8888 -export NGINX_PORT=18003 export PATH="~/miniconda3/bin:$PATH" export MODEL_CACHE=${model_cache:-"/var/opea/multimodalqna-service/data"} +source $WORKPATH/docker_compose/amd/gpu/rocm/set_env_vllm.sh function build_docker_images() { opea_branch=${opea_branch:-"main"}