Fixes #59. PyTorch 1.6.

Author: rlan

README.md

@@ -46,9 +46,9 @@ Images of Pytorch version 1.5 and higher include [Pytorch Lightning](https://git
 
 | Tag (OS-based python) | Comment | Dockerfile | Info |
 | --------------------- | ------- | ---------- | ---- |
-| `pytorch1.5.1` | CPU-only | [Dockerfile](docker/pytorch1.5.1/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1) |
-| `pytorch1.5.1-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](docker/pytorch1.5.1-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1-cuda101) |
-| `pytorch1.5.1-cuda92` | Nvidia Driver >= 396.xx | [Dockerfile](docker/pytorch1.5.1-cuda92/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1-cuda92.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1-cuda92) |
+| `pytorch1.6` | CPU-only | [Dockerfile](docker/pytorch1.6/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.6.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.6) |
+| `pytorch1.6-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](docker/pytorch1.6-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.6-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.6-cuda101) |
+| `pytorch1.6-cuda92` | Nvidia Driver >= 396.xx | [Dockerfile](docker/pytorch1.6-cuda92/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.6-cuda92.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.6-cuda92) |
 | `jupyter-pytorch1.2-py3-cuda10` | Nvidia Driver >= 410.xx | [Dockerfile](docker/jupyter-pytorch1.2-py3-cuda10/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-pytorch1.2-py3-cuda10.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-pytorch1.2-py3-cuda10) |
 | `jupyter-pytorch1.1-py3-cuda9` | Nvidia Driver >= 384.xx | [Dockerfile](docker/jupyter-pytorch1.1-py3-cuda9/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-pytorch1.1-py3-cuda9.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-pytorch1.1-py3-cuda9) |
 | `jupyter-pytorch1.0-py3-cuda8` | Nvidia Driver >= 375.xx | [Dockerfile](docker/jupyter-pytorch1.0-py3-cuda8/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:jupyter-pytorch1.0-py3-cuda8.svg)](https://microbadger.com/images/wqael/notebooks:jupyter-pytorch1.0-py3-cuda8) |

deprecated/deprecated.md

@@ -35,6 +35,9 @@
 
 | Tag (OS-based python) | Comment | Dockerfile | Info |
 | --------------------- | ------- | ---------- | ---- |
+| `pytorch1.5.1` | CPU-only | [Dockerfile](pytorch1.5.1/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1) |
+| `pytorch1.5.1-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](pytorch1.5.1-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1-cuda101) |
+| `pytorch1.5.1-cuda92` | Nvidia Driver >= 396.xx | [Dockerfile](pytorch1.5.1-cuda92/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.1-cuda92.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5.1-cuda92) |
 | `pytorch1.5` | CPU-only | [Dockerfile](pytorch1.5/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5) |
 | `pytorch1.5-cuda101` | Nvidia Driver >= 418.xx | [Dockerfile](pytorch1.5-cuda101/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5-cuda101.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5-cuda101) |
 | `pytorch1.5-cuda92` | Nvidia Driver >= 396.xx | [Dockerfile](pytorch1.5-cuda92/Dockerfile) | [![](https://images.microbadger.com/badges/image/wqael/notebooks:pytorch1.5-cuda92.svg)](https://microbadger.com/images/wqael/notebooks:pytorch1.5-cuda92) |

docker/pytorch1.5.1-cuda101/Dockerfile renamed to deprecated/pytorch1.5.1-cuda101/Dockerfile

@@ -0,0 +1,56 @@
+FROM wqael/mldock:pytorch1.6-cuda101
+
+LABEL description="Jupyter / PyTorch 1.6.0 / Python 3.6 / nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04" \
+      maintainer="https://github.com/rlan/notebooks"
+
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
+ARG PYTHON=python3
+ARG PIP=pip3
+# Skips tzdata configuration
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends \
+        python3-pandas \
+    && apt-get -qq clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN pip --no-cache-dir install -q --upgrade \
+        pip \
+        setuptools \
+        wheel
+RUN ${PIP} --no-cache-dir install -q -U \
+      jupyterlab \
+      matplotlib \
+      opencv-python-headless \
+      pillow \
+      pytorch-lightning \
+      scikit-learn \
+      scikit-image \
+      seaborn \
+      six
+
+# Set up our notebook config.
+COPY jupyter_notebook_config.py /root/.jupyter/
+
+# Jupyter has issues with being run directly:
+#   https://github.com/ipython/ipython/issues/7062
+# We just add a little wrapper script.
+COPY run_jupyter.sh /
+
+# IPython
+EXPOSE 8888
+
+WORKDIR /notebooks
+
+CMD ["/run_jupyter.sh", "--allow-root"]

docker/pytorch1.5.1-cuda101/hooks/build renamed to deprecated/pytorch1.5.1-cuda101/hooks/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+# $IMAGE_NAME var is injected into the build so the tag is correct. 
+docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
+  --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+  -t $IMAGE_NAME .

docker/pytorch1.5.1-cuda101/jupyter_notebook_config.py renamed to deprecated/pytorch1.5.1-cuda101/jupyter_notebook_config.py

@@ -0,0 +1,18 @@
+import os
+from IPython.lib import passwd
+
+c = c  # pylint:disable=undefined-variable
+c.NotebookApp.ip = '0.0.0.0'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  password = os.environ['PASSWORD']
+  if password:
+    c.NotebookApp.password = passwd(password)
+  else:
+    c.NotebookApp.password = ''
+    c.NotebookApp.token = ''
+  del os.environ['PASSWORD']
+  

docker/pytorch1.5.1-cuda101/run_jupyter.sh renamed to deprecated/pytorch1.5.1-cuda101/run_jupyter.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook "$@"

docker/pytorch1.5.1-cuda92/Dockerfile renamed to deprecated/pytorch1.5.1-cuda92/Dockerfile

@@ -0,0 +1,56 @@
+FROM wqael/mldock:pytorch1.6-cuda92
+
+LABEL description="Jupyter / PyTorch 1.6.0 / Python 3.6 / nvidia/cuda:9.2-cudnn7-runtime-ubuntu18.04" \
+      maintainer="https://github.com/rlan/notebooks"
+
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
+ARG PYTHON=python3
+ARG PIP=pip3
+# Skips tzdata configuration
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends \
+        python3-pandas \
+    && apt-get -qq clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN pip --no-cache-dir install -q --upgrade \
+        pip \
+        setuptools \
+        wheel
+RUN ${PIP} --no-cache-dir install -q -U \
+      jupyterlab \
+      matplotlib \
+      opencv-python-headless \
+      pillow \
+      pytorch-lightning \
+      scikit-learn \
+      scikit-image \
+      seaborn \
+      six
+
+# Set up our notebook config.
+COPY jupyter_notebook_config.py /root/.jupyter/
+
+# Jupyter has issues with being run directly:
+#   https://github.com/ipython/ipython/issues/7062
+# We just add a little wrapper script.
+COPY run_jupyter.sh /
+
+# IPython
+EXPOSE 8888
+
+WORKDIR /notebooks
+
+CMD ["/run_jupyter.sh", "--allow-root"]

docker/pytorch1.5.1-cuda92/hooks/build renamed to deprecated/pytorch1.5.1-cuda92/hooks/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+# $IMAGE_NAME var is injected into the build so the tag is correct. 
+docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
+  --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+  -t $IMAGE_NAME .

docker/pytorch1.5.1-cuda92/jupyter_notebook_config.py renamed to deprecated/pytorch1.5.1-cuda92/jupyter_notebook_config.py

@@ -0,0 +1,18 @@
+import os
+from IPython.lib import passwd
+
+c = c  # pylint:disable=undefined-variable
+c.NotebookApp.ip = '0.0.0.0'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  password = os.environ['PASSWORD']
+  if password:
+    c.NotebookApp.password = passwd(password)
+  else:
+    c.NotebookApp.password = ''
+    c.NotebookApp.token = ''
+  del os.environ['PASSWORD']
+  

docker/pytorch1.5.1-cuda92/run_jupyter.sh renamed to deprecated/pytorch1.5.1-cuda92/run_jupyter.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook "$@"

docker/pytorch1.5.1/Dockerfile renamed to deprecated/pytorch1.5.1/Dockerfile

@@ -0,0 +1,56 @@
+FROM wqael/mldock:pytorch1.6
+
+LABEL description="Jupyter / PyTorch 1.6.0 / Python 3.6 / ubuntu18.04" \
+      maintainer="https://github.com/rlan/notebooks"
+
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/rlan/notebooks" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
+
+ARG PYTHON=python3
+ARG PIP=pip3
+# Skips tzdata configuration
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends \
+        python3-pandas \
+    && apt-get -qq clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN pip --no-cache-dir install -q --upgrade \
+        pip \
+        setuptools \
+        wheel
+RUN ${PIP} --no-cache-dir install -q -U \
+      jupyterlab \
+      matplotlib \
+      opencv-python-headless \
+      pillow \
+      pytorch-lightning \
+      scikit-learn \
+      scikit-image \
+      seaborn \
+      six
+
+# Set up our notebook config.
+COPY jupyter_notebook_config.py /root/.jupyter/
+
+# Jupyter has issues with being run directly:
+#   https://github.com/ipython/ipython/issues/7062
+# We just add a little wrapper script.
+COPY run_jupyter.sh /
+
+# IPython
+EXPOSE 8888
+
+WORKDIR /notebooks
+
+CMD ["/run_jupyter.sh", "--allow-root"]

docker/pytorch1.5.1/hooks/build renamed to deprecated/pytorch1.5.1/hooks/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+# $IMAGE_NAME var is injected into the build so the tag is correct. 
+docker build --build-arg VCS_REF=`git rev-parse --short HEAD` \
+  --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+  -t $IMAGE_NAME .

docker/pytorch1.5.1/jupyter_notebook_config.py renamed to deprecated/pytorch1.5.1/jupyter_notebook_config.py

@@ -0,0 +1,18 @@
+import os
+from IPython.lib import passwd
+
+c = c  # pylint:disable=undefined-variable
+c.NotebookApp.ip = '0.0.0.0'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  password = os.environ['PASSWORD']
+  if password:
+    c.NotebookApp.password = passwd(password)
+  else:
+    c.NotebookApp.password = ''
+    c.NotebookApp.token = ''
+  del os.environ['PASSWORD']
+  

docker/pytorch1.5.1/run_jupyter.sh renamed to deprecated/pytorch1.5.1/run_jupyter.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook "$@"