Add 2.1.1. Drop pre-2.01 support

.github/workflows/docker-build.yml

@@ -8,9 +8,9 @@ on:
 env:
   UBUNTU_VERSION: 22.04
   BUILDX_NO_DEFAULT_ATTESTATIONS: 1
-  LATEST_CUDA: "2.1.0-py3.11-cuda-11.8.0-base-22.04"
-  LATEST_ROCM: "2.1.0-py3.11-rocm-5.4.2-runtime-22.04"
-  LATEST_CPU: "2.1.0-py3.11-cpu-22.04"
+  LATEST_CUDA: "2.1.1-py3.12-cuda-12.2.0-base-22.04"
+  LATEST_ROCM: "2.1.1-py3.12-rocm-5.6-runtime-22.04"
+  LATEST_CPU: "2.1.1-py3.12-cpu-22.04"
 
 jobs:
   cpu-base:
@@ -19,17 +19,13 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.8"
-          - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         pytorch:
-          - "1.13.1"
           - "2.0.1"
           - "2.1.0"
-        exclude:
-          - pytorch: "1.13.1"
-          - python: "3.11"
+          - "2.1.1"
     steps:
       -
         name: Free Space
@@ -84,31 +80,39 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.8"
-          - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         pytorch:
-          - "1.13.1"
           - "2.0.1"
           - "2.1.0"
+          - "2.1.1"
         cuda:
           - "11.7.1"
           - "11.8.0"
           - "12.1.0"
+          - "12.2.0"
         level:
           - "base"
           - "devel"
           - "cudnn8-devel"
         exclude:
-          - pytorch: "1.13.1"
-            python: "3.11"
-          - pytorch: "1.13.1"
-            cuda: "11.8.0"
           - pytorch: "2.0.1"
             cuda: "12.1.0"
+          - pytorch: "2.0.1"
+            cuda: "12.2.0"
           - pytorch: "2.1.0"
             cuda: "11.7.1"
+          - pytorch: "2.1.1"
+            cuda: "11.7.1"
+          - cuda: "12.2.0"
+            level: "cudnn8-devel"
+          - cuda: "12.1.0"
+            level: "devel"
+          - cuda: "11.8.0"
+            level: "devel"
+          - cuda: "11.7.1"
+            level: "devel"
     steps:
       - 
         name: Free Space
@@ -162,13 +166,13 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.8"
-          - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         pytorch:
           - "2.0.1"
           - "2.1.0"
+          - "2.1.1"
         rocm:
           - "5.4.2"
           - "5.6"
@@ -180,6 +184,8 @@ jobs:
             rocm: "5.6"
           - pytorch: "2.1.0"
             rocm: "5.4.2"
+          - pytorch: "2.1.1"
+            rocm: "5.4.2"
     steps:
       -
         name: Free Space

README.md

@@ -34,23 +34,23 @@ Tags follow these patterns:
 ##### _CUDA_
 - `:[pytorch-version]-py[python-version]-cuda-[x.x.x]-base-[ubuntu-version]`
 
-- `:latest-cuda` → `:2.1.0-py3.11-cuda-11.8.0-base-22.04`
+- `:latest-cuda` → `:2.1.1-py3.12-cuda-12.2.0-base-22.04`
 
 ##### _ROCm_
 - `:[pytorch-version]-py[python-version]-rocm-[x.x.x]-runtime-[ubuntu-version]`
 
-- `:latest-rocm` → `:2.1.0-py3.11-rocm-5.6-runtime-22.04`
+- `:latest-rocm` → `:2.1.1-py3.12-rocm-5.6-runtime-22.04`
 
 ##### _CPU_
 - `:[pytorch-version]-py[python-version]-ubuntu-[ubuntu-version]`
 
-- `:latest-cpu` → `:2.1.0-py3.10-cpu-22.04` 
+- `:latest-cpu` → `:2.1.1-py3.12-cpu-22.04` 
 
 Browse [here](https://github.com/ai-dock/jupyter-pytorch/pkgs/container/jupyter-pytorch) for an image suitable for your target environment.
 
-Supported Python versions: `3.11`, `3.10`, `3.9`, `3.8`
+Supported Python versions: `3.12`, `3.11`, `3.10`
 
-Supported Pytorch versions: `2.1.0` `2.0.1`, `1.13.1` 
+Supported Pytorch versions: `2.1.1`, `2.1.0` `2.0.1`
 
 Supported Platforms: `NVIDIA CUDA`, `AMD ROCm`, `CPU`
 

build/COPY_ROOT/opt/ai-dock/bin/build/layer0/common.sh

@@ -11,7 +11,7 @@ main() {
 }
 
 install_jupyter() {
-    $MAMBA_CREATE -n jupyter -c conda-forge python=3.10
+    $MAMBA_CREATE -n jupyter -c defaults python=3.10
     micromamba -n jupyter install -c conda-forge -y \
         jupyter \
         jupyterlab \
@@ -22,7 +22,7 @@ install_jupyter() {
 }
 
 do_mamba_install() {
-        $MAMBA_INSTALL -n "$1" -c conda-forge -c defaults -y \
+        $MAMBA_INSTALL -n "$1" -c defaults -y \
             ipykernel \
             ipywidgets
 }
@@ -52,26 +52,6 @@ install_ipykernel() {
         do_kernel_install "${PYTHON_MAMBA_NAME}" "${PYTHON_VERSION}" "python${major}" "Python${major} (ipykernel)"
     else
         # Multi Python - Use $PYTHON_MAMBA_NAME as default kernel
-        do_mamba_install "python_27"
-        if [[ $PYTHON_MAMBA_NAME = "python_27" ]]; then
-            do_kernel_install "python_27" "2.7" "python2" "Python2 (ipykernel)"
-        else
-            do_kernel_install "python_27" "2.7"
-        fi
-
-        do_mamba_install "python_38"
-        if [[ $PYTHON_MAMBA_NAME = "python_38" ]]; then
-            do_kernel_install "python_38" "3.8" "python3" "Python3 (ipykernel)"
-        else
-            do_kernel_install "python_38" "3.8"
-        fi
-
-        do_mamba_install "python_39"
-        if [[ $PYTHON_MAMBA_NAME = "python_39" ]]; then
-            do_kernel_install "python_39" "3.9" "python3" "Python3 (ipykernel)"
-        else
-            do_kernel_install "python_39" "3.9"
-        fi
 
         do_mamba_install "python_310"
         if [[ $PYTHON_MAMBA_NAME = "python_310" ]]; then
@@ -86,6 +66,13 @@ install_ipykernel() {
         else
             do_kernel_install "python_311" "3.11"
         fi
+
+        do_mamba_install "python_312"
+        if [[ $PYTHON_MAMBA_NAME = "python_312" ]]; then
+            do_kernel_install "python_312" "3.12" "python3" "Python3 (ipykernel)"
+        else
+            do_kernel_install "python_312" "3.12"
+        fi
     fi
 }