Skip to content

Commit

Permalink
use nvidia/cuda:10.1-base-ubuntu18.04 as base image
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristophSchranz committed Sep 1, 2020
1 parent 73d4188 commit e5eb8f6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
14 changes: 4 additions & 10 deletions .build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# Use NVIDIA CUDA as base image and run the same installation as in the other packages.
# The version of cudatoolkit must match those of the base image, see Dockerfile.pytorch
FROM nvidia/cuda:10.1-base-ubuntu18.04
LABEL maintainer="Christoph Schranz <[email protected]>"
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
LABEL authors="Christoph Schranz <[email protected]>, Mathematical Michael <[email protected]>"
# This is a concatenated Dockerfile, the maintainers of subsequent sections may vary.
RUN chmod 1777 /tmp && chmod 1777 /var/tmp

Expand Down Expand Up @@ -41,7 +41,6 @@ RUN apt-get update \
locales \
fonts-liberation \
run-one \
openssh-client \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
Expand Down Expand Up @@ -385,11 +384,6 @@ LABEL maintainer="Christoph Schranz <[email protected]>"

# Install Tensorflow, check compatibility here: https://www.tensorflow.org/install/gpu
# installation via conda leads to errors in version 4.8.2
#RUN conda install --quiet --yes \
# 'tensorflow-gpu=2.1*' \
# 'keras-gpu' && \
# fix-permissions $CONDA_DIR && \
# fix-permissions /home/$NB_USER
RUN pip install --upgrade pip && \
pip install --no-cache-dir "tensorflow-gpu>=2.1.*" && \
pip install --no-cache-dir keras
Expand All @@ -414,7 +408,7 @@ RUN conda clean --all -f -y && \
############################ Useful packages ###############################
############################################################################

LABEL maintainer="Christoph Schranz <[email protected]>"
LABEL authors="Christoph Schranz <[email protected]>, Mathematical Michael <[email protected]>"

USER root

Expand All @@ -432,7 +426,7 @@ RUN set -ex \
graphviz==0.11 \
' \
&& apt-get update \
&& apt-get -y install htop apt-utils graphviz libgraphviz-dev \
&& apt-get -y install htop apt-utils graphviz libgraphviz-dev openssh-client \
&& pip install --no-cache-dir $buildDeps

# Install various extensions
Expand Down
8 changes: 0 additions & 8 deletions src/Dockerfile.gpulibs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ LABEL maintainer="Christoph Schranz <[email protected]>"

# Install Tensorflow, check compatibility here: https://www.tensorflow.org/install/gpu
# installation via conda leads to errors in version 4.8.2
#RUN conda install --quiet --yes \
# 'tensorflow-gpu=2.1*' \
# 'keras-gpu' && \
# fix-permissions $CONDA_DIR && \
# fix-permissions /home/$NB_USER
RUN pip install --upgrade pip && \
pip install --no-cache-dir "tensorflow-gpu>=2.1.*" && \
pip install --no-cache-dir keras
Expand All @@ -15,9 +10,6 @@ RUN pip install --upgrade pip && \
RUN conda install --quiet --yes \
pyyaml mkl mkl-include setuptools cmake cffi typing

# Deep-NN libs
RUN apt-get update && apt-get install -y libcudnn7-dev && rm -rf /var/lib/apt/lists/*

# Check compatibility here: https://pytorch.org/get-started/locally/
RUN conda install --quiet --yes \
pytorch \
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile.header
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Use NVIDIA CUDA as base image and run the same installation as in the other packages.
# The version of cudatoolkit must match those of the base image, see Dockerfile.pytorch
FROM nvidia/cuda:10.1-base-ubuntu18.04
LABEL maintainer="Christoph Schranz <[email protected]>"
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
LABEL authors="Christoph Schranz <[email protected]>, Mathematical Michael <[email protected]>"
# This is a concatenated Dockerfile, the maintainers of subsequent sections may vary.
RUN chmod 1777 /tmp && chmod 1777 /var/tmp

0 comments on commit e5eb8f6

Please sign in to comment.