Skip to content

Commit

Permalink
Merge pull request PaddlePaddle#476 from reyoung/release/v0.9.0
Browse files Browse the repository at this point in the history 
Fix some install package errors.
  • Loading branch information
@gangliao
gangliao authored Nov 15, 2016
2 parents 82fafb7 + 4705083 commit c7641cc
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion paddle/scripts/deb/build_scripts/build.sh
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/deb/build_scripts/build_deb.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu-demo
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu-devel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu-noavx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu-noavx-demo
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.cpu-noavx-devel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu-demo
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu-devel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu-noavx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu-noavx-demo
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.gpu-noavx-devel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
2 changes: 1 addition & 1 deletion paddle/scripts/docker/Dockerfile.m4
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM PADDLE_BASE_IMAGE
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down

0 comments on commit c7641cc

Please sign in to comment.