Skip to content

Commit c226b2e

Browse files
tianshuo78520atianshuo78520a
authored
update dockerfile (#27589)
* update dockerfile * update dockerfile * update dockerfile * update dockerfile * add opencv in ci * update cidockerfile * test nccl * fix diff * fix dockerfile * update ubuntu nccl2.7.8 * update ubuntu nccl2.7.8
1 parent f935ca8 commit c226b2e

14 files changed

+67
-63
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,12 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
156156

157157
RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
158158
pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
159-
pip3 --no-cache-dir install opencv-python && \
160159
pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
161160
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
162-
pip3.6 --no-cache-dir install opencv-python && \
163161
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
164162
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
165-
pip3.7 --no-cache-dir install opencv-python && \
166163
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
167-
pip --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
168-
pip --no-cache-dir install opencv-python
164+
pip --no-cache-dir install 'ipykernel==4.6.0'
169165

170166
#For docstring checker
171167
RUN pip3 --no-cache-dir install pylint pytest astroid isort
@@ -207,7 +203,6 @@ RUN wget --no-check-certificate https://pslib.bj.bcebos.com/openmpi-1.4.5.tar.gz
207203
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH && export PATH=/usr/local/bin:$PATH && cd .. && \
208204
rm -rf openmpi-1.4.5.tar.gz && pip --no-cache-dir install mpi4py && ln -fs /bin/bash /bin/sh && \
209205
apt-get install libprotobuf-dev -y
210-
RUN pip --no-cache-dir install -U netifaces==0.10.9
211206

212207
# Older versions of patchelf limited the size of the files being processed and were fixed in this pr.
213208
# https://github.com/NixOS/patchelf/commit/ba2695a8110abbc8cc6baf0eea819922ee5007fa

‎paddle/scripts/paddle_build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ EOF
14071407
# run paddle version to install python packages first
14081408
RUN apt-get update && ${NCCL_DEPS}
14091409
RUN apt-get install -y wget python3 python3-pip libgtk2.0-dev dmidecode python3-tk && \
1410-
pip3 install opencv-python py-cpuinfo==5.0.0 && wget ${ref_web}/${ref_paddle35} && ${ref_paddle35_mv1} pip3 install ${ref_paddle35_whl} ${ref_paddle35_mv2}; apt-get install -f -y && \
1410+
pip3 install py-cpuinfo==5.0.0 && wget ${ref_web}/${ref_paddle35} && ${ref_paddle35_mv1} pip3 install ${ref_paddle35_whl} ${ref_paddle35_mv2}; apt-get install -f -y && \
14111411
apt-get clean -y && \
14121412
rm -f ${ref_paddle35} && \
14131413
ldconfig
@@ -1429,7 +1429,7 @@ EOF
14291429
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
14301430
make -j8 > /dev/null && make altinstall > /dev/null && cd ../ && rm Python-3.6.0.tgz
14311431
RUN apt-get install -y libgtk2.0-dev dmidecode python3-tk && ldconfig && \
1432-
pip3.6 install opencv-python && wget ${ref_web}/${ref_paddle36} && ${ref_paddle36_mv1} pip3.6 install ${ref_paddle36_whl} ${ref_paddle36_mv2}; apt-get install -f -y && \
1432+
wget ${ref_web}/${ref_paddle36} && ${ref_paddle36_mv1} pip3.6 install ${ref_paddle36_whl} ${ref_paddle36_mv2}; apt-get install -f -y && \
14331433
apt-get clean -y && \
14341434
rm -f ${ref_paddle36} && \
14351435
ldconfig
@@ -1445,7 +1445,7 @@ EOF
14451445
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
14461446
make -j8 > /dev/null && make altinstall > /dev/null && cd ../ && rm Python-3.7.0.tgz
14471447
RUN apt-get install -y libgtk2.0-dev dmidecode python3-tk && ldconfig && \
1448-
pip3.7 install opencv-python && wget ${ref_web}/${ref_paddle37} && pip3.7 install ${ref_paddle37_whl}; apt-get install -f -y && \
1448+
wget ${ref_web}/${ref_paddle37} && pip3.7 install ${ref_paddle37_whl}; apt-get install -f -y && \
14491449
apt-get clean -y && \
14501450
rm -f ${ref_paddle37} && \
14511451
ldconfig
@@ -1461,7 +1461,7 @@ EOF
14611461
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
14621462
make -j8 > /dev/null && make altinstall > /dev/null && cd ../ && rm Python-3.8.0.tgz
14631463
RUN apt-get install -y libgtk2.0-dev dmidecode python3-tk && ldconfig && \
1464-
pip3.8 install opencv-python && wget ${ref_web}/${ref_paddle38} && pip3.8 install ${ref_paddle38_whl}; apt-get install -f -y && \
1464+
wget ${ref_web}/${ref_paddle38} && pip3.8 install ${ref_paddle38_whl}; apt-get install -f -y && \
14651465
apt-get clean -y && \
14661466
rm -f ${ref_paddle38} && \
14671467
ldconfig

‎tools/dockerfile/Dockerfile.centos‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
1616
RUN yum install -y gettext-devel sqlite-devel zlib-devel openssl-devel pcre-devel vim tk-devel tkinter libtool xz graphviz wget curl-devel
1717
COPY build_scripts /build_scripts
1818
RUN bash build_scripts/build.sh
19-
RUN bash build_scripts/install_nccl2.sh && \
20-
bash build_scripts/install_trt.sh
19+
RUN bash build_scripts/install_nccl2.sh
2120
RUN rm -rf build_scripts
2221

2322
ENV SSL_CERT_FILE=/opt/_internal/certs.pem
@@ -63,12 +62,12 @@ RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs4/lib:${LD_LIBRARY_PATH} /o
6362
go get github.com/Masterminds/glide && \
6463
rm -rf /root/requirements.txt
6564

66-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' opencv-python==4.2.0.32 && \
67-
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' opencv-python==4.2.0.32 && \
68-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python==4.2.0.32 && \
69-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python==4.2.0.32 && \
70-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python==4.2.0.32 && \
71-
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' opencv-python==4.2.0.32
65+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' && \
66+
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' && \
67+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' && \
68+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
69+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
70+
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'
7271

7372
RUN wget -O /opt/swig-2.0.12.tar.gz https://sourceforge.net/projects/swig/files/swig/swig-2.0.12/swig-2.0.12.tar.gz/download && \
7473
cd /opt && tar xzf swig-2.0.12.tar.gz && cd /opt/swig-2.0.12 && ./configure && make && make install && cd /opt && rm swig-2.0.12.tar.gz

‎tools/dockerfile/Dockerfile.ubuntu‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ RUN curl -s -q https://glide.sh/get | sh
126126

127127
# Downgrade TensorRT
128128
COPY tools/dockerfile/build_scripts /build_scripts
129-
RUN bash /build_scripts/install_trt.sh
129+
RUN bash /build_scripts/install_trt.sh && \
130+
bash /build_scripts/install_nccl2.sh
130131
RUN rm -rf /build_scripts
131132

132133
# git credential to skip password typing
@@ -202,8 +203,6 @@ RUN wget -q https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/binutils/
202203
cd binutils-2.27 && \
203204
./configure && make -j && make install && cd .. && rm -rf binutils-2.27 binutils_2.27.orig.tar.gz
204205

205-
RUN pip --no-cache-dir install -U netifaces==0.10.9
206-
207206
# Older versions of patchelf limited the size of the files being processed and were fixed in this pr.
208207
# https://github.com/NixOS/patchelf/commit/ba2695a8110abbc8cc6baf0eea819922ee5007fa
209208
# So install a newer version here.

‎tools/dockerfile/build_scripts/install_nccl2.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@
22
VERSION=$(nvcc --version | grep release | grep -oEi "release ([0-9]+)\.([0-9])"| sed "s/release //")
33
if [ "$VERSION" == "10.0" ]; then
44
DEB="nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
5+
elif [ "$VERSION" == "10.2" ]; then
6+
DEB="nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
57
elif [ "$VERSION" == "10.1" ]; then
68
DEB="nccl-repo-ubuntu1604-2.4.7-ga-cuda10.0_1-1_amd64.deb"
79
elif [ "$VERSION" == "9.0" ]; then
810
DEB="nccl-repo-ubuntu1604-2.3.7-ga-cuda9.0_1-1_amd64.deb"
911
else
10-
DEB="nccl-repo-ubuntu1604-2.1.15-ga-cuda8.0_1-1_amd64.deb"
12+
echo "nccl not found"
13+
exit 2
1114
fi
1215

13-
URL="http://nccl2-deb.gz.bcebos.com/$DEB"
16+
URL="http://nccl2-deb.cdn.bcebos.com/$DEB"
1417

1518
DIR="/nccl2"
1619
mkdir -p $DIR
1720
# we cached the nccl2 deb package in BOS, so we can download it with wget
1821
# install nccl2: http://docs.nvidia.com/deeplearning/sdk/nccl-install-guide/index.html#down
19-
wget -O $DIR/$DEB $URL
22+
wget -q -O $DIR/$DEB $URL
2023

2124
cd $DIR && ar x $DEB && tar xf data.tar.xz
2225
DEBS=$(find ./var/ -name "*.deb")
@@ -26,4 +29,5 @@ for sub_deb in $DEBS; do
2629
done
2730
mv -f usr/include/nccl.h /usr/local/include/
2831
mv -f usr/lib/x86_64-linux-gnu/libnccl* /usr/local/lib/
32+
rm /usr/include/nccl.h
2933
rm -rf $DIR

‎tools/dockerfile/ci_dockerfile.sh‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function make_ubuntu_dockerfile(){
44
sed 's/<baseimg>/10.1-cudnn7-devel-ubuntu16.04/g' ./Dockerfile.ubuntu >${dockerfile_name}
55
sed -i 's#liblzma-dev#liblzma-dev openmpi-bin openmpi-doc libopenmpi-dev#g' ${dockerfile_name}
66
dockerfile_line=`wc -l ${dockerfile_name}|awk '{print $1}'`
7-
sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz && \
7+
sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz && \
88
tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/" ${dockerfile_name}
99
sed -i 's#<install_gcc>#WORKDIR /usr/bin \
1010
COPY tools/dockerfile/build_scripts /build_scripts \
@@ -15,7 +15,9 @@ function make_ubuntu_dockerfile(){
1515
RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/bin/gcc \
1616
RUN ln -s /usr/local/gcc-8.2/bin/g++ /usr/bin/g++ \
1717
ENV PATH=/usr/local/gcc-8.2/bin:$PATH #g' ${dockerfile_name}
18-
18+
sed -i 's#bash /build_scripts/install_nccl2.sh#wget --no-proxy https://nccl2-deb.cdn.bcebos.com/nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb && \
19+
dpkg -i nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb && \
20+
apt-get install -y libnccl2=2.7.8-1+cuda10.1 libnccl-dev=2.7.8-1+cuda10.1 --allow-change-held-packages #g' ${dockerfile_name}
1921
}
2022

2123

@@ -27,8 +29,15 @@ function make_centos_dockerfile(){
2729
sed -i "${dockerfile_line}i RUN ln -s /usr/lib64/libz.so /usr/local/lib/libz.so && \
2830
ln -s /usr/local/lib/libnccl.so /usr/local/cuda/lib64/ && \
2931
rm -rf /usr/include/NvInfer*" ${dockerfile_name}
30-
sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz && \
32+
sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz && \
3133
tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/" ${dockerfile_name}
34+
sed -i 's#RUN bash build_scripts/install_nccl2.sh##g' ${dockerfile_name}
35+
sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-2.7.8-1+cuda10.2.x86_64.rpm && \
36+
wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-devel-2.7.8-1+cuda10.2.x86_64.rpm && \
37+
wget --no-check-certificate -q https://nccl2-deb.cdn.bcebos.com/libnccl-static-2.7.8-1+cuda10.2.x86_64.rpm && \
38+
rpm -ivh libnccl-2.7.8-1+cuda10.2.x86_64.rpm && \
39+
rpm -ivh libnccl-devel-2.7.8-1+cuda10.2.x86_64.rpm && \
40+
rpm -ivh libnccl-static-2.7.8-1+cuda10.2.x86_64.rpm && rm -f /usr/local/include/nccl.h " ${dockerfile_name}
3241
sed -i 's#<install_gcc>#WORKDIR /usr/bin \
3342
COPY tools/dockerfile/build_scripts /build_scripts \
3443
RUN bash /build_scripts/install_gcc.sh gcc82 \&\& rm -rf /build_scripts \

‎tools/manylinux1/Dockerfile.CI35-GCC8‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /o
6161
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install -r /root/requirements.txt && \
6262
rm -rf /root/requirements.txt
6363

64-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' opencv-python && \
65-
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' opencv-python && \
66-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python && \
67-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python && \
68-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python
64+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' && \
65+
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' && \
66+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' && \
67+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
68+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0'
6969

7070
RUN wget -O /opt/swig-2.0.12.tar.gz https://sourceforge.net/projects/swig/files/swig/swig-2.0.12/swig-2.0.12.tar.gz/download && \
7171
cd /opt && tar xzf swig-2.0.12.tar.gz && cd /opt/swig-2.0.12 && ./configure && make && make install && cd /opt && rm swig-2.0.12.tar.gz

‎tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc48_ubuntu16‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,12 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
161161

162162
RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
163163
pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
164-
pip3 --no-cache-dir install opencv-python && \
165164
pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
166165
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
167-
pip3.6 --no-cache-dir install opencv-python && \
168166
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
169167
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
170-
pip3.7 --no-cache-dir install opencv-python && \
171168
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
172-
pip --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
173-
pip --no-cache-dir install opencv-python
169+
pip --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0'
174170

175171
#For docstring checker
176172
RUN pip3 --no-cache-dir install pylint pytest astroid isort
@@ -212,7 +208,6 @@ RUN wget --no-check-certificate https://pslib.bj.bcebos.com/openmpi-1.4.5.tar.gz
212208
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH && export PATH=/usr/local/bin:$PATH && cd .. && \
213209
rm -rf openmpi-1.4.5.tar.gz && pip --no-cache-dir install mpi4py && ln -fs /bin/bash /bin/sh && \
214210
apt-get install libprotobuf-dev -y
215-
RUN pip --no-cache-dir install -U netifaces==0.10.9
216211

217212
# ccache 3.7.9
218213
RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \

‎tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc8_py35_centos6‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /o
7070
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install -r /root/requirements.txt && \
7171
rm -rf /root/requirements.txt
7272

73-
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' opencv-python && \
74-
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' opencv-python && \
75-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python && \
76-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python && \
77-
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0' opencv-python
73+
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install pre-commit 'ipython==5.3.0' && \
74+
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install pre-commit 'ipython==5.3.0' && \
75+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install pre-commit 'ipython==5.3.0' && \
76+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install pre-commit 'ipython==5.3.0' && \
77+
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install pre-commit 'ipython==5.3.0'
7878

7979
RUN wget -O /opt/swig-2.0.12.tar.gz https://sourceforge.net/projects/swig/files/swig/swig-2.0.12/swig-2.0.12.tar.gz/download && \
8080
cd /opt && tar xzf swig-2.0.12.tar.gz && cd /opt/swig-2.0.12 && ./configure && make && make install && cd /opt && rm swig-2.0.12.tar.gz

‎tools/manylinux1/Dockerfile.cuda10_cudnn7_gcc8_ubuntu16‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ RUN curl -s -q https://glide.sh/get | sh
138138
# 2. Manually add ~IPluginFactory() in IPluginFactory class of NvInfer.h, otherwise, it couldn't work in paddle.
139139
# See https://github.com/PaddlePaddle/Paddle/issues/10129 for details.
140140

141+
RUN wget -q --no-proxy https://nccl2-deb.cdn.bcebos.com/nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb && \
142+
dpkg -i nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb && \
143+
apt-get install -y libnccl2=2.7.8-1+cuda10.1 libnccl-dev=2.7.8-1+cuda10.1 --allow-change-held-packages
144+
141145
RUN wget -q https://paddlepaddledeps.bj.bcebos.com/TensorRT-6.0.1.5.Ubuntu-16.04.x86_64-gnu.cuda-10.1.cudnn7.tar.gz --no-check-certificate && \
142146
tar -zxf TensorRT-6.0.1.5.Ubuntu-16.04.x86_64-gnu.cuda-10.1.cudnn7.tar.gz -C /usr/local && \
143147
cp -rf /usr/local/TensorRT-6.0.1.5/include/* /usr/include/ && cp -rf /usr/local/TensorRT-6.0.1.5/lib/* /usr/lib/
@@ -217,7 +221,6 @@ RUN wget -q https://paddle-ci.gz.bcebos.com/binutils_2.27.orig.tar.gz && \
217221
./configure && make -j && make install && cd .. && rm -rf binutils-2.27 binutils_2.27.orig.tar.gz
218222

219223
RUN apt-get install libprotobuf-dev -y
220-
RUN pip --no-cache-dir install -U netifaces==0.10.9
221224

222225
# ccache 3.7.9
223226
RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \

0 commit comments

Comments
 (0)