Skip to content

Commit 91cfa4f

Browse files
BobholamovicBobholamovic
committed
Merge remote-tracking branch 'official/main' into feat/hps
2 parents 57b8a14 + a604297 commit 91cfa4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1521
-216
lines changed

‎deploy/hubserving/ocr_system/params.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ def read_params():
6161
cfg.cls_batch_num = 30
6262
cfg.cls_thresh = 0.9
6363

64+
# Model download URLs using HTTPS for secure transmission
65+
cfg.det_model_url = "https://paddle-ocr-models.bj.bcebos.com/dygraph_v2.0/ch/ch_pp-ocrv2_det_infer.tar"
66+
cfg.rec_model_url = "https://paddle-ocr-models.bj.bcebos.com/dygraph_v2.0/ch/ch_pp-ocrv2_rec_infer.tar"
67+
cfg.cls_model_url = "https://paddle-ocr-models.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_cls_infer.tar"
68+
6469
cfg.use_pdserving = False
6570
cfg.use_tensorrt = False
6671
cfg.drop_score = 0.5

‎deploy/paddleocr_vl_docker/accelerators/dcu/.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
API_IMAGE_TAG_SUFFIX=latest-dcu-offline
2+
VLM_BACKEND=vllm
3+
VLM_IMAGE_TAG_SUFFIX=latest-dcu-offline

deploy/paddleocr_vl_docker/accelerators/compose_dcu.yaml renamed to deploy/paddleocr_vl_docker/accelerators/dcu/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
restart: unless-stopped
2323
environment:
2424
- VLM_BACKEND=${VLM_BACKEND:-vllm}
25-
command: /bin/bash -c "source ~/.bashrc && paddlex --serve --pipeline /home/paddleocr/pipeline_config_${VLM_BACKEND}.yaml --device dcu"
25+
command: paddlex --serve --pipeline /home/paddleocr/pipeline_config_${VLM_BACKEND}.yaml --device dcu
2626
healthcheck:
2727
test: ["CMD-SHELL", "curl -f http://localhost:8080/health || exit 1"]
2828
volumes:

