From e529a6ff0444f051bb6229bafc38f4647233423b Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sun, 27 Apr 2025 07:48:55 +0000 Subject: [PATCH 1/5] add vllm-cuda --- .github/workflows/build-docker.yml | 16 ++++++++++++++-- docker_vllm/vllm-cuda.Dockerfile | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 docker_vllm/vllm-cuda.Dockerfile diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 83dfa7c..c326588 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -18,7 +18,7 @@ concurrency: env: BUILDKIT_PROGRESS: "plain" # Full logs for CI build. REGISTRY_SRC: ${{ vars.REGISTRY_SRC || 'docker.io' }} # For BASE_NAMESPACE of images: where to pull base images from, docker.io or other source registry URL. - REGISTRY_DST: ${{ vars.REGISTRY_DST || 'docker.io' }} # For tags of built images: where to push images to, docker.io or other destination registry URL. + REGISTRY_DST: ${{ vars.REGISTRY_DST || 'quay.io' }} # For tags of built images: where to push images to, docker.io or other destination registry URL. # DOCKER_REGISTRY_USERNAME and DOCKER_REGISTRY_PASSWORD is required for docker image push, they should be set in CI secrets. DOCKER_REGISTRY_USERNAME: ${{ vars.DOCKER_REGISTRY_USERNAME }} DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }} @@ -46,6 +46,18 @@ jobs: echo 'build_image paddleocr-models latest docker_PaddleOCR/models.Dockerfile --build-arg "BASE_IMG=paddleocr-cuda112" --build-arg "BASE_NAMESPACE_SRC=docker.io/library"' push_image + + qpod_vllm-cuda: + name: 'vllm-cuda' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: | + source ./tool.sh && free_diskspace + build_image vllm-cuda latest docker_vllm-cuda/vllm.Dockerfile + push_image + + qpod_PaddleOCR_cuda120: name: 'paddleocr-cuda120,doc-ai-cuda120' runs-on: ubuntu-latest @@ -87,7 +99,7 @@ jobs: ## Sync all images in this build (listed by "names") to mirror registry. sync_images: - needs: ["qpod_OpenCV", "qpod_HuggingFaceModels", "qpod_PaddleOCR_cuda112", "qpod_PaddleOCR_cuda120"] + needs: ["qpod_OpenCV", "qpod_HuggingFaceModels", "qpod_PaddleOCR_cuda112", "qpod_PaddleOCR_cuda120", "qpod_vllm-cuda"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/docker_vllm/vllm-cuda.Dockerfile b/docker_vllm/vllm-cuda.Dockerfile new file mode 100644 index 0000000..73c397d --- /dev/null +++ b/docker_vllm/vllm-cuda.Dockerfile @@ -0,0 +1,14 @@ +# Distributed under the terms of the Modified BSD License. + +ARG BASE_NAMESPACE +ARG BASE_IMG="torch" +FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} + +LABEL maintainer="haobibo@gmail.com" + +RUN set -eux && source /opt/utils/script-setup.sh \ + && cd /tmp/ \ + && git clone https://github.com/vllm-project/vllm.git \ + && cd /tmp/vllm \ + && export export MAX_JOBS=8 && pip install -e . \ + && install__clean && list_installed_packages From 4ee64eb252d09a235447d58a5fec37e798484fbd Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sun, 27 Apr 2025 07:55:13 +0000 Subject: [PATCH 2/5] debug vllm --- .github/workflows/build-docker.yml | 2 +- docker_vllm/vllm-cuda.Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c326588..65c33eb 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v4 - run: | source ./tool.sh && free_diskspace - build_image vllm-cuda latest docker_vllm-cuda/vllm.Dockerfile + build_image vllm-cuda latest docker_vllm/vllm-cuda.Dockerfile push_image diff --git a/docker_vllm/vllm-cuda.Dockerfile b/docker_vllm/vllm-cuda.Dockerfile index 73c397d..d68e5be 100644 --- a/docker_vllm/vllm-cuda.Dockerfile +++ b/docker_vllm/vllm-cuda.Dockerfile @@ -8,6 +8,7 @@ LABEL maintainer="haobibo@gmail.com" RUN set -eux && source /opt/utils/script-setup.sh \ && cd /tmp/ \ + # https://docs.vllm.ai/en/latest/getting_started/installation/gpu.html && git clone https://github.com/vllm-project/vllm.git \ && cd /tmp/vllm \ && export export MAX_JOBS=8 && pip install -e . \ From d7ffa8f3a805c46ac7aa0283bcea769c70a4a711 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sun, 27 Apr 2025 08:07:18 +0000 Subject: [PATCH 3/5] update vllm install --- docker_vllm/vllm-cuda.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker_vllm/vllm-cuda.Dockerfile b/docker_vllm/vllm-cuda.Dockerfile index d68e5be..aa7e702 100644 --- a/docker_vllm/vllm-cuda.Dockerfile +++ b/docker_vllm/vllm-cuda.Dockerfile @@ -11,5 +11,8 @@ RUN set -eux && source /opt/utils/script-setup.sh \ # https://docs.vllm.ai/en/latest/getting_started/installation/gpu.html && git clone https://github.com/vllm-project/vllm.git \ && cd /tmp/vllm \ - && export export MAX_JOBS=8 && pip install -e . \ + && export export MAX_JOBS=8 \ + && python use_existing_torch.py \ + && pip install -r requirements/build.txt \ + && pip install --no-build-isolation -e . \ && install__clean && list_installed_packages From 9ade35c5fbab19e87acc1b67087ba308f582faa3 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sun, 27 Apr 2025 20:57:02 +0800 Subject: [PATCH 4/5] add vllm --- docker_vllm/vllm-cuda.Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docker_vllm/vllm-cuda.Dockerfile b/docker_vllm/vllm-cuda.Dockerfile index aa7e702..94ed620 100644 --- a/docker_vllm/vllm-cuda.Dockerfile +++ b/docker_vllm/vllm-cuda.Dockerfile @@ -1,18 +1,19 @@ # Distributed under the terms of the Modified BSD License. ARG BASE_NAMESPACE -ARG BASE_IMG="torch" +ARG BASE_IMG="cuda_12.4" FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} LABEL maintainer="haobibo@gmail.com" RUN set -eux && source /opt/utils/script-setup.sh \ - && cd /tmp/ \ + && pip install vllm \ # https://docs.vllm.ai/en/latest/getting_started/installation/gpu.html - && git clone https://github.com/vllm-project/vllm.git \ - && cd /tmp/vllm \ - && export export MAX_JOBS=8 \ - && python use_existing_torch.py \ - && pip install -r requirements/build.txt \ - && pip install --no-build-isolation -e . \ + # && cd /tmp/ \ + # && git clone https://github.com/vllm-project/vllm.git \ + # && cd /tmp/vllm \ + # && export export MAX_JOBS=8 \ + # && python use_existing_torch.py \ + # && pip install -r requirements/build.txt \ + # && pip install --no-build-isolation -e . \ && install__clean && list_installed_packages From 68c51eb866ba53d76d3bf7785723f9261a517742 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Sun, 27 Apr 2025 20:58:02 +0800 Subject: [PATCH 5/5] fix install --- .github/workflows/build-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 65c33eb..28f208d 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -53,7 +53,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: | - source ./tool.sh && free_diskspace + source ./tool.sh && free_diskspace && export IMG_PREFIX_SRC="${IMG_PREFIX_DST}" build_image vllm-cuda latest docker_vllm/vllm-cuda.Dockerfile push_image