提交 5a67a04e 编写于 作者: G gangliao 提交者: GitHub

Merge pull request #511 from baidu/release/v0.9.0

Sync Release Branch => Develop
...@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)
project(paddle CXX C) project(paddle CXX C)
set(PADDLE_MAJOR_VERSION 0) set(PADDLE_MAJOR_VERSION 0)
set(PADDLE_MINOR_VERSION 8) set(PADDLE_MINOR_VERSION 9)
set(PADDLE_PATCH_VERSION 0b3) set(PADDLE_PATCH_VERSION 0a0)
set(PADDLE_VERSION ${PADDLE_MAJOR_VERSION}.${PADDLE_MINOR_VERSION}.${PADDLE_PATCH_VERSION}) set(PADDLE_VERSION ${PADDLE_MAJOR_VERSION}.${PADDLE_MINOR_VERSION}.${PADDLE_PATCH_VERSION})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
......
#!/bin/bash #!/bin/bash
set -e set -e
apt-get update
apt-get install -y dh-make apt-get install -y dh-make
cd ~ cd ~
mkdir -p ~/dist/gpu mkdir -p ~/dist/gpu
mkdir -p ~/dist/cpu mkdir -p ~/dist/cpu
mkdir -p ~/dist/cpu-noavx mkdir -p ~/dist/cpu-noavx
mkdir -p ~/dist/gpu-noavx mkdir -p ~/dist/gpu-noavx
git clone https://github.com/baidu/Paddle.git paddle
cd paddle cd paddle
mkdir build mkdir build
cd build cd build
......
...@@ -3,6 +3,6 @@ set -e ...@@ -3,6 +3,6 @@ set -e
docker build -t build_paddle_deb . docker build -t build_paddle_deb .
rm -rf dist rm -rf dist
mkdir -p 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 rm tmp_build_deb_container
docker rmi build_paddle_deb docker rmi build_paddle_deb
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=ON ENV WITH_DEMO=ON
......
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=ON ENV WITH_DEMO=ON
......
FROM ubuntu:14.04 FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=OFF ENV WITH_GPU=OFF
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=OFF ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=ON ENV WITH_DEMO=ON
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=OFF ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=ON ENV WITH_DEMO=ON
......
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=ON ENV WITH_GPU=ON
ENV IS_DEVEL=ON ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF ENV WITH_DEMO=OFF
......
FROM PADDLE_BASE_IMAGE FROM PADDLE_BASE_IMAGE
MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com> MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
COPY build.sh /root/ COPY build.sh /root/
ENV GIT_CHECKOUT=develop ENV GIT_CHECKOUT=v0.9.0a0
ENV WITH_GPU=PADDLE_WITH_GPU ENV WITH_GPU=PADDLE_WITH_GPU
ENV IS_DEVEL=PADDLE_IS_DEVEL ENV IS_DEVEL=PADDLE_IS_DEVEL
ENV WITH_DEMO=PADDLE_WITH_DEMO ENV WITH_DEMO=PADDLE_WITH_DEMO
......
...@@ -28,6 +28,34 @@ function version(){ ...@@ -28,6 +28,34 @@ function version(){
echo " with_predict_sdk: @WITH_PREDICT_SDK@" 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 )" MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册