Skip to content

Commit 1c0b173

Browse files
ZePan110chensuyue
ZePan110
and
chensuyue
authored
Integrate VisualQnA set_env to ut scripts. (opea-project#1947)
Signed-off-by: ZePan110 <[email protected]> Co-authored-by: chen, suyue <[email protected]>
1 parent 22174e6 commit 1c0b173

File tree

8 files changed

+58
-64
lines changed

8 files changed

+58
-64
lines changed

‎VisualQnA/docker_compose/amd/gpu/rocm/set_env.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
export HOST_IP=${host_ip}
77
export EXTERNAL_HOST_IP=${host_ip}
88
export VISUALQNA_TGI_SERVICE_PORT="8399"
9-
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${Your_HUGGINGFACEHUB_API_TOKEN}
9+
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
1010
export VISUALQNA_CARD_ID="card1"
1111
export VISUALQNA_RENDER_ID="renderD136"
1212
export LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot"
@@ -16,8 +16,8 @@ export MEGA_SERVICE_HOST_IP=${HOST_IP}
1616
export LVM_SERVICE_HOST_IP=${HOST_IP}
1717
export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:${BACKEND_SERVICE_PORT}/v1/visualqna"
1818
export FRONTEND_SERVICE_IP=${HOST_IP}
19-
export FRONTEND_SERVICE_PORT=18001
19+
export FRONTEND_SERVICE_PORT=5173
2020
export BACKEND_SERVICE_NAME=visualqna
2121
export BACKEND_SERVICE_IP=${HOST_IP}
22-
export BACKEND_SERVICE_PORT=18002
22+
export BACKEND_SERVICE_PORT=8888
2323
export NGINX_PORT=18003

‎VisualQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
export HOST_IP=${host_ip}
77
export EXTERNAL_HOST_IP=${host_ip}
88
export VISUALQNA_VLLM_SERVICE_PORT="8081"
9-
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${Your_HUGGINGFACEHUB_API_TOKEN}
9+
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
1010
export VISUALQNA_CARD_ID="card1"
1111
export VISUALQNA_RENDER_ID="renderD136"
1212
export VISUALQNA_LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot"
@@ -16,8 +16,8 @@ export MEGA_SERVICE_HOST_IP=${HOST_IP}
1616
export LVM_SERVICE_HOST_IP=${HOST_IP}
1717
export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:${BACKEND_SERVICE_PORT}/v1/visualqna"
1818
export FRONTEND_SERVICE_IP=${HOST_IP}
19-
export FRONTEND_SERVICE_PORT=18001
19+
export FRONTEND_SERVICE_PORT=5173
2020
export BACKEND_SERVICE_NAME=visualqna
2121
export BACKEND_SERVICE_IP=${HOST_IP}
22-
export BACKEND_SERVICE_PORT=18002
22+
export BACKEND_SERVICE_PORT=8888
2323
export NGINX_PORT=18003

‎VisualQnA/tests/README.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# VisualQnA E2E test scripts
2+
3+
## Set the required environment variable
4+
5+
```bash
6+
export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token"
7+
```
8+
9+
## Run test
10+
11+
On Intel Xeon with Vllm:
12+
13+
```bash
14+
bash test_compose_on_xeon.sh
15+
```
16+
17+
On Intel Gaudi with Vllm:
18+
19+
```bash
20+
bash test_compose_on_gaudi.sh
21+
```
22+
23+
On Intel Xeon with TGI:
24+
25+
```bash
26+
bash test_compose_tgi_on_xeon.sh
27+
```
28+
29+
On Intel Gaudi with TGI:
30+
31+
```bash
32+
bash test_compose_tgi_on_gaudi.sh
33+
```
34+
35+
On AMD ROCm with TGI:
36+
37+
```bash
38+
bash test_compose_on_rocm.sh
39+
```
40+
41+
On AMD ROCm with vLLM:
42+
43+
```bash
44+
bash test_compose_vllm_on_rocm.sh
45+
```

‎VisualQnA/tests/test_compose_on_gaudi.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ function build_docker_images() {
3232

3333
service_list="visualqna visualqna-ui lvm nginx vllm-gaudi"
3434
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
35-
3635
docker images && sleep 1s
3736
}
3837

‎VisualQnA/tests/test_compose_on_rocm.sh‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,10 @@ ip_address=$(hostname -I | awk '{print $1}')
1515
export MODEL_CACHE=${model_cache:-"/var/lib/GenAI/data"}
1616
export REGISTRY=${IMAGE_REPO}
1717
export TAG=${IMAGE_TAG}
18-
export HOST_IP=${ip_address}
19-
export VISUALQNA_TGI_SERVICE_PORT="8399"
20-
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
21-
export VISUALQNA_CARD_ID="card1"
22-
export VISUALQNA_RENDER_ID="renderD136"
23-
export LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot"
18+
export host_ip=${ip_address}
2419
export MODEL="llava-hf/llava-v1.6-mistral-7b-hf"
25-
export LVM_ENDPOINT="http://${HOST_IP}:8399"
26-
export LVM_SERVICE_PORT=9399
27-
export MEGA_SERVICE_HOST_IP=${HOST_IP}
28-
export LVM_SERVICE_HOST_IP=${HOST_IP}
29-
export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${BACKEND_SERVICE_PORT}/v1/visualqna"
30-
export FRONTEND_SERVICE_IP=${HOST_IP}
31-
export FRONTEND_SERVICE_PORT=5173
32-
export BACKEND_SERVICE_NAME=visualqna
33-
export BACKEND_SERVICE_IP=${HOST_IP}
34-
export BACKEND_SERVICE_PORT=8888
35-
export NGINX_PORT=18003
3620
export PATH="~/miniconda3/bin:$PATH"
37-
export MODEL_CACHE=${model_cache:-"/var/opea/multimodalqna-service/data"}
21+
source $WORKPATH/docker_compose/amd/gpu/rocm/set_env.sh
3822

3923
function build_docker_images() {
4024
opea_branch=${opea_branch:-"main"}

‎VisualQnA/tests/test_compose_tgi_on_gaudi.sh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,11 @@ function build_docker_images() {
3434
function start_services() {
3535
cd $WORKPATH/docker_compose/intel/hpu/gaudi
3636

37-
export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf"
38-
export LVM_ENDPOINT="http://${ip_address}:8399"
3937
export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
40-
export LVM_SERVICE_PORT=9399
41-
export MEGA_SERVICE_HOST_IP=${ip_address}
42-
export LVM_SERVICE_HOST_IP=${ip_address}
43-
export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/visualqna"
44-
export FRONTEND_SERVICE_IP=${ip_address}
45-
export FRONTEND_SERVICE_PORT=5173
46-
export BACKEND_SERVICE_NAME=visualqna
47-
export BACKEND_SERVICE_IP=${ip_address}
48-
export BACKEND_SERVICE_PORT=8888
4938
export NGINX_PORT=80
5039
export host_ip=${ip_address}
40+
source ./set_env.sh
41+
export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf"
5142

5243
sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env
5344

‎VisualQnA/tests/test_compose_tgi_on_xeon.sh‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,10 @@ function build_docker_images() {
3434
function start_services() {
3535
cd $WORKPATH/docker_compose/intel/cpu/xeon/
3636

37-
export LVM_MODEL_ID="llava-hf/llava-v1.6-mistral-7b-hf"
38-
export LVM_ENDPOINT="http://${ip_address}:8399"
3937
export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
40-
export LVM_SERVICE_PORT=9399
41-
export MEGA_SERVICE_HOST_IP=${ip_address}
42-
export LVM_SERVICE_HOST_IP=${ip_address}
43-
export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:8888/v1/visualqna"
44-
export FRONTEND_SERVICE_IP=${ip_address}
45-
export FRONTEND_SERVICE_PORT=5173
46-
export BACKEND_SERVICE_NAME=visualqna
47-
export BACKEND_SERVICE_IP=${ip_address}
48-
export BACKEND_SERVICE_PORT=8888
4938
export NGINX_PORT=80
5039
export host_ip=${ip_address}
40+
source ./set_env.sh
5141

5242
sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env
5343

‎VisualQnA/tests/test_compose_vllm_on_rocm.sh‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,11 @@ ip_address=$(hostname -I | awk '{print $1}')
1414

1515
export REGISTRY=${IMAGE_REPO}
1616
export TAG=${IMAGE_TAG}
17-
export HOST_IP=${ip_address}
18-
export VISUALQNA_VLLM_SERVICE_PORT="8081"
19-
export VISUALQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
20-
export VISUALQNA_CARD_ID="card1"
21-
export VISUALQNA_RENDER_ID="renderD136"
22-
export VISUALQNA_LVM_MODEL_ID="Xkev/Llama-3.2V-11B-cot"
17+
export host_ip=${ip_address}
2318
export MODEL="llava-hf/llava-v1.6-mistral-7b-hf"
24-
export LVM_ENDPOINT="http://${HOST_IP}:${VISUALQNA_VLLM_SERVICE_PORT}"
25-
export LVM_SERVICE_PORT=9399
26-
export MEGA_SERVICE_HOST_IP=${HOST_IP}
27-
export LVM_SERVICE_HOST_IP=${HOST_IP}
28-
export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:${BACKEND_SERVICE_PORT}/v1/visualqna"
29-
export FRONTEND_SERVICE_IP=${HOST_IP}
30-
export FRONTEND_SERVICE_PORT=5173
31-
export BACKEND_SERVICE_NAME=visualqna
32-
export BACKEND_SERVICE_IP=${HOST_IP}
33-
export BACKEND_SERVICE_PORT=8888
34-
export NGINX_PORT=18003
3519
export PATH="~/miniconda3/bin:$PATH"
3620
export MODEL_CACHE=${model_cache:-"/var/opea/multimodalqna-service/data"}
21+
source $WORKPATH/docker_compose/amd/gpu/rocm/set_env_vllm.sh
3722

3823
function build_docker_images() {
3924
opea_branch=${opea_branch:-"main"}

0 commit comments

Comments
 (0)