Add NOAVX Docker image scripts. (#129)

reyoung · emailweixu · commit baaaa0b09df7 · 2016-09-28T09:51:05.000-07:00
* Add noavx to docker
* Not to use directory to split Docker image.
diff --git a/paddle/scripts/docker/Dockerfile.cpu b/paddle/scripts/docker/Dockerfile.cpu
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-demo b/paddle/scripts/docker/Dockerfile.cpu-demo
@@ -7,4 +7,5 @@ ENV WITH_DEMO=ON
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-devel b/paddle/scripts/docker/Dockerfile.cpu-devel
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx b/paddle/scripts/docker/Dockerfile.cpu-noavx
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=OFF
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-demo b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=ON
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.cpu-noavx-devel b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=OFF
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-demo b/paddle/scripts/docker/Dockerfile.gpu-demo
@@ -7,4 +7,5 @@ ENV WITH_DEMO=ON
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-devel b/paddle/scripts/docker/Dockerfile.gpu-devel
@@ -7,4 +7,5 @@ ENV WITH_DEMO=OFF
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=ON
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx b/paddle/scripts/docker/Dockerfile.gpu-noavx
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=OFF
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-demo b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=ON
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.gpu-noavx-devel b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
@@ -0,0 +1,11 @@
+FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
+MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
+COPY build.sh /root/
+ENV WITH_GPU=ON
+ENV IS_DEVEL=ON
+ENV WITH_DEMO=OFF
+ENV PIP_INSTALL_ARGS ""
+ENV PIP_GENERAL_ARGS ""
+ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=OFF
+RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/Dockerfile.m4 b/paddle/scripts/docker/Dockerfile.m4
@@ -7,4 +7,5 @@ ENV WITH_DEMO=PADDLE_WITH_DEMO
 ENV PIP_INSTALL_ARGS ""
 ENV PIP_GENERAL_ARGS ""
 ENV USE_UBUNTU_MIRROR OFF
+ENV WITH_AVX=PADDLE_WITH_AVX
 RUN cd /root/ && bash build.sh
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
@@ -26,7 +26,7 @@ cd paddle
 mkdir build
 cd build
 cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\
-   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF
+   -DCUDNN_ROOT=/usr/ -DWITH_STYLE_CHECK=OFF -DWITH_AVX=${WITH_AVX}
 make -j `nproc`
 # because durning make install, there are several warning, so set +e, do not cause abort
 make install
diff --git a/paddle/scripts/docker/cpu-demo/build.sh b/paddle/scripts/docker/cpu-demo/build.sh
diff --git a/paddle/scripts/docker/cpu-devel/build.sh b/paddle/scripts/docker/cpu-devel/build.sh
diff --git a/paddle/scripts/docker/cpu/build.sh b/paddle/scripts/docker/cpu/build.sh
diff --git a/paddle/scripts/docker/generate.sh b/paddle/scripts/docker/generate.sh
@@ -2,33 +2,60 @@
 set -e
 cd `dirname $0`
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu/Dockerfile
-cp build.sh cpu/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu-devel/Dockerfile
-cp build.sh cpu-devel/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx-devel
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu-devel
+
 
 m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
-   -DPADDLE_BASE_IMAGE=ubuntu:14.04\
-   Dockerfile.m4 > cpu-demo/Dockerfile
-cp build.sh cpu-demo/
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=ON\
+   Dockerfile.m4 > Dockerfile.cpu-demo
+
+m4 -DPADDLE_WITH_GPU=OFF -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
+   -DPADDLE_BASE_IMAGE=ubuntu:14.04 -DPADDLE_WITH_AVX=OFF\
+   Dockerfile.m4 > Dockerfile.cpu-noavx-demo
+
+
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=OFF -DPADDLE_WITH_DEMO=OFF \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu/Dockerfile
-cp build.sh gpu/
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx
+
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu-devel/Dockerfile
-cp build.sh gpu-devel/
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu-devel
+
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=OFF \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx-devel
 
 m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
    -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
-   Dockerfile.m4 > gpu-demo/Dockerfile
-cp build.sh gpu-demo/
+   -DPADDLE_WITH_AVX=ON \
+   Dockerfile.m4 > Dockerfile.gpu-demo
+
 
+m4 -DPADDLE_WITH_GPU=ON -DPADDLE_IS_DEVEL=ON -DPADDLE_WITH_DEMO=ON \
+   -DPADDLE_BASE_IMAGE=nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04 \
+   -DPADDLE_WITH_AVX=OFF \
+   Dockerfile.m4 > Dockerfile.gpu-noavx-demo
 
diff --git a/paddle/scripts/docker/gpu-demo/build.sh b/paddle/scripts/docker/gpu-demo/build.sh
diff --git a/paddle/scripts/docker/gpu-devel/build.sh b/paddle/scripts/docker/gpu-devel/build.sh
diff --git a/paddle/scripts/docker/gpu/build.sh b/paddle/scripts/docker/gpu/build.sh
