Merge branch 'main' into sramakr1/update_2.5.10-xpu_pytorch

intel · Dec 20, 2024 · 80be4de · 80be4de
2 parents 549b0b0 + 24602a0
commit 80be4de
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 26 deletions.
diff --git a/docs/matrix.md b/docs/matrix.md
@@ -26,15 +26,15 @@
     === "[Classical ML](https://hub.docker.com/r/intel/classical-ml)"
         {{ read_csv('assets/classical_ml.csv') }}
     === "[Deep Learning Pytorch* CPU](https://hub.docker.com/r/intel/deep-learning)"
-        {{ read_csv('assets/deep_learning_pytorch-cpu.csv') }}
+        {{ read_csv('assets/deep_learning_pytorch_cpu.csv') }}
     === "[Deep Learning PyTorch* GPU](https://hub.docker.com/r/intel/deep-learning)"
-        {{ read_csv('assets/deep_learning_pytorch-gpu.csv') }}
+        {{ read_csv('assets/deep_learning_pytorch_gpu.csv') }}
     === "[Deep Learning TensorFlow* CPU](https://hub.docker.com/r/intel/deep-learning)"
-        {{ read_csv('assets/deep_learning_tensorflow-cpu.csv') }}
+        {{ read_csv('assets/deep_learning_tensorflow_cpu.csv') }}
     === "[Deep Learning TensorFlow* GPU](https://hub.docker.com/r/intel/deep-learning)"
-        {{ read_csv('assets/deep_learning_tensorflow-gpu.csv') }}
+        {{ read_csv('assets/deep_learning_tensorflow_gpu.csv') }}
     === "[Deep Learning JAX CPU](https://hub.docker.com/r/intel/deep-learning)"
-        {{ read_csv('assets/deep_learning_jax-cpu.csv') }}
+        {{ read_csv('assets/deep_learning_jax_cpu.csv') }}
 
 === "[Workflows](https://hub.docker.com/r/intel/ai-workflows)"
     === "[TorchServe](https://github.com/intel/ai-containers/tree/main/workflows/charts/torchserve)"

diff --git a/preset/classical-ml/.actions.json b/preset/classical-ml/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["clx"]
 }
diff --git a/preset/deep-learning-jax-cpu/.actions.json b/preset/deep-learning-jax-cpu/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["clx"]
 }
diff --git a/preset/deep-learning-jax-cpu/docker-compose.yaml b/preset/deep-learning-jax-cpu/docker-compose.yaml
@@ -48,10 +48,11 @@ services:
     build:
       target: deep-learning
       labels:
-        docs: jax
-        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning JAC CPU"
+        docs: deep_learning_jax_cpu
+        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning JAX* CPU"
         org.opencontainers.base.name: "ubuntu:22.04"
-        org.opencontainers.image.name: "intel/deep-learning:jax"
+        org.opencontainers.image.name: "intel/deep-learning"
+        org.opencontainers.image.version: jax-2025.0.0-py${PYTHON_VERSION:-3.11}
         dependency.python: ${PYTHON_VERSION:-3.11}
         dependency.python.pip: requirements.txt
         dependency.apt.bzip2: true

diff --git a/preset/deep-learning-pytorch-cpu/.actions.json b/preset/deep-learning-pytorch-cpu/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["clx"]
 }
diff --git a/preset/deep-learning-pytorch-cpu/docker-compose.yaml b/preset/deep-learning-pytorch-cpu/docker-compose.yaml
@@ -61,11 +61,11 @@ services:
     build:
       target: deep-learning
       labels:
-        docs: deep_learning
-        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning PyTorch CPU"
+        docs: deep_learning_pytorch_cpu
+        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning PyTorch* CPU"
         org.opencontainers.base.name: "ubuntu:22.04"
-        org.opencontainers.image.name: "intel/deep-learning-pytorch-cpu"
-        org.opencontainers.image.version: 2025.0.0-py${PYTHON_VERSION:-3.11}
+        org.opencontainers.image.name: "intel/deep-learning"
+        org.opencontainers.image.version: pytorch-2025.0.0-py${PYTHON_VERSION:-3.11}
         dependency.python: ${PYTHON_VERSION:-3.11}
         dependency.python.pip: requirements.txt
         dependency.apt.apt-utils: true

diff --git a/preset/deep-learning-pytorch-gpu/.actions.json b/preset/deep-learning-pytorch-gpu/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["PVC"]
 }
diff --git a/preset/deep-learning-pytorch-gpu/docker-compose.yaml b/preset/deep-learning-pytorch-gpu/docker-compose.yaml
@@ -68,11 +68,11 @@ services:
     build:
       target: deep-learning
       labels:
-        docs: deep_learning
-        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning PyTorch GPU"
+        docs: deep_learning_pytorch_gpu
+        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning PyTorch* GPU"
         org.opencontainers.base.name: "ubuntu:22.04"
-        org.opencontainers.image.name: "intel/deep-learning-pytorch-gpu"
-        org.opencontainers.image.version: 2025.0.0-py${PYTHON_VERSION:-3.11}
+        org.opencontainers.image.name: "intel/deep-learning"
+        org.opencontainers.image.version: pytorch-gpu-2025.0.0-py${PYTHON_VERSION:-3.11}
         dependency.python: ${PYTHON_VERSION:-3.11}
         dependency.python.pip: requirements.txt
         dependency.apt.apt-utils: true

diff --git a/preset/deep-learning-tensorflow-cpu/.actions.json b/preset/deep-learning-tensorflow-cpu/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["clx"]
 }
diff --git a/preset/deep-learning-tensorflow-cpu/docker-compose.yaml b/preset/deep-learning-tensorflow-cpu/docker-compose.yaml
@@ -58,8 +58,8 @@ services:
     build:
       target: deep-learning
       labels:
-        docs: deep_learning
-        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning TensorFlow CPU"
+        docs: deep_learning_tensorflow_cpu
+        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning TensorFlow* CPU"
         org.opencontainers.base.name: "ubuntu:22.04"
         org.opencontainers.image.name: "intel/deep-learning"
         org.opencontainers.image.version: tensorflow-2025.0.0-py${PYTHON_VERSION:-3.11}

diff --git a/preset/deep-learning-tensorflow-gpu/.actions.json b/preset/deep-learning-tensorflow-gpu/.actions.json
@@ -1,6 +1,5 @@
 {
     "PYTHON_VERSION": ["3.11"],
     "experimental": [true],
-    "RELEASE": ["2025.0.0"],
     "runner_label": ["PVC"]
 }
diff --git a/preset/deep-learning-tensorflow-gpu/docker-compose.yaml b/preset/deep-learning-tensorflow-gpu/docker-compose.yaml
@@ -65,8 +65,8 @@ services:
     build:
       target: deep-learning
       labels:
-        docs: deep_learning
-        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning TensorFlow GPU"
+        docs: deep_learning_tensorflow_gpu
+        org.opencontainers.image.title: "AI Tools Selector Preset Containers - Deep Learning TensorFlow* GPU"
         org.opencontainers.base.name: "ubuntu:22.04"
         org.opencontainers.image.name: "intel/deep-learning"
         org.opencontainers.image.version: tensorflow-gpu-2025.0.0-py${PYTHON_VERSION:-3.11}