Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
afa3720c
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2297
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
afa3720c
编写于
4月 10, 2021
作者:
T
tianshuo78520a
提交者:
GitHub
4月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ci py3 gcc5.4 (#32045)
上级
ec2ffb68
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
45 addition
and
64 deletion
+45
-64
cmake/external/brpc.cmake
cmake/external/brpc.cmake
+1
-1
tools/dockerfile/Dockerfile.centos
tools/dockerfile/Dockerfile.centos
+4
-12
tools/dockerfile/Dockerfile.ubuntu
tools/dockerfile/Dockerfile.ubuntu
+18
-30
tools/dockerfile/build_scripts/build.sh
tools/dockerfile/build_scripts/build.sh
+6
-15
tools/dockerfile/ci_dockerfile.sh
tools/dockerfile/ci_dockerfile.sh
+16
-6
未找到文件。
cmake/external/brpc.cmake
浏览文件 @
afa3720c
...
@@ -39,7 +39,7 @@ set(prefix_path "${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/
...
@@ -39,7 +39,7 @@ set(prefix_path "${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/
ExternalProject_Add
(
ExternalProject_Add
(
extern_brpc
extern_brpc
${
EXTERNAL_PROJECT_LOG_ARGS
}
${
EXTERNAL_PROJECT_LOG_ARGS
}
# TODO(gongwb): change to de newst repo when they changed
.
# TODO(gongwb): change to de newst repo when they changed
GIT_REPOSITORY
"https://github.com/wangjiawei04/brpc"
GIT_REPOSITORY
"https://github.com/wangjiawei04/brpc"
GIT_TAG
"e203afb794caf027da0f1e0776443e7d20c0c28e"
GIT_TAG
"e203afb794caf027da0f1e0776443e7d20c0c28e"
PREFIX
${
BRPC_SOURCES_DIR
}
PREFIX
${
BRPC_SOURCES_DIR
}
...
...
tools/dockerfile/Dockerfile.centos
浏览文件 @
afa3720c
...
@@ -19,6 +19,7 @@ RUN bash build_scripts/build.sh
...
@@ -19,6 +19,7 @@ RUN bash build_scripts/build.sh
RUN bash build_scripts/install_nccl2.sh
RUN bash build_scripts/install_nccl2.sh
RUN bash build_scripts/install_trt.sh
RUN bash build_scripts/install_trt.sh
RUN rm -rf build_scripts
RUN rm -rf build_scripts
RUN ln -s /usr/local/ssl/include/openssl /usr/include
# git 2.17.1
# git 2.17.1
RUN wget -q https://paddle-ci.gz.bcebos.com/git-2.17.1.tar.gz && \
RUN wget -q https://paddle-ci.gz.bcebos.com/git-2.17.1.tar.gz && \
...
@@ -47,26 +48,17 @@ RUN cd /opt && wget -q --no-check-certificate https://paddle-ci.cdn.bcebos.com/p
...
@@ -47,26 +48,17 @@ RUN cd /opt && wget -q --no-check-certificate https://paddle-ci.cdn.bcebos.com/p
RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt
RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install setuptools -U && \
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.7.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.7.0/bin/pip3 install setuptools -U && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install setuptools -U
LD_LIBRARY_PATH=/opt/_internal/cpython-3.8.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.8.0/bin/pip3 install setuptools -U
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs4/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27mu/bin/pip install -r /root/requirements.txt && \
RUN LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install -r /root/requirements.txt && \
LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.15-ucs2/lib:${LD_LIBRARY_PATH} /opt/python/cp27-cp27m/bin/pip install -r /root/requirements.txt && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.5.1/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.5.1/bin/pip3 install -r /root/requirements.txt && \
LD_LIBRARY_PATH=/opt/_internal/cpython-3.6.0/lib/:${LD_LIBRARY_PATH} /opt/_internal/cpython-3.6.0/bin/pip3 install -r /root/requirements.txt && \
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 && \
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 && \
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 && \
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 && \
go get github.com/Masterminds/glide && \
go get github.com/Masterminds/glide && \
rm -rf /root/requirements.txt
rm -rf /root/requirements.txt
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' && \
RUN 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' && \
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' && \
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' && \
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' && \
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' && \
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' && \
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'
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'
...
...
tools/dockerfile/Dockerfile.ubuntu
浏览文件 @
afa3720c
...
@@ -56,7 +56,7 @@ RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-a
...
@@ -56,7 +56,7 @@ RUN mkdir -p /root/python_build/ && wget -q https://www.sqlite.org/2018/sqlite-a
# Install Python3.7
# Install Python3.7
RUN wget -q https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz && \
RUN wget -q https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz && \
tar -xzf Python-3.7.0.tgz && cd Python-3.7.0 && \
tar -xzf Python-3.7.0.tgz && cd Python-3.7.0 && \
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
CFLAGS="-Wformat" ./configure --prefix=/usr/local/
python3.7.0
--enable-shared > /dev/null && \
make -j8 > /dev/null && make altinstall > /dev/null && ldconfig
make -j8 > /dev/null && make altinstall > /dev/null && ldconfig
# Install Python3.8
# Install Python3.8
...
@@ -65,16 +65,11 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
...
@@ -65,16 +65,11 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
make -j8 > /dev/null && make altinstall > /dev/null && ldconfig
make -j8 > /dev/null && make altinstall > /dev/null && ldconfig
# Install Python3.5
ENV PATH=/usr/local/python3.7.0/include:${PATH}
RUN wget -q https://www.python.org/ftp/python/3.5.1/Python-3.5.1.tgz && \
ENV PATH=/usr/local/python3.7.0/bin:${PATH}
tar -xzf Python-3.5.1.tgz && cd Python-3.5.1 && \
ENV LD_LIBRARY_PATH=/usr/local/python3.7.0/lib:${LD_LIBRARY_PATH}
CFLAGS="-Wformat" ./configure --prefix=/usr/local/python3.5.1 --enable-shared > /dev/null && \
ENV CPLUS_INCLUDE_PATH=/usr/local/python3.7.0/include/python3.7:$CPLUS_INCLUDE_PATH
make -j8 > /dev/null && make altinstall > /dev/null && ldconfig
RUN ln -sf /usr/local/python3.7.0/bin/python3.7 /usr/local/bin/python3 && ln -sf /usr/local/python3.7.0/bin/python3.7 /usr/bin/python3
ENV PATH=/usr/local/python3.5.1/include:${PATH}
ENV PATH=/usr/local/python3.5.1/bin:${PATH}
ENV LD_LIBRARY_PATH=/usr/local/python3.5.1/lib:${LD_LIBRARY_PATH}
ENV CPLUS_INCLUDE_PATH=/usr/local/python3.5.1/include/python3.5:$CPLUS_INCLUDE_PATH
RUN ln -sf /usr/local/python3.5.1/bin/python3.5 /usr/local/bin/python3 && ln -sf /usr/local/python3.5.1/bin/python3.5 /usr/bin/python3
RUN rm -r /root/python_build
RUN rm -r /root/python_build
...
@@ -102,14 +97,14 @@ WORKDIR pip-20.0.1
...
@@ -102,14 +97,14 @@ WORKDIR pip-20.0.1
RUN python setup.py install && \
RUN python setup.py install && \
python3.8 setup.py install && \
python3.8 setup.py install && \
python3.7 setup.py install && \
python3.7 setup.py install && \
python3.6 setup.py install && \
python3.6 setup.py install
python3 setup.py install
WORKDIR /home
WORKDIR /home
RUN rm Python-$version.tgz setuptools-40.6.2.zip pip-20.0.1.tar.gz && \
RUN rm Python-$version.tgz setuptools-40.6.2.zip pip-20.0.1.tar.gz && \
rm -r Python-$version setuptools-40.6.2 pip-20.0.1
rm -r Python-$version setuptools-40.6.2 pip-20.0.1
# Install Go and glide
# Install Go and glide
WORKDIR /home
RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.8.1.linux-amd64.tar.gz | \
RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.8.1.linux-amd64.tar.gz | \
tar -xz -C /usr/local && \
tar -xz -C /usr/local && \
mkdir /root/gopath && \
mkdir /root/gopath && \
...
@@ -143,10 +138,7 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
...
@@ -143,10 +138,7 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
# version(1.7.1 for now), which causes building documentation failed.
# version(1.7.1 for now), which causes building documentation failed.
RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
RUN pip3.6 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.6 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.7 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3.7 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
...
@@ -155,37 +147,31 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
...
@@ -155,37 +147,31 @@ RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3.8 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3.8 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip3.8 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.8 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip3.8 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip3.8 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
pip --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
RUN pip3 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
RUN pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.6 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.6 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.7 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.7 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.8 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.8 --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip3.8 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip3.8 --no-cache-dir install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip --no-cache-dir install 'pre-commit==1.10.4' 'ipython==5.3.0' && \
pip --no-cache-dir install 'ipykernel==4.6.0'
pip --no-cache-dir install 'ipykernel==4.6.0'
'jupyter==1.0.0'
#For docstring checker
#For docstring checker
RUN pip3 --no-cache-dir install pylint pytest astroid isort && \
RUN pip3.6 --no-cache-dir install pylint pytest astroid isort && \
pip3.6 --no-cache-dir install pylint pytest astroid isort && \
pip3.7 --no-cache-dir install pylint pytest astroid isort && \
pip3.7 --no-cache-dir install pylint pytest astroid isort && \
pip3.8 --no-cache-dir install pylint pytest astroid isort && \
pip3.8 --no-cache-dir install pylint pytest astroid isort && \
pip --no-cache-dir install pylint pytest astroid isort
LinkChecker
pip --no-cache-dir install pylint pytest astroid isort
RUN pip3 --no-cache-dir install coverage && \
RUN pip3.6 --no-cache-dir install coverage && \
pip3.6 --no-cache-dir install coverage && \
pip3.7 --no-cache-dir install coverage && \
pip3.7 --no-cache-dir install coverage && \
pip3.8 --no-cache-dir install coverage && \
pip3.8 --no-cache-dir install coverage && \
pip --no-cache-dir install coverage
pip --no-cache-dir install coverage
COPY ./python/requirements.txt /root/
COPY ./python/requirements.txt /root/
RUN pip3 --no-cache-dir install -r /root/requirements.txt && \
RUN pip3.6 --no-cache-dir install -r /root/requirements.txt && \
pip3.6 --no-cache-dir install -r /root/requirements.txt && \
pip3.7 --no-cache-dir install -r /root/requirements.txt && \
pip3.7 --no-cache-dir install -r /root/requirements.txt && \
pip3.8 --no-cache-dir install -r /root/requirements.txt && \
pip3.8 --no-cache-dir install -r /root/requirements.txt && \
pip --no-cache-dir install -r /root/requirements.txt
pip --no-cache-dir install -r /root/requirements.txt
...
@@ -193,7 +179,9 @@ RUN pip3 --no-cache-dir install -r /root/requirements.txt && \
...
@@ -193,7 +179,9 @@ RUN pip3 --no-cache-dir install -r /root/requirements.txt && \
# To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
# To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
# the solution in https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
# the solution in https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
RUN apt-get install -y libssl-dev libffi-dev && apt-get clean -y && \
RUN apt-get install -y libssl-dev libffi-dev && apt-get clean -y && \
pip3 --no-cache-dir install certifi urllib3[secure] && \
pip3.6 install --upgrade pip && \
pip3.7 install --upgrade pip && \
pip3.8 install --upgrade pip && \
pip3.6 --no-cache-dir install certifi urllib3[secure] && \
pip3.6 --no-cache-dir install certifi urllib3[secure] && \
pip3.7 --no-cache-dir install certifi urllib3[secure] && \
pip3.7 --no-cache-dir install certifi urllib3[secure] && \
pip3.8 --no-cache-dir install certifi urllib3[secure] && \
pip3.8 --no-cache-dir install certifi urllib3[secure] && \
...
...
tools/dockerfile/build_scripts/build.sh
浏览文件 @
afa3720c
...
@@ -24,15 +24,13 @@ set -ex
...
@@ -24,15 +24,13 @@ set -ex
# remove others to expedite build and reduce docker image size. The original
# remove others to expedite build and reduce docker image size. The original
# manylinux docker image project builds many python versions.
# manylinux docker image project builds many python versions.
# NOTE We added back 3.5.1, since auditwheel requires python 3.3+
# NOTE We added back 3.5.1, since auditwheel requires python 3.3+
CPYTHON_VERSIONS
=
"3.8.0 3.7.0 3.6.0
3.5.1 2.7.15
"
CPYTHON_VERSIONS
=
"3.8.0 3.7.0 3.6.0"
# openssl version to build, with expected sha256 hash of .tar.gz
# openssl version to build, with expected sha256 hash of .tar.gz
# archive
# archive
OPENSSL_ROOT
=
openssl-1.0.2g
OPENSSL_ROOT
=
openssl-1.0.2g
OPENSSL_HASH
=
b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33
OPENSSL_HASH
=
b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33
PATCHELF_HASH
=
f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a
PATCHELF_HASH
=
f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a
CURL_ROOT
=
curl-7.49.1
CURL_HASH
=
eb63cec4bef692eab9db459033f409533e6d10e20942f4b060b32819e81885f1
AUTOCONF_ROOT
=
autoconf-2.69
AUTOCONF_ROOT
=
autoconf-2.69
AUTOCONF_HASH
=
954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969
AUTOCONF_HASH
=
954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969
...
@@ -79,7 +77,6 @@ build_openssl $OPENSSL_ROOT $OPENSSL_HASH
...
@@ -79,7 +77,6 @@ build_openssl $OPENSSL_ROOT $OPENSSL_HASH
mkdir
-p
/opt/python
mkdir
-p
/opt/python
build_cpythons
$CPYTHON_VERSIONS
build_cpythons
$CPYTHON_VERSIONS
PY35_BIN
=
/opt/python/cp35-cp35m/bin
PY36_BIN
=
/opt/python/cp36-cp36m/bin
PY36_BIN
=
/opt/python/cp36-cp36m/bin
PY37_BIN
=
/opt/python/cp37-cp37m/bin
PY37_BIN
=
/opt/python/cp37-cp37m/bin
PY38_BIN
=
/opt/python/cp38-cp38m/bin
PY38_BIN
=
/opt/python/cp38-cp38m/bin
...
@@ -87,25 +84,19 @@ PY38_BIN=/opt/python/cp38-cp38m/bin
...
@@ -87,25 +84,19 @@ PY38_BIN=/opt/python/cp38-cp38m/bin
# libpython, we need to add libpython's dir to LD_LIBRARY_PATH before running
# libpython, we need to add libpython's dir to LD_LIBRARY_PATH before running
# python.
# python.
ORIGINAL_LD_LIBRARY_PATH
=
"
${
LD_LIBRARY_PATH
}
"
ORIGINAL_LD_LIBRARY_PATH
=
"
${
LD_LIBRARY_PATH
}
"
LD_LIBRARY_PATH
=
"
${
ORIGINAL_LD_LIBRARY_PATH
}
:
$(
dirname
${
PY3
5_BIN
}
)
/lib:
$(
dirname
${
PY3
6_BIN
}
)
/lib:
$(
dirname
${
PY37_BIN
}
)
/lib:
$(
dirname
${
PY38_BIN
}
)
/lib"
LD_LIBRARY_PATH
=
"
${
ORIGINAL_LD_LIBRARY_PATH
}
:
$(
dirname
${
PY36_BIN
}
)
/lib:
$(
dirname
${
PY37_BIN
}
)
/lib:
$(
dirname
${
PY38_BIN
}
)
/lib"
# Our openssl doesn't know how to find the system CA trust store
# Our openssl doesn't know how to find the system CA trust store
# (https://github.com/pypa/manylinux/issues/53)
# (https://github.com/pypa/manylinux/issues/53)
# And it's not clear how up-to-date that is anyway
# And it's not clear how up-to-date that is anyway
# So let's just use the same one pip and everyone uses
# So let's just use the same one pip and everyone uses
LD_LIBRARY_PATH
=
"
${
ORIGINAL_LD_LIBRARY_PATH
}
:
$(
dirname
${
PY3
5_BIN
}
)
/lib"
$PY35
_BIN
/pip
install
certifi
LD_LIBRARY_PATH
=
"
${
ORIGINAL_LD_LIBRARY_PATH
}
:
$(
dirname
${
PY3
7_BIN
}
)
/lib"
$PY37
_BIN
/pip
install
certifi
ln
-s
$(
$PY3
5
_BIN
/python
-c
'import certifi; print(certifi.where())'
)
\
ln
-s
$(
$PY3
7
_BIN
/python
-c
'import certifi; print(certifi.where())'
)
\
/opt/_internal/certs.pem
/opt/_internal/certs.pem
# If you modify this line you also have to modify the versions in the
# If you modify this line you also have to modify the versions in the
# Dockerfiles:
# Dockerfiles:
export
SSL_CERT_FILE
=
/opt/_internal/certs.pem
export
SSL_CERT_FILE
=
/opt/_internal/certs.pem
# Install newest curl
build_curl
$CURL_ROOT
$CURL_HASH
rm
-rf
/usr/local/include/curl /usr/local/lib/libcurl
*
/usr/local/lib/pkgconfig/libcurl.pc
hash
-r
curl
--version
curl-config
--features
# Install patchelf (latest with unreleased bug fixes)
# Install patchelf (latest with unreleased bug fixes)
# FIXME(typhoonzero): restore this when the link is fixed.
# FIXME(typhoonzero): restore this when the link is fixed.
...
@@ -117,8 +108,8 @@ curl-config --features
...
@@ -117,8 +108,8 @@ curl-config --features
yum
install
-y
patchelf
yum
install
-y
patchelf
# Install latest pypi release of auditwheel
# Install latest pypi release of auditwheel
LD_LIBRARY_PATH
=
"
${
ORIGINAL_LD_LIBRARY_PATH
}
:
$(
dirname
${
PY35_BIN
}
)
/lib"
$PY35_BIN
/pip
install
auditwheel
#
LD_LIBRARY_PATH="${ORIGINAL_LD_LIBRARY_PATH}:$(dirname ${PY35_BIN})/lib" $PY35_BIN/pip install auditwheel
ln
-s
$PY35_BIN
/auditwheel /usr/local/bin/auditwheel
#
ln -s $PY35_BIN/auditwheel /usr/local/bin/auditwheel
# Clean up development headers and other unnecessary stuff for
# Clean up development headers and other unnecessary stuff for
# final image
# final image
...
...
tools/dockerfile/ci_dockerfile.sh
浏览文件 @
afa3720c
...
@@ -19,8 +19,14 @@ function make_ubuntu_dockerfile(){
...
@@ -19,8 +19,14 @@ function make_ubuntu_dockerfile(){
sed
"s/<baseimg>/10.1-cudnn7-devel-ubuntu16.04/g"
./Dockerfile.ubuntu
>
${
dockerfile_name
}
sed
"s/<baseimg>/10.1-cudnn7-devel-ubuntu16.04/g"
./Dockerfile.ubuntu
>
${
dockerfile_name
}
sed
-i
"s#liblzma-dev#liblzma-dev openmpi-bin openmpi-doc libopenmpi-dev#g"
${
dockerfile_name
}
sed
-i
"s#liblzma-dev#liblzma-dev openmpi-bin openmpi-doc libopenmpi-dev#g"
${
dockerfile_name
}
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
sed
-i
"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
&
&
\
sed
-i
"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
\&\
&
\
tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN apt remove git -y
\&\&
apt install -y libcurl4-openssl-dev gettext
\&\&
wget -q https://paddle-ci.gz.bcebos.com/git-2.17.1.tar.gz
\&\&
\
tar -xvf git-2.17.1.tar.gz
\&\&
\
cd git-2.17.1
\&\&
\
./configure --with-openssl --with-curl --prefix=/usr/local
\&\&
\
make -j8
\&\&
make install "
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN pip install wheel
\&\&
pip3 install PyGithub wheel
\&\&
pip3.7 install PyGithub "
${
dockerfile_name
}
sed
-i
"s#<install_gcc>#WORKDIR /usr/bin
\\
sed
-i
"s#<install_gcc>#WORKDIR /usr/bin
\\
COPY tools/dockerfile/build_scripts /build_scripts
\\
COPY tools/dockerfile/build_scripts /build_scripts
\\
RUN bash /build_scripts/install_gcc.sh gcc82
\&\&
rm -rf /build_scripts
\\
RUN bash /build_scripts/install_gcc.sh gcc82
\&\&
rm -rf /build_scripts
\\
...
@@ -30,9 +36,9 @@ function make_ubuntu_dockerfile(){
...
@@ -30,9 +36,9 @@ function make_ubuntu_dockerfile(){
RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/bin/gcc
\\
RUN ln -s /usr/local/gcc-8.2/bin/gcc /usr/bin/gcc
\\
RUN ln -s /usr/local/gcc-8.2/bin/g++ /usr/bin/g++
\\
RUN ln -s /usr/local/gcc-8.2/bin/g++ /usr/bin/g++
\\
ENV PATH=/usr/local/gcc-8.2/bin:
\$
PATH #g"
${
dockerfile_name
}
ENV PATH=/usr/local/gcc-8.2/bin:
\$
PATH #g"
${
dockerfile_name
}
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
\\
sed
-i
"s#bash /build_scripts/install_nccl2.sh#wget -
q -
-no-proxy https://nccl2-deb.cdn.bcebos.com/nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb
\\
RUN dpkg -i nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb
\\
RUN dpkg -i nccl-repo-ubuntu1604-2.7.8-ga-cuda10.1_1-1_amd64.deb
\\
RUN 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
}
RUN apt
update
\&\&
apt remove -y libnccl* --allow-change-held-packages
\&\&
apt-get install -y libnccl2=2.7.8-1+cuda10.1 libnccl-dev=2.7.8-1+cuda10.1 pigz
--allow-change-held-packages #g"
${
dockerfile_name
}
}
}
...
@@ -41,12 +47,16 @@ function make_centos_dockerfile(){
...
@@ -41,12 +47,16 @@ function make_centos_dockerfile(){
sed
"s/<baseimg>/11.0-cudnn8-devel-centos7/g"
Dockerfile.centos
>
${
dockerfile_name
}
sed
"s/<baseimg>/11.0-cudnn8-devel-centos7/g"
Dockerfile.centos
>
${
dockerfile_name
}
sed
-i
"s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g"
${
dockerfile_name
}
sed
-i
"s#COPY build_scripts /build_scripts#COPY tools/dockerfile/build_scripts ./build_scripts#g"
${
dockerfile_name
}
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
dockerfile_line
=
$(
wc
-l
${
dockerfile_name
}
|awk
'{print $1}'
)
sed
-i
"
${
dockerfile_line
}
i RUN rm -f /usr/bin/cc && ln -s /usr/local/gcc-8.2/bin/gcc /usr/bin/cc"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN yum install -y pigz graphviz"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN rm -f /usr/bin/cc && ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/cc"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN rm -f /usr/bin/g++ && ln -s /usr/local/gcc-5.4/bin/g++ /usr/bin/g++"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN rm -f /usr/bin/c++ && ln -s /usr/local/gcc-5.4/bin/c++ /usr/bin/c++"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN rm -f /usr/bin/gcc && ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/gcc"
${
dockerfile_name
}
sed
-i
"
${
dockerfile_line
}
i RUN ln -s /usr/lib64/libz.so /usr/local/lib/libz.so
\\
sed
-i
"
${
dockerfile_line
}
i RUN ln -s /usr/lib64/libz.so /usr/local/lib/libz.so
\\
RUN ln -s /usr/local/lib/libnccl.so /usr/local/cuda/lib64/"
${
dockerfile_name
}
RUN ln -s /usr/local/lib/libnccl.so /usr/local/cuda/lib64/"
${
dockerfile_name
}
sed
-i
$"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
\\
sed
-i
$"
${
dockerfile_line
}
i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz
\\
RUN tar -xzf
hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
RUN tar -xzf hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/"
${
dockerfile_name
}
sed
-i
"s#RUN bash build_scripts/build.sh#RUN bash build_scripts/install_gcc.sh gcc
82
\n
RUN mv /usr/bin/cc /usr/bin/cc.bak
\&\&
ln -s /usr/local/gcc-8.2/bin/gcc /usr/bin/cc
\n
ENV PATH=/usr/local/gcc-8.2
/bin:
\$
PATH
\n
RUN bash build_scripts/build.sh#g"
${
dockerfile_name
}
sed
-i
"s#RUN bash build_scripts/build.sh#RUN bash build_scripts/install_gcc.sh gcc
54
\n
RUN mv /usr/bin/cc /usr/bin/cc.bak
\&\&
ln -s /usr/local/gcc-5.4/bin/gcc /usr/bin/cc
\n
ENV PATH=/usr/local/gcc-5.4
/bin:
\$
PATH
\n
RUN bash build_scripts/build.sh#g"
${
dockerfile_name
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录