From 0c0edffc5ba539dce6cf8046a83ced592ac3166d Mon Sep 17 00:00:00 2001 From: xiguiw <111278656+xiguiw@users.noreply.github.com> Date: Mon, 17 Feb 2025 08:26:25 +0800 Subject: [PATCH] update vLLM CPU to the latest stable version (#1546) Signed-off-by: Wang, Xigui Co-authored-by: chen, suyue --- .github/workflows/_example-workflow.yml | 9 +++++++-- ChatQnA/tests/test_compose_on_xeon.sh | 7 ++++++- ChatQnA/tests/test_compose_pinecone_on_xeon.sh | 7 ++++++- ChatQnA/tests/test_compose_qdrant_on_xeon.sh | 7 ++++++- ChatQnA/tests/test_compose_without_rerank_on_xeon.sh | 8 +++++++- WorkflowExecAgent/tests/2_start_vllm_service.sh | 6 +++++- 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/.github/workflows/_example-workflow.yml b/.github/workflows/_example-workflow.yml index 30bcd9abb..d79c4132e 100644 --- a/.github/workflows/_example-workflow.yml +++ b/.github/workflows/_example-workflow.yml @@ -74,8 +74,13 @@ jobs: cd ${{ github.workspace }}/${{ inputs.example }}/docker_image_build docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml if [[ $(grep -c "vllm:" ${docker_compose_path}) != 0 ]]; then - git clone --depth 1 https://github.com/vllm-project/vllm.git - cd vllm && git rev-parse HEAD && cd ../ + git clone https://github.com/vllm-project/vllm.git && cd vllm + # Get the latest tag + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + # make sure do not change the pwd + git rev-parse HEAD && cd ../ fi if [[ $(grep -c "vllm-gaudi:" ${docker_compose_path}) != 0 ]]; then git clone --depth 1 --branch v0.6.4.post2+Gaudi-1.19.0 https://github.com/HabanaAI/vllm-fork.git diff --git a/ChatQnA/tests/test_compose_on_xeon.sh b/ChatQnA/tests/test_compose_on_xeon.sh index c25322648..f914b8a61 100644 --- a/ChatQnA/tests/test_compose_on_xeon.sh +++ b/ChatQnA/tests/test_compose_on_xeon.sh @@ -29,7 +29,12 @@ 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 --depth 1 https://github.com/vllm-project/vllm.git + git clone https://github.com/vllm-project/vllm.git && cd vllm + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + # make sure NOT change the pwd + cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep retriever vllm nginx" diff --git a/ChatQnA/tests/test_compose_pinecone_on_xeon.sh b/ChatQnA/tests/test_compose_pinecone_on_xeon.sh index e5a8d9258..0925db651 100755 --- a/ChatQnA/tests/test_compose_pinecone_on_xeon.sh +++ b/ChatQnA/tests/test_compose_pinecone_on_xeon.sh @@ -29,7 +29,12 @@ 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 --depth 1 https://github.com/vllm-project/vllm.git + git clone https://github.com/vllm-project/vllm.git && cd vllm + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + # Not change the pwd + cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep retriever vllm nginx" diff --git a/ChatQnA/tests/test_compose_qdrant_on_xeon.sh b/ChatQnA/tests/test_compose_qdrant_on_xeon.sh index a87e79b3c..a8539d617 100644 --- a/ChatQnA/tests/test_compose_qdrant_on_xeon.sh +++ b/ChatQnA/tests/test_compose_qdrant_on_xeon.sh @@ -29,7 +29,12 @@ 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 --depth 1 https://github.com/vllm-project/vllm.git + git clone https://github.com/vllm-project/vllm.git && cd vllm + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + # Not change the pwd + cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna chatqna-ui dataprep retriever vllm nginx" diff --git a/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh b/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh index cbd7e3027..3b3918b62 100644 --- a/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh +++ b/ChatQnA/tests/test_compose_without_rerank_on_xeon.sh @@ -29,7 +29,13 @@ 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 --depth 1 https://github.com/vllm-project/vllm.git + git clone https://github.com/vllm-project/vllm.git && cd vllm + # Get the latest tag + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + # Not change the pwd + cd ../ echo "Build all the images with --no-cache, check docker_image_build.log for details..." service_list="chatqna-without-rerank chatqna-ui dataprep retriever vllm nginx" diff --git a/WorkflowExecAgent/tests/2_start_vllm_service.sh b/WorkflowExecAgent/tests/2_start_vllm_service.sh index 2c3425328..62814178f 100644 --- a/WorkflowExecAgent/tests/2_start_vllm_service.sh +++ b/WorkflowExecAgent/tests/2_start_vllm_service.sh @@ -18,7 +18,11 @@ function build_vllm_docker_image() { echo $WORKPATH if [ ! -d "./vllm" ]; then git clone https://github.com/vllm-project/vllm.git - cd ./vllm; git checkout tags/v0.6.0 + cd vllm + VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )" + echo "Check out vLLM tag ${VLLM_VER}" + git checkout ${VLLM_VER} &> /dev/null + git rev-parse HEAD else cd ./vllm fi