‎deploy/paddleocr_vl_docker/accelerators/dcu/pipeline.Dockerfile‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# TODO: Allow regular users
2+
3+
FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddle-dcu:dtk24.04.1-kylinv10-gcc82
4+
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
7+
ENV PIP_NO_CACHE_DIR=0
8+
ENV PYTHONUNBUFFERED=1
9+
ENV PYTHONDONTWRITEBYTECODE=1
10+
11+
RUN python -m pip install https://paddle-whl.bj.bcebos.com/nightly/cu126/safetensors/safetensors-0.6.2.dev0-cp38-abi3-linux_x86_64.whl
12+
13+
RUN python -m pip install paddlepaddle-dcu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/dcu/
14+
15+
ARG PADDLEOCR_VERSION=">=3.3.2,<3.4"
16+
RUN python -m pip install "paddleocr[doc-parser]${PADDLEOCR_VERSION}" \
17+
&& paddlex --install serving
18+
19+
RUN groupadd -g 1000 paddleocr \
20+
&& useradd -m -s /bin/bash -u 1000 -g 1000 paddleocr
21+
ENV HOME=/home/paddleocr
22+
WORKDIR /home/paddleocr
23+
24+
USER paddleocr
25+
26+
ENV HYHAL_PATH=/opt/hyhal
27+
ENV DTKROOT=/opt/
28+
ENV AMDGPU_TARGETS="gfx906;gfx926;gfx928"
29+
ENV ROCM_PATH=/opt/dtk-24.04.1
30+
ENV HIP_PATH=/opt/dtk-24.04.1/hip
31+
ENV MIOPEN_FIND_MODE=3
32+
33+
ENV PATH="${ROCM_PATH}/bin:${ROCM_PATH}/llvm/bin:${ROCM_PATH}/hip/bin:${ROCM_PATH}/hip/bin/hipify:${HYHAL_PATH}/bin:${PATH}"
34+
ENV LD_LIBRARY_PATH="${ROCM_PATH}/lib:${ROCM_PATH}/lib64:${HYHAL_PATH}/lib:${HYHAL_PATH}/lib64:${LD_LIBRARY_PATH}"
35+
ENV LD_LIBRARY_PATH="${ROCM_PATH}/hip/lib:${ROCM_PATH}/llvm/lib:${LD_LIBRARY_PATH}"
36+
ENV C_INCLUDE_PATH="${ROCM_PATH}/include:${HYHAL_PATH}/include:${ROCM_PATH}/llvm/include"
37+
ENV CPLUS_INCLUDE_PATH="${ROCM_PATH}/include:${HYHAL_PATH}/include:${ROCM_PATH}/llvm/include"
38+
39+
ARG BUILD_FOR_OFFLINE=false
40+
RUN if [ "${BUILD_FOR_OFFLINE}" = 'true' ]; then \
41+
mkdir -p "${HOME}/.paddlex/official_models" \
42+
&& cd "${HOME}/.paddlex/official_models" \
43+
&& wget https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/UVDoc_infer.tar \
44+
https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-LCNet_x1_0_doc_ori_infer.tar \
45+
https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayoutV2_infer.tar \
46+
https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PaddleOCR-VL_infer.tar \
47+
&& tar -xf UVDoc_infer.tar \
48+
&& mv UVDoc_infer UVDoc \
49+
&& tar -xf PP-LCNet_x1_0_doc_ori_infer.tar \
50+
&& mv PP-LCNet_x1_0_doc_ori_infer PP-LCNet_x1_0_doc_ori \
51+
&& tar -xf PP-DocLayoutV2_infer.tar \
52+
&& mv PP-DocLayoutV2_infer PP-DocLayoutV2 \
53+
&& tar -xf PaddleOCR-VL_infer.tar \
54+
&& mv PaddleOCR-VL_infer PaddleOCR-VL \
55+
&& rm -f UVDoc_infer.tar PP-LCNet_x1_0_doc_ori_infer.tar PP-DocLayoutV2_infer.tar PaddleOCR-VL_infer.tar \
56+
&& mkdir -p "${HOME}/.paddlex/fonts" \
57+
&& wget -P "${HOME}/.paddlex/fonts" https://paddle-model-ecology.bj.bcebos.com/paddlex/PaddleX3.0/fonts/PingFang-SC-Regular.ttf; \
58+
fi
59+
60+
COPY --chown=paddleocr:paddleocr pipeline_config_vllm.yaml /home/paddleocr
61+
COPY --chown=paddleocr:paddleocr pipeline_config_fastdeploy.yaml /home/paddleocr
62+
63+
EXPOSE 8080
64+
65+
CMD ["paddlex", "--serve", "--pipeline", "/home/paddleocr/pipeline_config_vllm.yaml", "--device", "dcu"]

‎deploy/paddleocr_vl_docker/accelerators/dcu/vlm.Dockerfile‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# TODO: Allow regular users
2+
3+
ARG BACKEND
4+
5+
6+
FROM image.sourcefind.cn:5000/dcu/admin/base/vllm:0.9.2-ubuntu22.04-dtk25.04.2-py3.10 AS base-vllm
7+
8+
9+
FROM base-${BACKEND}
10+
11+
ARG BACKEND
12+
13+
ARG PADDLEOCR_VERSION=">=3.3.2,<3.4"
14+
RUN python -m pip install "paddleocr${PADDLEOCR_VERSION}"
15+
16+
RUN groupadd -g 1000 paddleocr \
17+
&& useradd -m -s /bin/bash -u 1000 -g 1000 paddleocr
18+
ENV HOME=/home/paddleocr
19+
WORKDIR /home/paddleocr
20+
21+
USER paddleocr
22+
23+
ARG BUILD_FOR_OFFLINE=false
24+
RUN if [ "${BUILD_FOR_OFFLINE}" = 'true' ]; then \
25+
mkdir -p "${HOME}/.paddlex/official_models" \
26+
&& cd "${HOME}/.paddlex/official_models" \
27+
&& wget https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PaddleOCR-VL_infer.tar \
28+
&& tar -xf PaddleOCR-VL_infer.tar \
29+
&& mv PaddleOCR-VL_infer PaddleOCR-VL \
30+
&& rm -f PaddleOCR-VL_infer.tar; \
31+
fi
32+
33+
ENV BACKEND=${BACKEND}
34+
CMD ["/bin/bash", "-c", "paddleocr genai_server --model_name PaddleOCR-VL-0.9B --host 0.0.0.0 --port 8080 --backend ${BACKEND}"]

