Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
5a67a04e
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,发现更多精彩内容 >>
提交
5a67a04e
编写于
11月 17, 2016
作者:
G
gangliao
提交者:
GitHub
11月 17, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #511 from baidu/release/v0.9.0
Sync Release Branch => Develop
上级
d0a908d5
6146a2eb
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
45 addition
and
17 deletion
+45
-17
CMakeLists.txt
CMakeLists.txt
+2
-2
paddle/scripts/deb/build_scripts/build.sh
paddle/scripts/deb/build_scripts/build.sh
+1
-1
paddle/scripts/deb/build_scripts/build_deb.sh
paddle/scripts/deb/build_scripts/build_deb.sh
+1
-1
paddle/scripts/docker/Dockerfile.cpu
paddle/scripts/docker/Dockerfile.cpu
+1
-1
paddle/scripts/docker/Dockerfile.cpu-demo
paddle/scripts/docker/Dockerfile.cpu-demo
+1
-1
paddle/scripts/docker/Dockerfile.cpu-devel
paddle/scripts/docker/Dockerfile.cpu-devel
+1
-1
paddle/scripts/docker/Dockerfile.cpu-noavx
paddle/scripts/docker/Dockerfile.cpu-noavx
+1
-1
paddle/scripts/docker/Dockerfile.cpu-noavx-demo
paddle/scripts/docker/Dockerfile.cpu-noavx-demo
+1
-1
paddle/scripts/docker/Dockerfile.cpu-noavx-devel
paddle/scripts/docker/Dockerfile.cpu-noavx-devel
+1
-1
paddle/scripts/docker/Dockerfile.gpu
paddle/scripts/docker/Dockerfile.gpu
+1
-1
paddle/scripts/docker/Dockerfile.gpu-demo
paddle/scripts/docker/Dockerfile.gpu-demo
+1
-1
paddle/scripts/docker/Dockerfile.gpu-devel
paddle/scripts/docker/Dockerfile.gpu-devel
+1
-1
paddle/scripts/docker/Dockerfile.gpu-noavx
paddle/scripts/docker/Dockerfile.gpu-noavx
+1
-1
paddle/scripts/docker/Dockerfile.gpu-noavx-demo
paddle/scripts/docker/Dockerfile.gpu-noavx-demo
+1
-1
paddle/scripts/docker/Dockerfile.gpu-noavx-devel
paddle/scripts/docker/Dockerfile.gpu-noavx-devel
+1
-1
paddle/scripts/docker/Dockerfile.m4
paddle/scripts/docker/Dockerfile.m4
+1
-1
paddle/scripts/submit_local.sh.in
paddle/scripts/submit_local.sh.in
+28
-0
未找到文件。
CMakeLists.txt
浏览文件 @
5a67a04e
...
...
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)
project
(
paddle CXX C
)
set
(
PADDLE_MAJOR_VERSION 0
)
set
(
PADDLE_MINOR_VERSION
8
)
set
(
PADDLE_PATCH_VERSION 0
b3
)
set
(
PADDLE_MINOR_VERSION
9
)
set
(
PADDLE_PATCH_VERSION 0
a0
)
set
(
PADDLE_VERSION
${
PADDLE_MAJOR_VERSION
}
.
${
PADDLE_MINOR_VERSION
}
.
${
PADDLE_PATCH_VERSION
}
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
CMAKE_SOURCE_DIR
}
/cmake"
)
...
...
paddle/scripts/deb/build_scripts/build.sh
浏览文件 @
5a67a04e
#!/bin/bash
set
-e
apt-get update
apt-get
install
-y
dh-make
cd
~
mkdir
-p
~/dist/gpu
mkdir
-p
~/dist/cpu
mkdir
-p
~/dist/cpu-noavx
mkdir
-p
~/dist/gpu-noavx
git clone https://github.com/baidu/Paddle.git paddle
cd
paddle
mkdir
build
cd
build
...
...
paddle/scripts/deb/build_scripts/build_deb.sh
浏览文件 @
5a67a04e
...
...
@@ -3,6 +3,6 @@ set -e
docker build
-t
build_paddle_deb
.
rm
-rf
dist
mkdir
-p
dist
docker run
-v
$PWD
/dist:/root/dist
--name
tmp_build_deb_container build_paddle_deb
docker run
-v
$PWD
/dist:/root/dist
-
v
$PWD
/../../../..:/root/paddle
-
-name
tmp_build_deb_container build_paddle_deb
docker
rm
tmp_build_deb_container
docker rmi build_paddle_deb
paddle/scripts/docker/Dockerfile.cpu
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.cpu-demo
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
...
...
paddle/scripts/docker/Dockerfile.cpu-devel
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.cpu-noavx
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.cpu-noavx-demo
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
...
...
paddle/scripts/docker/Dockerfile.cpu-noavx-devel
浏览文件 @
5a67a04e
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.gpu
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.gpu-demo
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
...
...
paddle/scripts/docker/Dockerfile.gpu-devel
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.gpu-noavx
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.gpu-noavx-demo
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
...
...
paddle/scripts/docker/Dockerfile.gpu-noavx-devel
浏览文件 @
5a67a04e
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
...
...
paddle/scripts/docker/Dockerfile.m4
浏览文件 @
5a67a04e
FROM PADDLE_BASE_IMAGE
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/
ENV GIT_CHECKOUT=
develop
ENV GIT_CHECKOUT=
v0.9.0a0
ENV WITH_GPU=PADDLE_WITH_GPU
ENV IS_DEVEL=PADDLE_IS_DEVEL
ENV WITH_DEMO=PADDLE_WITH_DEMO
...
...
paddle/scripts/submit_local.sh.in
浏览文件 @
5a67a04e
...
...
@@ -28,6 +28,34 @@ function version(){
echo
" with_predict_sdk: @WITH_PREDICT_SDK@"
}
function
ver2num
()
{
# convert version to number.
if
[
-z
"
$1
"
]
;
then
# empty argument
printf
"%03d%03d%03d%03d%03d"
0
else
local
VERN
=
$(
echo
$1
|
sed
's#v##g'
|
sed
's#\.# #g'
\
|
sed
's#a# 0 #g'
|
sed
's#b# 1 #g'
|
sed
's#rc# 2 #g'
)
if
[
`
echo
$VERN
|
wc
-w
`
-eq
3
]
;
then
printf
"%03d%03d%03d%03d%03d"
$VERN
999 999
else
printf
"%03d%03d%03d%03d%03d"
$VERN
fi
fi
}
PADDLE_CONF_HOME
=
"
$HOME
/.config/paddle"
mkdir
-p
${
PADDLE_CONF_HOME
}
if
[
-z
"
${
PADDLE_NO_STAT
+x
}
"
]
;
then
SERVER_VER
=
`
curl
-m
5
-X
POST
--data
content
=
"{
\"
version
\"
:
\"
@PADDLE_VERSION@
\"
}"
\
-b
${
PADDLE_CONF_HOME
}
/paddle.cookie
\
-c
${
PADDLE_CONF_HOME
}
/paddle.cookie
\
http://api.paddlepaddle.org/version 2>/dev/null
`
if
[
$?
-eq
0
]
&&
[
"
$(
ver2num @PADDLE_VERSION@
)
"
-lt
$(
ver2num
$SERVER_VER
)
]
;
then
echo
"Paddle release a new version
${
SERVER_VER
}
, you can get the install package in http://www.paddlepaddle.org"
fi
fi
MYDIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录