Skip to content

Commit 4b2fc32

Browse files
co63occo63oc
authored
clean python3.8 in tools dockerfile (#76139)
1 parent a4e1ab5 commit 4b2fc32

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

‎tools/dockerfile/Dockerfile.centos‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,19 @@ RUN wget --no-check-certificate -qO- https://paddle-ci.gz.bcebos.com/go1.15.12.l
4545
RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt
4646

4747

48-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install setuptools -U && \
49-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install setuptools -U && \
48+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install setuptools -U && \
5049
LD_LIBRARY_PATH=/opt/_internal/cpython-3.10.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.10.0/bin/pip3 install setuptools -U && \
5150
LD_LIBRARY_PATH=/opt/_internal/cpython-3.11.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.11.0/bin/pip3 install setuptools -U && \
5251
LD_LIBRARY_PATH=/opt/_internal/cpython-3.12.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.12.0/bin/pip3 install setuptools -U
5352

54-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install -r /root/requirements.txt && \
55-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install -r /root/requirements.txt && \
53+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install -r /root/requirements.txt && \
5654
LD_LIBRARY_PATH=/opt/_internal/cpython-3.10.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.10.0/bin/pip3 install -r /root/requirements.txt && \
5755
LD_LIBRARY_PATH=/opt/_internal/cpython-3.11.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.11.0/bin/pip3 install -r /root/requirements.txt && \
5856
LD_LIBRARY_PATH=/opt/_internal/cpython-3.12.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.12.0/bin/pip3 install -r /root/requirements.txt && \
5957
go get github.com/Masterminds/glide && \
6058
rm -rf /root/requirements.txt
6159

62-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
63-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
60+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
6461
LD_LIBRARY_PATH=/opt/_internal/cpython-3.10.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.10.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
6562
LD_LIBRARY_PATH=/opt/_internal/cpython-3.11.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.11.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
6663
LD_LIBRARY_PATH=/opt/_internal/cpython-3.12.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.12.0/bin/pip3 install pre-commit 'ipython==5.3.0'

‎tools/dockerfile/Dockerfile.develop.dtk‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@ RUN rm -rf /usr/bin/cmake /usr/bin/cmake3 && \
3030
ln -s /opt/cmake-3.27.7/bin/cmake /usr/bin/cmake3
3131
ENV PATH=/opt/cmake-3.27.7/bin:${PATH}
3232

33-
# Python 3.8\3.9\3.10
34-
RUN wget -q https://www.python.org/ftp/python/3.8.14/Python-3.8.14.tgz && \
35-
tar xzf Python-3.8.14.tgz && cd Python-3.8.14 && \
36-
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
37-
make -j16 > /dev/null && make altinstall > /dev/null && ldconfig && \
38-
cd ../ && rm -rf Python-3.8.14 && rm -rf Python-3.8.14.tgz
39-
33+
# Python 3.9\3.10
4034
RUN wget -q https://www.python.org/ftp/python/3.9.14/Python-3.9.14.tgz && \
4135
tar xzf Python-3.9.14.tgz && cd Python-3.9.14 && \
4236
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
@@ -52,10 +46,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
5246

5347
# create venv and activate
5448
RUN /usr/local/bin/python3.10 -m venv /opt/py310 && \
55-
/usr/local/bin/python3.9 -m venv /opt/py39 && \
56-
/usr/local/bin/python3.8 -m venv /opt/py38
49+
/usr/local/bin/python3.9 -m venv /opt/py39
5750
# update env
58-
ENV PATH=/opt/py310/bin:/opt/py39/bin:/opt/py38/bin:$PATH
51+
ENV PATH=/opt/py310/bin:/opt/py39/bin:$PATH
5952

6053
# upgrade pip
6154
RUN pip3.10 install --upgrade pip setuptools wheel && \

‎tools/dockerfile/build_scripts/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set -ex
2424
# remove others to expedite build and reduce docker image size. The original
2525
# manylinux docker image project builds many python versions.
2626
# NOTE We added back 3.5.1, since auditwheel requires python 3.3+
27-
CPYTHON_VERSIONS="3.12.0 3.11.0 3.10.0 3.9.0 3.8.0"
27+
CPYTHON_VERSIONS="3.12.0 3.11.0 3.10.0 3.9.0"
2828

2929
# openssl version to build, with expected sha256 hash of .tar.gz
3030
# archive

‎tools/dockerfile/manylinux/Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,13 @@ ENV DESIRED_CUDA=12.6
8888
FROM python as paddle
8989
RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt
9090

91-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install setuptools pyyaml wheel -U && \
92-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install setuptools pyyaml wheel -U && \
91+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install setuptools pyyaml wheel -U && \
9392
LD_LIBRARY_PATH=/opt/_internal/cpython-3.10.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.10.0/bin/pip3 install setuptools pyyaml wheel -U && \
9493
LD_LIBRARY_PATH=/opt/_internal/cpython-3.11.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.11.0/bin/pip3 install setuptools pyyaml wheel -U && \
9594
LD_LIBRARY_PATH=/opt/_internal/cpython-3.12.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.12.0/bin/pip3 install setuptools pyyaml wheel -U && \
9695
LD_LIBRARY_PATH=/opt/_internal/cpython-3.13.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.13.0/bin/pip3 install setuptools pyyaml wheel -U
9796

98-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install -r /root/requirements.txt && \
99-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install -r /root/requirements.txt && \
97+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.9.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.9.0/bin/pip3 install -r /root/requirements.txt && \
10098
LD_LIBRARY_PATH=/opt/_internal/cpython-3.10.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.10.0/bin/pip3 install -r /root/requirements.txt && \
10199
LD_LIBRARY_PATH=/opt/_internal/cpython-3.11.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.11.0/bin/pip3 install -r /root/requirements.txt && \
102100
LD_LIBRARY_PATH=/opt/_internal/cpython-3.12.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.12.0/bin/pip3 install -r /root/requirements.txt && \

‎tools/windows/build_compile_environment.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
:: Include:
2323
:: 1. CMake 3.18.0
2424
:: 2. Git 2.28.0
25-
:: 3. Python 3.8.3\3.9.7\3.10.0\3.11.8\3.12.8
25+
:: 3. Python 3.9.7\3.10.0\3.11.8\3.12.8
2626
:: 4. Visual Studio 2017\2019\2022 Community
2727
:: 5. CUDA 11.2\12\12.3 cudnn 8.1\8.4\8.9\9.6
2828
:: 6. java jre

0 commit comments

Comments
 (0)