‎deploy/paddleocr_vl_docker/accelerators/gpu-sm120/.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
API_IMAGE_TAG_SUFFIX=latest-gpu-sm120-offline
2+
VLM_BACKEND=vllm
3+
VLM_IMAGE_TAG_SUFFIX=latest-gpu-sm120-offline

deploy/paddleocr_vl_docker/compose.yaml renamed to deploy/paddleocr_vl_docker/accelerators/gpu-sm120/compose.yaml

File renamed without changes.

deploy/paddleocr_vl_docker/pipeline.Dockerfile renamed to deploy/paddleocr_vl_docker/accelerators/gpu-sm120/pipeline.Dockerfile

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,18 @@
1-
ARG BASE_IMAGE="python:3.10"
2-
3-
FROM ${BASE_IMAGE}
1+
FROM python:3.10
42

53
ENV DEBIAN_FRONTEND=noninteractive
64

75
ENV PIP_NO_CACHE_DIR=0
86
ENV PYTHONUNBUFFERED=1
97
ENV PYTHONDONTWRITEBYTECODE=1
108

11-
ARG DEVICE_TYPE="gpu"
12-
13-
RUN if [ "${DEVICE_TYPE}" != 'dcu' ]; then \
14-
apt-get update \
15-
&& apt-get install -y libgl1 \
16-
&& rm -rf /var/lib/apt/lists/*; \
17-
fi
9+
RUN apt-get update \
10+
&& apt-get install -y libgl1 \
11+
&& rm -rf /var/lib/apt/lists/*
1812

1913
RUN python -m pip install https://paddle-whl.bj.bcebos.com/nightly/cu126/safetensors/safetensors-0.6.2.dev0-cp38-abi3-linux_x86_64.whl
2014

21-
RUN if [ "${DEVICE_TYPE}" = 'gpu' ]; then \
22-
python -m pip install paddlepaddle-gpu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/cu126/; \
23-
elif [ "${DEVICE_TYPE}" = 'gpu-sm120' ]; then \
24-
python -m pip install paddlepaddle-gpu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/cu129/; \
25-
elif [ "${DEVICE_TYPE}" = 'dcu' ]; then \
26-
python -m pip install paddlepaddle-dcu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/dcu/; \
27-
elif [ "${DEVICE_TYPE}" = 'xpu' ]; then \
28-
python -m pip install paddlepaddle-xpu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/xpu-p800/; \
29-
else \
30-
false; \
31-
fi
15+
RUN python -m pip install paddlepaddle-gpu==3.2.1 -i https://www.paddlepaddle.org.cn/packages/stable/cu129/
3216

3317
ARG PADDLEOCR_VERSION=">=3.3.2,<3.4"
3418
RUN python -m pip install "paddleocr[doc-parser]${PADDLEOCR_VERSION}" \
@@ -41,10 +25,6 @@ WORKDIR /home/paddleocr
4125

4226
USER paddleocr
4327

44-
RUN if [ "${DEVICE_TYPE}" = 'dcu' ]; then \
45-
echo 'source /opt/dtk-24.04.1/env.sh' >> "${HOME}/.bashrc"; \
46-
fi
47-
4828
ARG BUILD_FOR_OFFLINE=false
4929
RUN if [ "${BUILD_FOR_OFFLINE}" = 'true' ]; then \
5030
mkdir -p "${HOME}/.paddlex/official_models" \

deploy/paddleocr_vl_docker/vlm.Dockerfile renamed to deploy/paddleocr_vl_docker/accelerators/gpu-sm120/vlm.Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
ARG BASE_IMAGE="ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddlex-genai-vllm-server:latest"
1+
ARG BACKEND
22

3-
FROM ${BASE_IMAGE}
3+
4+
FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddlex-genai-vllm-server:latest-sm120 AS base-vllm
5+
6+
7+
FROM base-${BACKEND}
8+
9+
ARG BACKEND
410

511
ARG PADDLEOCR_VERSION=">=3.3.2,<3.4"
612
RUN python -m pip install "paddleocr${PADDLEOCR_VERSION}"
7-
ARG BACKEND="vllm"
813

914
RUN groupadd -g 1000 paddleocr \
1015
&& useradd -m -s /bin/bash -u 1000 -g 1000 paddleocr

deploy/paddleocr_vl_docker/.env renamed to deploy/paddleocr_vl_docker/accelerators/gpu/.env

File renamed without changes.

0 commit comments

Comments
 (0)