Skip to content

Commit d82d091

Browse files
committed
Fix HPS bugs (#4633)
1 parent 5c8b02f commit d82d091

File tree

8 files changed

+22
-11
lines changed

8 files changed

+22
-11
lines changed

deploy/hps/sdk/scripts/assemble.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ docker run \
88
-v "$(pwd)":/workspace \
99
-w /workspace \
1010
--rm \
11-
python:3.10@sha256:6ff000548a4fa34c1be02624836e75e212d4ead8227b4d4381c3ae998933a922 \
11+
ccr-2vdh3abv-pub.cnc.bj.baidubce.com/linmanhui/python:3.10 \
1212
/bin/bash scripts/_assemble.sh "$@"

deploy/hps/server_env/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ ENV DEBIAN_FRONTEND=noninteractive
3333

3434
RUN mkdir /paddlex
3535

36-
RUN apt-get update \
37-
&& apt-get install -y --no-install-recommends software-properties-common \
38-
&& add-apt-repository -y ppa:deadsnakes/ppa \
36+
RUN echo 'deb http://archive.ubuntu.com/ubuntu jammy main universe' > /etc/apt/sources.list.d/jammy-temp.list \
3937
&& apt-get update \
4038
&& apt-get install -y --no-install-recommends python3.10 python3.10-venv \
4139
&& python3.10 -m venv /paddlex/py310 \
@@ -101,7 +99,8 @@ RUN --mount=type=bind,source=deploy/hps/server_env/requirements/${DEVICE_TYPE}.t
10199
python -m pip install --requirement /tmp/requirements.txt --requirement /tmp/hpi_requirements.txt \
102100
&& if [ "${ENV_TYPE}" = 'dev' ]; then \
103101
python -m pip install --requirement /tmp/dev_requirements.txt; \
104-
fi
102+
fi \
103+
&& python -m pip install https://paddle-whl.bj.bcebos.com/nightly/cu126/safetensors/safetensors-0.6.2.dev0-cp38-abi3-linux_x86_64.whl
105104

106105
RUN --mount=type=bind,source=.,target=/tmp/PaddleX,rw \
107106
python -m pip install --no-deps /tmp/PaddleX

deploy/hps/server_env/requirements/cpu.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --extra=base --extra=serving --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu.txt --strip-extras ../../../setup.py paddlex-hps-server/pyproject.toml requirements/app.in requirements/cpu.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --extra=base --extra=serving --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu.txt --pip-args=None --strip-extras ../../../setup.py paddlex-hps-server/pyproject.toml requirements/app.in requirements/cpu.in
66
#
77
aiohappyeyeballs==2.4.6
88
# via aiohttp
@@ -289,6 +289,8 @@ pyparsing==3.2.1
289289
# via matplotlib
290290
pypdfium2==4.30.1
291291
# via paddlex (../../../setup.py)
292+
python-bidi==0.6.6
293+
# via paddlex (../../../setup.py)
292294
python-dateutil==2.9.0.post0
293295
# via
294296
# matplotlib
@@ -324,6 +326,8 @@ ruamel-yaml==0.18.10
324326
# via paddlex (../../../setup.py)
325327
ruamel-yaml-clib==0.2.12
326328
# via ruamel-yaml
329+
safetensors==0.6.2
330+
# via paddlex (../../../setup.py)
327331
scikit-image==0.24.0
328332
# via paddlex (../../../setup.py)
329333
scikit-learn==1.6.1
@@ -332,6 +336,8 @@ scipy==1.15.2
332336
# via
333337
# scikit-image
334338
# scikit-learn
339+
sentencepiece==0.2.1
340+
# via paddlex (../../../setup.py)
335341
shapely==2.0.7
336342
# via paddlex (../../../setup.py)
337343
six==1.17.0

deploy/hps/server_env/requirements/cpu_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --constraint=requirements/cpu.txt --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu_dev.txt --strip-extras requirements/cpu_dev.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --constraint=requirements/cpu.txt --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu_dev.txt --pip-args=None --strip-extras requirements/cpu_dev.in
66
#

deploy/hps/server_env/requirements/cpu_hpi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --constraint=requirements/cpu.txt --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu_hpi.txt --strip-extras requirements/cpu_hpi.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --constraint=requirements/cpu.txt --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/cpu_hpi.txt --pip-args=None --strip-extras requirements/cpu_hpi.in
66
#
77
certifi==2025.1.31
88
# via

deploy/hps/server_env/requirements/gpu.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --extra=base --extra=serving --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu.txt --strip-extras ../../../setup.py paddlex-hps-server/pyproject.toml requirements/app.in requirements/gpu.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --extra=base --extra=serving --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu.txt --pip-args=None --strip-extras ../../../setup.py paddlex-hps-server/pyproject.toml requirements/app.in requirements/gpu.in
66
#
77
aiohappyeyeballs==2.4.6
88
# via aiohttp
@@ -289,6 +289,8 @@ pyparsing==3.2.1
289289
# via matplotlib
290290
pypdfium2==4.30.1
291291
# via paddlex (../../../setup.py)
292+
python-bidi==0.6.6
293+
# via paddlex (../../../setup.py)
292294
python-dateutil==2.9.0.post0
293295
# via
294296
# matplotlib
@@ -324,6 +326,8 @@ ruamel-yaml==0.18.10
324326
# via paddlex (../../../setup.py)
325327
ruamel-yaml-clib==0.2.12
326328
# via ruamel-yaml
329+
safetensors==0.6.2
330+
# via paddlex (../../../setup.py)
327331
scikit-image==0.24.0
328332
# via paddlex (../../../setup.py)
329333
scikit-learn==1.6.1
@@ -332,6 +336,8 @@ scipy==1.15.2
332336
# via
333337
# scikit-image
334338
# scikit-learn
339+
sentencepiece==0.2.1
340+
# via paddlex (../../../setup.py)
335341
shapely==2.0.7
336342
# via paddlex (../../../setup.py)
337343
six==1.17.0

deploy/hps/server_env/requirements/gpu_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --constraint=requirements/gpu.txt --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu_dev.txt --strip-extras requirements/gpu_dev.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --constraint=requirements/gpu.txt --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu_dev.txt --pip-args=None --strip-extras requirements/gpu_dev.in
66
#

deploy/hps/server_env/requirements/gpu_hpi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --constraint=requirements/gpu.txt --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu_hpi.txt --strip-extras requirements/gpu_hpi.in
5+
# pip-compile --allow-unsafe --cert=None --client-cert=None --constraint=requirements/gpu.txt --index-url=None --no-emit-index-url --no-emit-trusted-host --output-file=requirements/gpu_hpi.txt --pip-args=None --strip-extras requirements/gpu_hpi.in
66
#
77
certifi==2025.1.31
88
# via

0 commit comments

Comments
 (0)