Merge branch 'main' into tylertitsworth/weekly-patch

Author: sramakintel

enterprise/redhat/openshift-ai/gaudi/docker/.actions.json

@@ -0,0 +1,5 @@
+{
+    "RHEL_OS": ["9.2"],
+    "experimental": [true],
+    "runner_label": ["gaudi2"]
+}

enterprise/redhat/openshift-ai/gaudi/docker/Dockerfile.rhel9.2

@@ -231,6 +231,6 @@ RUN cd ${APP_ROOT}/ && \
     VLLM_TARGET_DEVICE=hpu pip install -e .
 
 WORKDIR ${APP_ROOT}/src
-ENV NOTEBOOK_SAMPLE_LINK="https://raw.githubusercontent.com/sharvil10/ai-containers/main/enterprise/redhat/openshift-ai/gaudi/demo/Getting-started.ipynb"
+ENV NOTEBOOK_SAMPLES_LINK="https://raw.githubusercontent.com/intel/ai-containers/refs/heads/main/enterprise/redhat/openshift-ai/gaudi/demo/oneapi-sample.ipynb"
 
 ENTRYPOINT ["bash", "-c", "/opt/app-root/builder/run"]

enterprise/redhat/openshift-ai/gaudi/docker/docker-compose.yaml

@@ -27,7 +27,10 @@ services:
       context: .
       target: gaudi-base
       dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
-    image: gaudi-base:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-base-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
+    entrypoint: ["/bin/bash", "-c"]
+    command: >
+      "hl-smi"
   gaudi-pytorch:
     build:
       args:
@@ -44,7 +47,10 @@ services:
       context: .
       target: gaudi-pytorch
       dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
-    image: gaudi-pytorch:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-pytorch-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
+    entrypoint: ["/bin/bash", "-c"]
+    command: >
+      "python -c 'import torch'"
   gaudi-notebooks:
     build:
       args:
@@ -61,4 +67,7 @@ services:
       context: .
       target: gaudi-notebooks
       dockerfile: Dockerfile.rhel${RHEL_OS:-9.2}
-    image: gaudi-notebooks:${RHEL_OS:-9.2}-${VERSION:-1.17.0}-${REVISION:-495}
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-notebook-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
+    entrypoint: ["/bin/bash", "-c"]
+    command: >
+      "python -m jupyter notebook --version"

enterprise/redhat/openshift-ai/gaudi/docker/tests/notebook-test.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright (c) 2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+apt-get -y update
+apt-get -y install curl jq
+
+echo 'Testing if server is running'
+curl --fail -s -X GET http://localhost:8888/api/status
+echo ''
+
+echo 'Test if oneapi-sample was downloaded'
+if [[ $(curl --fail -s -X GET http://localhost:8888/api/contents | jq -r '.content[] | select(.name=="oneapi-sample.ipynb")') ]]; then
+	echo 'oneapi-sample.ipynb was downloaded'
+else
+	echo 'oneapi-sample.ipynb was not downloaded'
+fi

enterprise/redhat/openshift-ai/gaudi/docker/tests/tests.yaml

@@ -0,0 +1,26 @@
+# Copyright (c) 2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+test-jupyter-server:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-gaudi-base-${VERSION:-1.17.0}-${REVISION:-495}-rhel-${RHEL_OS:-9.2}
+  cmd: bash /opt/app-root/notebook-test.sh
+  serving: True
+  volumes:
+  - src: $PWD/enterprise/redhat/openshift-ai/gaudi/docker/tests/notebook-test.sh
+    dst: /opt/app-root/notebook-test.sh
+  env:
+    NOTEBOOK_ARGS: "--ServerApp.token='' --ServerApp.PasswordIdentityProvider.hashed_password=''"
+    NOTEBOOK_PORT: '8888'
+    NOTEBOOK_SAMPLES_LINK: 'https://raw.githubusercontent.com/intel/ai-containers/refs/heads/main/enterprise/redhat/openshift-ai/gaudi/demo/oneapi-sample.ipynb'
+  shm_size: 1g

preset/README.md

@@ -18,7 +18,7 @@ AI Tools Selector Preset Containers provides data scientists and developers with
 2. Pull a Preset Container of your choice from the [AI Tools Selector](https://www.intel.com/content/www/us/en/developer/tools/oneapi/ai-tools-selector.html) or from the [table](#preset-containers). The commands below use the `deep-learning` preset as an example.
 
 ```bash
-docker pull intel/deep-learning:latest-py3.9
+docker pull intel/deep-learning:latest-py<version>
 ```
 
 ## Run Preset Container
@@ -40,9 +40,9 @@ This mode allows running the container in an interactive shell. This enables the
 
 ```bash
 docker run -it --rm \
-    --shm-size=12G \
+    -p 8888:8888 --shm-size=12G \
     -v ${PWD}:/home/dev/workdir \
-    intel/deep-learning:latest-py3.9 bash
+    intel/deep-learning:latest-py<version> bash
 ```
 
 > [!NOTE]
@@ -64,10 +64,10 @@ docker run -it --rm \
     ${RENDER_GROUP} \
     ${VIDEO_GROUP} \
     --device=/dev/dri \
-    --shm-size=12G \
+    -p 8888:8888 --shm-size=12G \
     -v ${PWD}:/home/dev/workdir \
     -v /dev/dri/by-path:/dev/dri/by-path \
-    intel/deep-learning:latest-py3.9 bash
+    intel/deep-learning:latest-py<version> bash
 ```
 
 > [!NOTE]
@@ -100,9 +100,9 @@ This mode launches a jupyterlab notebook server. The command below will start th
 
 ```bash
 docker run -it --rm \
-    --shm-size=12G \
+    -p 8888:8888 --shm-size=12G \
     -v ${PWD}:/home/dev/workdir \
-    intel/deep-learning:latest-py3.9
+    intel/deep-learning:latest-py<version>
 ```
 
 > [!NOTE]
@@ -124,10 +124,10 @@ docker run -it --rm \
     ${RENDER_GROUP} \
     ${VIDEO_GROUP} \
     --device=/dev/dri \
-    --shm-size=12G \
+    -p 8888:8888  --shm-size=12G \
     -v ${PWD}:/home/dev/workdir \
     -v /dev/dri/by-path:/dev/dri/by-path \
-    intel/deep-learning:latest-py3.9
+    intel/deep-learning:latest-py<version>
 ```
 
 > [!NOTE]
@@ -146,7 +146,7 @@ docker run -it --rm \
 Modify your notebook server command by using the default example below to change the network (port/ip) and security (privilege) settings by appending it to the docker run commands above:
 
 ```bash
-docker run ... intel/deep-learning:latest-py3.9 \
+docker run ... intel/deep-learning:latest-py<version> \
     bash -c "jupyter notebook --notebook-dir=~/jupyter \
             --port 8888 \
             --ip 0.0.0.0 \