Skip to content

Commit b943176

Browse files
durgeshmfchollet
authored andcommitted
Update docker files to TensorFlow 1, Theano 0.9 (keras-team#6116)
- TensorFlow 1 - Theano 0.9 : also use "device=cuda" in theanorc to use new "gpuarray" backend - Miniconda 4.2.12 (latest conda installer with python 3.5) - Simplified pip install for tensorflow and keras test dependencies
1 parent f9c9c0a commit b943176

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

docker/Dockerfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ RUN mkdir -p $CONDA_DIR && \
77
echo export PATH=$CONDA_DIR/bin:'$PATH' > /etc/profile.d/conda.sh && \
88
apt-get update && \
99
apt-get install -y wget git libhdf5-dev g++ graphviz && \
10-
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-3.9.1-Linux-x86_64.sh && \
11-
echo "6c6b44acdd0bc4229377ee10d52c8ac6160c336d9cdd669db7371aa9344e1ac3 *Miniconda3-3.9.1-Linux-x86_64.sh" | sha256sum -c - && \
12-
/bin/bash /Miniconda3-3.9.1-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
13-
rm Miniconda3-3.9.1-Linux-x86_64.sh
10+
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh && \
11+
echo "c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a *Miniconda3-4.2.12-Linux-x86_64.sh" | sha256sum -c - && \
12+
/bin/bash /Miniconda3-4.2.12-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
13+
rm Miniconda3-4.2.12-Linux-x86_64.sh
1414

1515
ENV NB_USER keras
1616
ENV NB_UID 1000
@@ -24,13 +24,14 @@ RUN useradd -m -s /bin/bash -N -u $NB_UID $NB_USER && \
2424
USER keras
2525

2626
# Python
27-
ARG python_version=3.5.2
28-
ARG tensorflow_version=0.12.0rc0-cp35-cp35m
27+
ARG python_version=3.5
28+
2929
RUN conda install -y python=${python_version} && \
30-
pip install https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${tensorflow_version}-linux_x86_64.whl && \
31-
pip install git+git://github.com/Theano/Theano.git && \
32-
pip install ipdb pytest pytest-cov python-coveralls coverage==3.7.1 pytest-xdist pep8 pytest-pep8 pydot_ng && \
33-
conda install Pillow scikit-learn notebook pandas matplotlib nose pyyaml six h5py && \
30+
pip install --upgrade pip && \
31+
pip install tensorflow-gpu && \
32+
conda install Pillow scikit-learn notebook pandas matplotlib mkl nose pyyaml six h5py && \
33+
conda install theano pygpu && \
34+
git clone git://github.com/fchollet/keras.git /src && pip install -e /src[tests] && \
3435
pip install git+git://github.com/fchollet/keras.git && \
3536
conda clean -yt
3637

docker/theanorc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[global]
22
floatX = float32
33
optimizer=None
4-
device = gpu
4+
device = cuda
55

0 commit comments

Comments
 (0)