Skip to content

Commit d3db51f

Browse files
committed
update vLLM CPU to latest stable version
default vllm main branch are in development and changed from time to time. It may be broken sometimes. Signed-off-by: Wang, Xigui <xigui.wang@intel.com>
1 parent 6d781f7 commit d3db51f

6 files changed

+37
-7
lines changed

.github/workflows/_example-workflow.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,13 @@ jobs:
7474
cd ${{ github.workspace }}/${{ inputs.example }}/docker_image_build
7575
docker_compose_path=${{ github.workspace }}/${{ inputs.example }}/docker_image_build/build.yaml
7676
if [[ $(grep -c "vllm:" ${docker_compose_path}) != 0 ]]; then
77-
git clone --depth 1 https://github.com/vllm-project/vllm.git
78-
cd vllm && git rev-parse HEAD && cd ../
77+
git clone https://github.com/vllm-project/vllm.git && cd vllm
78+
# Get the latest tag
79+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
80+
echo "Check out vLLM tag ${VLLM_VER}"
81+
git checkout ${VLLM_VER} &> /dev/null
82+
# make sure do not change the pwd
83+
git rev-parse HEAD && cd ../
7984
fi
8085
if [[ $(grep -c "vllm-gaudi:" ${docker_compose_path}) != 0 ]]; then
8186
git clone --depth 1 --branch v0.6.4.post2+Gaudi-1.19.0 https://github.com/HabanaAI/vllm-fork.git

ChatQnA/tests/test_compose_on_xeon.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ function build_docker_images() {
2929

3030
cd $WORKPATH/docker_image_build
3131
git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
32-
git clone --depth 1 https://github.com/vllm-project/vllm.git
32+
git clone https://github.com/vllm-project/vllm.git && cd vllm
33+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
34+
echo "Check out vLLM tag ${VLLM_VER}"
35+
git checkout ${VLLM_VER} &> /dev/null
36+
# make sure NOT change the pwd
37+
cd ../
3338

3439
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
3540
service_list="chatqna chatqna-ui dataprep retriever vllm nginx"

ChatQnA/tests/test_compose_pinecone_on_xeon.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ function build_docker_images() {
2929

3030
cd $WORKPATH/docker_image_build
3131
git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
32-
git clone --depth 1 https://github.com/vllm-project/vllm.git
32+
git clone https://github.com/vllm-project/vllm.git && cd vllm
33+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
34+
echo "Check out vLLM tag ${VLLM_VER}"
35+
git checkout ${VLLM_VER} &> /dev/null
36+
# Not change the pwd
37+
cd ../
3338

3439
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
3540
service_list="chatqna chatqna-ui dataprep retriever vllm nginx"

ChatQnA/tests/test_compose_qdrant_on_xeon.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ function build_docker_images() {
2929

3030
cd $WORKPATH/docker_image_build
3131
git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
32-
git clone --depth 1 https://github.com/vllm-project/vllm.git
32+
git clone https://github.com/vllm-project/vllm.git && cd vllm
33+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
34+
echo "Check out vLLM tag ${VLLM_VER}"
35+
git checkout ${VLLM_VER} &> /dev/null
36+
# Not change the pwd
37+
cd ../
3338

3439
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
3540
service_list="chatqna chatqna-ui dataprep retriever vllm nginx"

ChatQnA/tests/test_compose_without_rerank_on_xeon.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ function build_docker_images() {
2929

3030
cd $WORKPATH/docker_image_build
3131
git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
32-
git clone --depth 1 https://github.com/vllm-project/vllm.git
32+
git clone https://github.com/vllm-project/vllm.git && cd vllm
33+
# Get the latest tag
34+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
35+
echo "Check out vLLM tag ${VLLM_VER}"
36+
git checkout ${VLLM_VER} &> /dev/null
37+
# Not change the pwd
38+
cd ../
3339

3440
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
3541
service_list="chatqna-without-rerank chatqna-ui dataprep retriever vllm nginx"

WorkflowExecAgent/tests/2_start_vllm_service.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ function build_vllm_docker_image() {
1818
echo $WORKPATH
1919
if [ ! -d "./vllm" ]; then
2020
git clone https://github.com/vllm-project/vllm.git
21-
cd ./vllm; git checkout tags/v0.6.0
21+
cd vllm
22+
VLLM_VER="$(git describe --tags "$(git rev-list --tags --max-count=1)" )"
23+
echo "Check out vLLM tag ${VLLM_VER}"
24+
git checkout ${VLLM_VER} &> /dev/null
25+
git rev-parse HEAD
2226
else
2327
cd ./vllm
2428
fi

0 commit comments

Comments
 (0)