Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
606a8fd5
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
提交
606a8fd5
编写于
1月 10, 2020
作者:
Z
zhouwei25
提交者:
Tao Luo
1月 10, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update cmake from version 3.5.1 to 3.16.0 (#21970)
上级
f8516ccb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
10 deletion
+31
-10
Dockerfile
Dockerfile
+13
-1
tools/manylinux1/Dockerfile.GCC8
tools/manylinux1/Dockerfile.GCC8
+4
-4
tools/manylinux1/Dockerfile.Inference
tools/manylinux1/Dockerfile.Inference
+8
-1
tools/manylinux1/build_scripts/build.sh
tools/manylinux1/build_scripts/build.sh
+6
-4
未找到文件。
Dockerfile
浏览文件 @
606a8fd5
...
@@ -36,6 +36,17 @@ RUN rm g++
...
@@ -36,6 +36,17 @@ RUN rm g++
RUN
ln
-s
gcc-4.8 gcc
RUN
ln
-s
gcc-4.8 gcc
RUN
ln
-s
g++-4.8 g++
RUN
ln
-s
g++-4.8 g++
# Install cmake3.16.0
RUN
mkdir
-p
/root/cmake_build
&&
wget
-q
https://cmake.org/files/v3.16/cmake-3.16.0.tar.gz
&&
\
tar
-zxvf
cmake-3.16.0.tar.gz
&&
rm
cmake-3.16.0.tar.gz
&&
\
cd
cmake-3.16.0
&&
./bootstrap
>
/dev/null
&&
\
make
-j8
>
/dev/null
&&
make
install
>
/dev/null
&&
\
ln
-s
/usr/local/bin/cmake /usr/bin/cmake
ENV
PATH=/usr/local/bin:$PATH
RUN
rm
-r
/root/cmake_build
# Install Python3.6
# Install Python3.6
RUN
mkdir
-p
/root/python_build/
&&
wget
-q
https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz
&&
\
RUN
mkdir
-p
/root/python_build/
&&
wget
-q
https://www.sqlite.org/2018/sqlite-autoconf-3250300.tar.gz
&&
\
tar
-zxf
sqlite-autoconf-3250300.tar.gz
&&
cd
sqlite-autoconf-3250300
&&
\
tar
-zxf
sqlite-autoconf-3250300.tar.gz
&&
cd
sqlite-autoconf-3250300
&&
\
...
@@ -61,7 +72,7 @@ RUN apt-get update && \
...
@@ -61,7 +72,7 @@ RUN apt-get update && \
wget unzip unrar
tar
xz-utils bzip2
gzip
coreutils ntp
\
wget unzip unrar
tar
xz-utils bzip2
gzip
coreutils ntp
\
curl
sed grep
graphviz libjpeg-dev zlib1g-dev
\
curl
sed grep
graphviz libjpeg-dev zlib1g-dev
\
python-matplotlib gcc-4.8 g++-4.8
\
python-matplotlib gcc-4.8 g++-4.8
\
automake locales clang-format swig
cmake
\
automake locales clang-format swig
\
liblapack-dev liblapacke-dev
\
liblapack-dev liblapacke-dev
\
clang-3.8 llvm-3.8 libclang-3.8-dev
\
clang-3.8 llvm-3.8 libclang-3.8-dev
\
net-tools libtool ccache
&&
\
net-tools libtool ccache
&&
\
...
@@ -76,6 +87,7 @@ WORKDIR /home/Python-$version
...
@@ -76,6 +87,7 @@ WORKDIR /home/Python-$version
RUN
./configure
--enable-unicode
=
ucs4
--enable-shared
CFLAGS
=
-fPIC
--prefix
=
/usr/local/python2.7.15
RUN
./configure
--enable-unicode
=
ucs4
--enable-shared
CFLAGS
=
-fPIC
--prefix
=
/usr/local/python2.7.15
RUN
make
&&
make
install
RUN
make
&&
make
install
RUN
echo
"export PATH=/usr/local/bin:
${
PATH
}
"
>>
~/.bashrc
RUN
echo
"export PATH=/usr/local/python2.7.15/include:
${
PATH
}
"
>>
~/.bashrc
RUN
echo
"export PATH=/usr/local/python2.7.15/include:
${
PATH
}
"
>>
~/.bashrc
RUN
echo
"export PATH=/usr/local/python2.7.15/bin:
${
PATH
}
"
>>
~/.bashrc
RUN
echo
"export PATH=/usr/local/python2.7.15/bin:
${
PATH
}
"
>>
~/.bashrc
RUN
echo
"export LD_LIBRARY_PATH=/usr/local/python2.7.15/lib:
${
LD_LIBRARY_PATH
}
"
>>
~/.bashrc
RUN
echo
"export LD_LIBRARY_PATH=/usr/local/python2.7.15/lib:
${
LD_LIBRARY_PATH
}
"
>>
~/.bashrc
...
...
tools/manylinux1/Dockerfile.GCC8
浏览文件 @
606a8fd5
...
@@ -27,10 +27,10 @@ RUN apt-get install -y python-dev python-pip wget vim git
...
@@ -27,10 +27,10 @@ RUN apt-get install -y python-dev python-pip wget vim git
# install cmake
# install cmake
WORKDIR /home
WORKDIR /home
RUN wget -q https://cmake.org/files/v3.1
0/cmake-3.10
.0-Linux-x86_64.tar.gz
RUN wget -q https://cmake.org/files/v3.1
6/cmake-3.16
.0-Linux-x86_64.tar.gz
RUN tar -
xvf cmake-3.10
.0-Linux-x86_64.tar.gz
RUN tar -
zxvf cmake-3.16
.0-Linux-x86_64.tar.gz
RUN apt install libidn11
RUN apt install libidn11
ENV PATH=/home/cmake-3.1
0
.0-Linux-x86_64/bin:$PATH
ENV PATH=/home/cmake-3.1
6
.0-Linux-x86_64/bin:$PATH
WORKDIR /usr/bin
WORKDIR /usr/bin
RUN wget -q http://mirror.linux-ia64.org/gnu/gcc/releases/gcc-8.2.0/gcc-8.2.0.tar.xz && \
RUN wget -q http://mirror.linux-ia64.org/gnu/gcc/releases/gcc-8.2.0/gcc-8.2.0.tar.xz && \
tar -xvf gcc-8.2.0.tar.xz && \
tar -xvf gcc-8.2.0.tar.xz && \
...
@@ -75,7 +75,7 @@ RUN apt-get update && \
...
@@ -75,7 +75,7 @@ RUN apt-get update && \
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
curl sed grep graphviz libjpeg-dev zlib1g-dev \
curl sed grep graphviz libjpeg-dev zlib1g-dev \
python-matplotlib \
python-matplotlib \
automake locales clang-format swig
cmake
\
automake locales clang-format swig \
liblapack-dev liblapacke-dev \
liblapack-dev liblapacke-dev \
net-tools libtool ccache module-init-tools && \
net-tools libtool ccache module-init-tools && \
apt-get clean -y
apt-get clean -y
...
...
tools/manylinux1/Dockerfile.Inference
浏览文件 @
606a8fd5
...
@@ -61,12 +61,19 @@ RUN apt-get update && \
...
@@ -61,12 +61,19 @@ RUN apt-get update && \
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
curl sed grep graphviz libjpeg-dev zlib1g-dev \
curl sed grep graphviz libjpeg-dev zlib1g-dev \
python-matplotlib gcc-4.8 g++-4.8 \
python-matplotlib gcc-4.8 g++-4.8 \
automake locales clang-format swig
cmake
\
automake locales clang-format swig \
liblapack-dev liblapacke-dev \
liblapack-dev liblapacke-dev \
clang-3.8 llvm-3.8 libclang-3.8-dev \
clang-3.8 llvm-3.8 libclang-3.8-dev \
net-tools libtool ccache && \
net-tools libtool ccache && \
apt-get clean -y
apt-get clean -y
# install cmake
WORKDIR /home
RUN wget -q https://cmake.org/files/v3.16/cmake-3.16.0-Linux-x86_64.tar.gz
RUN tar -zxvf cmake-3.16.0-Linux-x86_64.tar.gz
RUN rm cmake-3.16.0-Linux-x86_64.tar.gz
ENV PATH=/home/cmake-3.16.0-Linux-x86_64/bin:$PATH
# Install Python2.7.15 to replace original python
# Install Python2.7.15 to replace original python
WORKDIR /home
WORKDIR /home
ENV version=2.7.15
ENV version=2.7.15
...
...
tools/manylinux1/build_scripts/build.sh
浏览文件 @
606a8fd5
...
@@ -59,10 +59,12 @@ yum -y install bzip2 make git patch unzip bison yasm diffutils \
...
@@ -59,10 +59,12 @@ yum -y install bzip2 make git patch unzip bison yasm diffutils \
# /bin/sh cmake-3.8.1-Linux-x86_64.sh --prefix=/usr/local --skip-license
# /bin/sh cmake-3.8.1-Linux-x86_64.sh --prefix=/usr/local --skip-license
# rm cmake-3.8.1-Linux-x86_64.sh
# rm cmake-3.8.1-Linux-x86_64.sh
wget
-q
https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz
&&
tar
xzf cmake-3.5.2.tar.gz
&&
\
wget
-q
https://cmake.org/files/v3.16/cmake-3.16.0.tar.gz
cd
cmake-3.5.2
&&
./bootstrap
&&
\
tar
-zxvf
cmake-3.16.0.tar.gz
&&
rm
cmake-3.16.0.tar.gz
make
-j8
&&
make
install
&&
cd
..
&&
rm
cmake-3.5.2.tar.gz
cd
cmake-3.16.0
&&
./bootstrap
make
-j
`
nproc
`
&&
make
install
ln
-s
/usr/local/bin/cmake /usr/bin/cmake
PATH
=
/usr/local/bin:
$PATH
# Install newest autoconf
# Install newest autoconf
build_autoconf
$AUTOCONF_ROOT
$AUTOCONF_HASH
build_autoconf
$AUTOCONF_ROOT
$AUTOCONF_HASH
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录