Adaptation to vllm v0.8.3 build paths (opea-project#1761)

Signed-off-by: ZePan110 <ze.pan@intel.com>
Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com>

Author: ZePan110

.github/workflows/_build_image.yml

@@ -77,7 +77,7 @@ jobs:
           docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml
           if [[ $(grep -c "vllm:" ${docker_compose_path}) != 0 ]]; then
               git clone https://github.com/vllm-project/vllm.git && cd vllm
-              VLLM_VER=v0.8.2
+              VLLM_VER=v0.8.3
               echo "Check out vLLM tag ${VLLM_VER}"
               git checkout ${VLLM_VER} &> /dev/null && cd ../
           fi

AudioQnA/docker_compose/intel/cpu/xeon/README.md

@@ -26,9 +26,9 @@ docker build -t opea/whisper:latest --build-arg https_proxy=$https_proxy --build
 ```bash
 git clone https://github.com/vllm-project/vllm.git
 cd ./vllm/
-VLLM_VER="v0.8.2"
+VLLM_VER="v0.8.3"
 git checkout ${VLLM_VER}
-docker build --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile.cpu -t opea/vllm:latest --shm-size=128g .
+docker build --no-cache --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f docker/Dockerfile.cpu -t opea/vllm:latest --shm-size=128g .
 ```
 
 ### 4. Build TTS Image

AudioQnA/docker_image_build/build.yaml

@@ -74,7 +74,7 @@ services:
   vllm:
     build:
       context: vllm
-      dockerfile: Dockerfile.cpu
+      dockerfile: docker/Dockerfile.cpu
     extends: audioqna
     image: ${REGISTRY:-opea}/vllm:${TAG:-latest}
   vllm-gaudi:

AudioQnA/tests/test_compose_multilang_on_xeon.sh

@@ -33,7 +33,7 @@ function build_docker_images() {
 
     git clone https://github.com/vllm-project/vllm.git
     cd ./vllm/
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null && cd ../
 

AudioQnA/tests/test_compose_on_xeon.sh

@@ -33,7 +33,7 @@ function build_docker_images() {
 
     git clone https://github.com/vllm-project/vllm.git
     cd ./vllm/
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null && cd ../
 

ChatQnA/docker_image_build/build.yaml

@@ -75,7 +75,7 @@ services:
   vllm:
     build:
       context: vllm
-      dockerfile: Dockerfile.cpu
+      dockerfile: docker/Dockerfile.cpu
     extends: chatqna
     image: ${REGISTRY:-opea}/vllm:${TAG:-latest}
   vllm-gaudi:

ChatQnA/tests/test_compose_faqgen_on_xeon.sh

@@ -24,7 +24,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null && cd ../
 

ChatQnA/tests/test_compose_faqgen_tgi_on_xeon.sh

@@ -24,7 +24,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null && cd ../
 

ChatQnA/tests/test_compose_milvus_on_xeon.sh

@@ -25,7 +25,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     # make sure NOT change the pwd

ChatQnA/tests/test_compose_on_xeon.sh

@@ -24,7 +24,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     # make sure NOT change the pwd

ChatQnA/tests/test_compose_pinecone_on_xeon.sh

@@ -25,7 +25,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     # Not change the pwd

ChatQnA/tests/test_compose_qdrant_on_xeon.sh

@@ -24,7 +24,7 @@ function build_docker_images() {
     docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     # Not change the pwd

ChatQnA/tests/test_compose_without_rerank_on_xeon.sh

@@ -25,7 +25,7 @@ function build_docker_images() {
     popd && sleep 1s
     git clone https://github.com/vllm-project/vllm.git && cd vllm
 
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     # Not change the pwd

CodeGen/docker_image_build/build.yaml

@@ -37,7 +37,7 @@ services:
   vllm:
     build:
       context: vllm
-      dockerfile: Dockerfile.cpu
+      dockerfile: docker/Dockerfile.cpu
     extends: codegen
     image: ${REGISTRY:-opea}/vllm:${TAG:-latest}
   vllm-gaudi:

CodeGen/tests/test_compose_on_xeon.sh

@@ -32,7 +32,7 @@ function build_docker_images() {
     git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
 
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     cd ../

CodeTrans/docker_image_build/build.yaml

@@ -26,7 +26,7 @@ services:
   vllm:
     build:
       context: vllm
-      dockerfile: Dockerfile.cpu
+      dockerfile: docker/Dockerfile.cpu
     extends: codetrans
     image: ${REGISTRY:-opea}/vllm:${TAG:-latest}
   vllm-gaudi:

CodeTrans/tests/test_compose_on_xeon.sh

@@ -31,7 +31,7 @@ function build_docker_images() {
     cd $WORKPATH/docker_image_build
     git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     cd ../

DocSum/docker_image_build/build.yaml

@@ -57,7 +57,7 @@ services:
   vllm:
     build:
       context: vllm
-      dockerfile: Dockerfile.cpu
+      dockerfile: docker/Dockerfile.cpu
     extends: docsum
     image: ${REGISTRY:-opea}/vllm:${TAG:-latest}
   vllm-gaudi:

DocSum/tests/test_compose_on_xeon.sh

@@ -58,7 +58,7 @@ function build_docker_images() {
     popd && sleep 1s
 
     git clone https://github.com/vllm-project/vllm.git && cd vllm
-    VLLM_VER="v0.8.2"
+    VLLM_VER="v0.8.3"
     echo "Check out vLLM tag ${VLLM_VER}"
     git checkout ${VLLM_VER} &> /dev/null
     cd ../

WorkflowExecAgent/tests/2_start_vllm_service.sh

@@ -19,7 +19,7 @@ function build_vllm_docker_image() {
     if [ ! -d "./vllm" ]; then
         git clone https://github.com/vllm-project/vllm.git
         cd vllm
-        VLLM_VER="v0.8.2"
+        VLLM_VER="v0.8.3"
         echo "Check out vLLM tag ${VLLM_VER}"
         git checkout ${VLLM_VER} &> /dev/null
         git rev-parse HEAD