Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
5f41d281
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5f41d281
编写于
4月 24, 2017
作者:
R
reyoung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make docker build use deb package.
上级
22e848ec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
16 deletion
+31
-16
cmake/package.cmake
cmake/package.cmake
+1
-1
paddle/scripts/docker/build.sh
paddle/scripts/docker/build.sh
+26
-15
python/setup.py.in
python/setup.py.in
+4
-0
未找到文件。
cmake/package.cmake
浏览文件 @
5f41d281
...
...
@@ -10,7 +10,7 @@ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
set
(
CPACK_DEBIAN_PACKAGE_MAINTAINER PaddlePaddle Dev <paddle-dev@baidu.com>
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Paddle"
)
set
(
CPACK_PACKAGE_DESCRIPTION
""
)
set
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"libpython2.7, libstdc++6, python-pip, curl"
)
set
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"libpython2.7, libstdc++6, python-pip, curl
, libgfortran3, python-pip-whl
"
)
set
(
CPACK_DEBIAN_PACKAGE_SECTION Devel
)
set
(
CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"
${
PROJ_ROOT
}
/paddle/scripts/deb/postinst"
)
#set(CPACK_GENERATOR "DEB")
...
...
paddle/scripts/docker/build.sh
浏览文件 @
5f41d281
...
...
@@ -44,10 +44,7 @@ fi
make
install
# generate deb package for current build
# FIXME(typhoonzero): should we remove paddle/scripts/deb ?
# FIXME: CPACK_DEBIAN_PACKAGE_DEPENDS removes all dev dependencies, must
# install them in docker
cpack
-D
CPACK_GENERATOR
=
'DEB'
-D
CPACK_DEBIAN_PACKAGE_DEPENDS
=
""
..
cpack
-D
CPACK_GENERATOR
=
'DEB'
..
if
[[
${
WOBOQ
:-
OFF
}
==
'ON'
]]
;
then
apt-get
install
-y
clang-3.8 llvm-3.8 libclang-3.8-dev
...
...
@@ -76,9 +73,9 @@ fi
paddle version
if
[[
-n
${
APT_MIRROR
}
]]
;
then
MIRROR_UPDATE
=
"sed -i '
${
APT_MIRROR
}
' /etc/apt/sources.list
&&
\\
"
MIRROR_UPDATE
=
"sed -i '
${
APT_MIRROR
}
' /etc/apt/sources.list"
else
MIRROR_UPDATE
=
"
\\
"
MIRROR_UPDATE
=
""
fi
cat
>
/paddle/build/Dockerfile
<<
EOF
...
...
@@ -87,18 +84,32 @@ MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
ENV HOME /root
ENV LANG en_US.UTF-8
# Use Fix locales to en_US.UTF-8
EOF
if
[[
-n
${
MIRROR_UPDATE
}
]]
;
then
cat
>>
/paddle/build/Dockerfile
<<
EOF
RUN
${
MIRROR_UPDATE
}
apt-get update &&
\
apt-get install -y libgfortran3 libpython2.7
${
GPU_DOCKER_PKG
}
&&
\
apt-get clean -y &&
\
pip install --upgrade pip &&
\
pip install -U 'protobuf==3.1.0' requests numpy
EOF
fi
if
[[
-n
${
GPU_DOCKER_PKG
}
]]
;
then
cat
>>
/paddle/build/Dockerfile
<<
EOF
RUN apt-get update &&
\
apt-get install -y
${
GPU_DOCKER_PKG
}
&&
\
apt-get clean -y
EOF
fi
cat
>>
/paddle/build/Dockerfile
<<
EOF
RUN pip install --upgrade pip
# Use different deb file when building different type of images
ADD build/*.deb /
usr/local/opt/paddle/deb/
ADD build/*.deb /
# run paddle version to install python packages first
RUN dpkg -i /usr/local/opt/paddle/deb/*.deb &&
\
apt-get -f &&
\
rm -f /usr/local/opt/paddle/deb/*.deb &&
\
RUN apt-get update &&
\
dpkg -i /*.deb ; apt-get install -f -y &&
\
apt-get clean -y &&
\
rm -f /*.deb &&
\
pip install /usr/opt/paddle/share/wheels/*.whl &&
\
paddle version
${
CPU_DOCKER_PYTHON_HOME_ENV
}
...
...
python/setup.py.in
浏览文件 @
5f41d281
...
...
@@ -14,6 +14,10 @@ setup(name='paddle',
version='${PADDLE_VERSION}',
description='Parallel Distributed Deep Learning',
packages=packages,
install_requires=[
"numpy",
"protobuf==3.1.0"
],
package_dir={
'': '${CMAKE_CURRENT_SOURCE_DIR}'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录