Hello_User/gpu-jupyter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reset to stable docker-stacks commit

Browse Source
This commit is contained in:
Christoph Schranz
2020-03-10 18:29:25 +01:00
parent 9c9dc785f5
commit 99be0fdab2
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.build/Dockerfile
View File

@@ -359,27 +359,28 @@ RUN julia -e 'import Pkg; Pkg.update()' && \
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>" LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
# Install cudatoolkit must match the version of the base image
RUN conda install --quiet --yes \
cudatoolkit=10.1 && \
conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER
# Install Tensorflow # Install Tensorflow
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'tensorflow=1.13*' \ 'tensorflow-gpu' \
'keras=2.2*' && \ 'keras-gpu' && \
conda clean --all -f -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
# Install PyTorch dependencies # Install PyTorch with dependencies
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
pyyaml mkl mkl-include setuptools cmake cffi typing && \ pyyaml mkl mkl-include setuptools cmake cffi typing \
conda clean --all -f -y && \ pytorch \
fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER
# Install PyTorch, version of cudatoolkit must match those of the base image
RUN conda install -y -c pytorch \
cudatoolkit=10.1 \
'pytorch=1.3.1' \
torchvision && \ torchvision && \
conda clean --all -f -y && \ conda clean --all -f -y && \
pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER

22
generate_Dockerfile.sh
View File

@@ -14,13 +14,25 @@ while [[ "$#" -gt 0 ]]; do case $1 in
esac; shift; done esac; shift; done
# Clone if docker-stacks doesn't exist, and pull. # Clone if docker-stacks doesn't exist, and set to the given commit or the default commit
ls $STACKS_DIR/README.md > /dev/null 2>&1 || (echo "Docker-stacks was not found, cloning repository" \ ls $STACKS_DIR/README.md > /dev/null 2>&1 || (echo "Docker-stacks was not found, cloning repository" \
&& git clone https://github.com/jupyter/docker-stacks.git $STACKS_DIR) && git clone https://github.com/jupyter/docker-stacks.git $STACKS_DIR)
#cd $STACKS_DIR && git pull && cd - echo "Set docker-stacks to commit '$HEAD_COMMIT'."
echo "Set docker-stacks to commit $HEAD_COMMIT." if [[ "$HEAD_COMMIT" == "latest" ]]; then
cd $STACKS_DIR && git reset --hard $HEAD_COMMIT && cd - echo "WARNING, the latest commit of docker-stacks is used. This may result in version conflicts"
cd $STACKS_DIR && git pull && cd -
else
export GOT_HEAD="false"
cd $STACKS_DIR && git reset --hard $HEAD_COMMIT > /dev/null 2>&1 && cd - && export GOT_HEAD="true"
echo $HEAD
if [[ "$GOT_HEAD" == "false" ]]; then
echo "Given sha-commit is invalid."
echo "Usage: $0 -c [sha-commit] # set the head commit of the docker-stacks submodule (https://github.com/jupyter/docker-stacks/commits/master)."
exit 2
else
echo "Set head to given commit."
fi
fi
# Write the contents into the DOCKERFILE and start with the header # Write the contents into the DOCKERFILE and start with the header
cat src/Dockerfile.header > $DOCKERFILE cat src/Dockerfile.header > $DOCKERFILE

25
src/Dockerfile.gpulibs
View File

@@ -1,25 +1,26 @@
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>" LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
# Install cudatoolkit must match the version of the base image
RUN conda install --quiet --yes \
cudatoolkit=10.1 && \
conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER
# Install Tensorflow # Install Tensorflow
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'tensorflow=1.13*' \ 'tensorflow-gpu' \
'keras=2.2*' && \ 'keras-gpu' && \
conda clean --all -f -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
# Install PyTorch dependencies # Install PyTorch with dependencies
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
pyyaml mkl mkl-include setuptools cmake cffi typing && \ pyyaml mkl mkl-include setuptools cmake cffi typing \
conda clean --all -f -y && \ pytorch \
fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER
# Install PyTorch, version of cudatoolkit must match those of the base image
RUN conda install -y -c pytorch \
cudatoolkit=10.1 \
'pytorch=1.3.1' \
torchvision && \ torchvision && \
conda clean --all -f -y && \ conda clean --all -f -y && \
pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER