From 3b2a3f7f0fab1615013166b6574bf8f8a03a3b1b Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Wed, 31 Aug 2016 13:08:35 +0000
Subject: [PATCH 1/6] Init commit

---
 .gitignore | 0
 README.md  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..e69de29bb2

From 243a9a0c811c4be7fa3dcd86513534575b5c13c0 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 15 Nov 2016 13:31:22 +0800
Subject: [PATCH 2/6] Bumping up version number to v0.9.0a0

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7e7e49e9a..090ac9e188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 0b3)
+set(PADDLE_MINOR_VERSION 9)
+set(PADDLE_PATCH_VERSION 0a0)
 set(PADDLE_VERSION ${PADDLE_MAJOR_VERSION}.${PADDLE_MINOR_VERSION}.${PADDLE_PATCH_VERSION})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

From c60f57b6e33cccfd1cca8209d57741627dd7eacc Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 15 Nov 2016 15:53:41 +0800
Subject: [PATCH 3/6] Fix some problems in Debian build scripts.

* Mount local Paddle instead of git clone from remote.
* Use official chinese ubuntu source instead of 163 mirror.
---
 paddle/scripts/deb/build_scripts/build.sh     | 2 +-
 paddle/scripts/deb/build_scripts/build_deb.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paddle/scripts/deb/build_scripts/build.sh b/paddle/scripts/deb/build_scripts/build.sh
index 66a1cfb247..d13dea5148 100755
--- a/paddle/scripts/deb/build_scripts/build.sh
+++ b/paddle/scripts/deb/build_scripts/build.sh
@@ -1,12 +1,12 @@
 #!/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
diff --git a/paddle/scripts/deb/build_scripts/build_deb.sh b/paddle/scripts/deb/build_scripts/build_deb.sh
index 1331c1249d..c38c6299f8 100755
--- a/paddle/scripts/deb/build_scripts/build_deb.sh
+++ b/paddle/scripts/deb/build_scripts/build_deb.sh
@@ -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

From 4705083ee13b3827175502ac7b68c67bd3bc2e9f Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 15 Nov 2016 15:58:24 +0800
Subject: [PATCH 4/6] Update dockerfile tags

---
 paddle/scripts/docker/Dockerfile.cpu             | 2 +-
 paddle/scripts/docker/Dockerfile.cpu-demo        | 2 +-
 paddle/scripts/docker/Dockerfile.cpu-devel       | 2 +-
 paddle/scripts/docker/Dockerfile.cpu-noavx       | 2 +-
 paddle/scripts/docker/Dockerfile.cpu-noavx-demo  | 2 +-
 paddle/scripts/docker/Dockerfile.cpu-noavx-devel | 2 +-
 paddle/scripts/docker/Dockerfile.gpu             | 2 +-
 paddle/scripts/docker/Dockerfile.gpu-demo        | 2 +-
 paddle/scripts/docker/Dockerfile.gpu-devel       | 2 +-
 paddle/scripts/docker/Dockerfile.gpu-noavx       | 2 +-
 paddle/scripts/docker/Dockerfile.gpu-noavx-demo  | 2 +-
 paddle/scripts/docker/Dockerfile.gpu-noavx-devel | 2 +-
 paddle/scripts/docker/Dockerfile.m4              | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/paddle/scripts/docker/Dockerfile.cpu b/paddle/scripts/docker/Dockerfile.cpu
index a833c69c66..69b8363b7a 100644
--- a/paddle/scripts/docker/Dockerfile.cpu
+++ b/paddle/scripts/docker/Dockerfile.cpu
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.cpu-demo b/paddle/scripts/docker/Dockerfile.cpu-demo
index 1fda1e472b..ccbd183ee3 100644
--- a/paddle/scripts/docker/Dockerfile.cpu-demo
+++ b/paddle/scripts/docker/Dockerfile.cpu-demo
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.cpu-devel b/paddle/scripts/docker/Dockerfile.cpu-devel
index 66bdc978dd..36460384f3 100644
--- a/paddle/scripts/docker/Dockerfile.cpu-devel
+++ b/paddle/scripts/docker/Dockerfile.cpu-devel
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx b/paddle/scripts/docker/Dockerfile.cpu-noavx
index d0ba30e55a..fa3b7427b0 100644
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-demo b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
index 28439b4bdf..61315f762d 100644
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-devel b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
index eb4739d6dc..7636531199 100644
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
index fa61cfeec8..1e023ae281 100644
--- a/paddle/scripts/docker/Dockerfile.gpu
+++ b/paddle/scripts/docker/Dockerfile.gpu
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu-demo b/paddle/scripts/docker/Dockerfile.gpu-demo
index 4f5417c1af..92b0dca402 100644
--- a/paddle/scripts/docker/Dockerfile.gpu-demo
+++ b/paddle/scripts/docker/Dockerfile.gpu-demo
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu-devel b/paddle/scripts/docker/Dockerfile.gpu-devel
index 37cfced190..fb6f351fd2 100644
--- a/paddle/scripts/docker/Dockerfile.gpu-devel
+++ b/paddle/scripts/docker/Dockerfile.gpu-devel
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx b/paddle/scripts/docker/Dockerfile.gpu-noavx
index 95fb125b79..7567e62025 100644
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-demo b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
index b5fbe4b941..ac52484c5c 100644
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-devel b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
index 531c8ec7ae..19202f306b 100644
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
@@ -1,7 +1,7 @@
 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
diff --git a/paddle/scripts/docker/Dockerfile.m4 b/paddle/scripts/docker/Dockerfile.m4
index 57c8655844..e14493ed9e 100644
--- a/paddle/scripts/docker/Dockerfile.m4
+++ b/paddle/scripts/docker/Dockerfile.m4
@@ -1,7 +1,7 @@
 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

From 5b1ba8732013bd5b27c1a7b85df6ad250ad4e5ed Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Thu, 17 Nov 2016 14:25:05 +0800
Subject: [PATCH 5/6] Add version check for paddle

---
 paddle/scripts/submit_local.sh.in | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/paddle/scripts/submit_local.sh.in b/paddle/scripts/submit_local.sh.in
index 213cf2f1cc..583bf9b838 100644
--- a/paddle/scripts/submit_local.sh.in
+++ b/paddle/scripts/submit_local.sh.in
@@ -28,6 +28,25 @@ function version(){
         echo "    with_predict_sdk: @WITH_PREDICT_SDK@"
 }
 
+function ver2num() {
+  printf "%03d%03d%03d%03d" \
+    $(echo $1 | sed 's#v##g' | tr '.' ' ' \
+      | tr 'a' ' 0 ' | tr 'b' ' 1 ' | tr 'rc' ' 2 ')
+}
+
+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 )"
 

From 7b1d3c77c83ce8d8f611af9b9960082cd60eecda Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Thu, 17 Nov 2016 15:00:35 +0800
Subject: [PATCH 6/6] Refine ver2num function, add comments

---
 paddle/scripts/submit_local.sh.in | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/paddle/scripts/submit_local.sh.in b/paddle/scripts/submit_local.sh.in
index 583bf9b838..20ea2fedc4 100644
--- a/paddle/scripts/submit_local.sh.in
+++ b/paddle/scripts/submit_local.sh.in
@@ -29,16 +29,25 @@ function version(){
 }
 
 function ver2num() {
-  printf "%03d%03d%03d%03d" \
-    $(echo $1 | sed 's#v##g' | tr '.' ' ' \
-      | tr 'a' ' 0 ' | tr 'b' ' 1 ' | tr 'rc' ' 2 ')
+  # 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@\" }"\
+    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`