Merge branch 'main' of https://github.com/opendatahub-io/notebooks in…

…to rsync-main

.github/workflows/piplock-renewal-2024a.yml

@@ -0,0 +1,47 @@
+---
+# This GitHub action is meant to be triggered weekly in order to update the pipfile.locks
+
+name: Weekly Pipfile.locks renewal on [2024a] branch
+
+on:  # yamllint disable-line rule:truthy
+  # Triggers the workflow every Monday at 22pm UTC am 0 22 * * 1
+  schedule:
+    - cron: "0 22 * * 1"
+  workflow_dispatch:  # for manual trigger workflow from GH Web UI
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the
+      # added or changed files to the repository.
+      contents: write
+
+    steps:
+      # Checkout the paricular branch
+      - name: Checkout code from the release branch
+        uses: actions/checkout@v4
+        with:
+          ref: 2024a
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      # Setup Python environment
+      - name: Setup Python environment
+        uses: actions/setup-python@v5
+        with:
+          python-version: |
+            3.8
+            3.9
+      - name: Install pipenv
+        run: pip install pipenv
+
+      # Runs the makefile recipe `refresh-pipfilelock-files` and push the chances back to the branch
+      - name: Run make refresh-pipfilelock-files and push the chances back to the branch
+        run: |
+          make refresh-pipfilelock-files
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Actions"
+          git add .
+          git commit -m "Update the pipfile.lock via the weekly workflow action"
+          git push

Makefile

@@ -1,5 +1,5 @@
 IMAGE_REGISTRY   ?= quay.io/opendatahub/workbench-images
-RELEASE	 		 ?= 2023b
+RELEASE	 		 ?= 2024a
 
 # OS dependant: Generate date, select appropriate cmd to locate container engine
 ifeq ($(OS), Windows_NT)

habana/1.13.0/ubi8-python-3.8/Pipfile

@@ -8,17 +8,14 @@ name = "pypi"
 [packages]
 # Habana requirements
 habana_media_loader = "==1.13.0.463"
-
 # TensorFlow and useful extensions
 habana-tensorflow = "==1.13.0.463"
 tensorflow-cpu = "==2.12.1"
 tensorflow-io = "==0.32.0"
 tensorboard = "~=2.12.2"
 tf2onnx = "~= 1.13.0"
-
 # Pytorch and useful extension
 habana-pyhlml = "==1.13.0.463"
-
 # Below pkgs are required for pytorch-fork
 cffi = "==1.15.1"
 typing-extensions = ">=4.5.0"
@@ -28,7 +25,6 @@ pyyaml = "==6.0"
 pybind11 = "==2.10.4"
 mkl = "==2023.1"
 mkl-include = "==2023.1"
-
 # Parent image requirements to maintain cohesion
 boto3 = "~=1.34.50"
 kafka-python = "~=2.0.2"
@@ -39,17 +35,14 @@ scikit-learn = "~=1.3.2"
 scipy = "~=1.10.1"
 skl2onnx = "~=1.16.0"
 onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
-codeflare-sdk = "~=0.15.0"
-
+codeflare-sdk = "~=0.16.0"
 # DB connectors
 pymongo = "~=4.6.2"
 psycopg = "~=3.1.18"
 pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
-
 # JupyterLab packages
 odh-elyra = "~=3.16.5"
-
 jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
 jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
 jupyter-server = "~=2.13.0"
@@ -61,7 +54,6 @@ jupyterlab-widgets = "~=3.0.10"
 jupyter-resource-usage = "~=0.7.2"
 nbdime = "~=3.2.1"
 nbgitpuller = "~=1.2.0"
-
 # Base packages
 wheel = "~=0.43.0"
 setuptools = "~=69.2.0"

intel/runtimes/ml/ubi9-python-3.9/Pipfile

@@ -10,7 +10,6 @@ daal4py = {version="*"}
 scikit-learn-intelex = {version="==2024.0.1"}
 threadpoolctl = {version="*"}
 xgboost = {version="==1.7.3"}
-
 # Datascience and useful extensions
 cloud-data-connector = {version="*"}
 kafka-python = "~=2.0.2"
@@ -21,14 +20,12 @@ plotly = "~=5.16.1"
 scipy = "~=1.11.2"
 scikit-learn = "~=1.3.1"
 skl2onnx = "~=1.15.0"
-codeflare-sdk = "~=0.13.0"
-
+codeflare-sdk = "~=0.16.0"
 # DB connectors
 pymongo = "~=4.5.0"
 psycopg = "~=3.1.10"
 pyodbc = "~=4.0.39"
 mysql-connector-python = "~=8.0.33"
-
 # This is a comprehensive list of python dependencies that Elyra requires to execute Jupyter notebooks.
 ipykernel = "==6.13.0"
 ipython = "==8.10.0"

intel/runtimes/pytorch/ubi9-python-3.9/Dockerfile

@@ -17,8 +17,7 @@ ARG ONEAPI_VERSION=2024.0
 COPY oneAPI.repo /etc/yum.repos.d/oneAPI.repo
 
 RUN dnf update -y && \
-    dnf install -y intel-oneapi-dpcpp-cpp-${ONEAPI_VERSION} \
-        intel-oneapi-mkl-${ONEAPI_VERSION} && \
+    dnf install -y intel-basekit-${ONEAPI_VERSION} && \
     dnf clean all -y && \
     rm -rf /var/cache/dnf/* && \
     rm /etc/yum.repos.d/oneAPI.repo
@@ -41,6 +40,8 @@ RUN echo "Installing softwares and packages" && \
     fix-permissions /opt/app-root -P
 
 ENV CPU_ENV=/opt/app-root-cpu
+ENV GPU_ENV=/opt/app-root
+
 COPY --chown=1001:0 Pipfile.lock.cpu ${CPU_ENV}/Pipfile.lock
 
 #CPU env

intel/runtimes/tensorflow/ubi9-python-3.9/Dockerfile

@@ -17,8 +17,7 @@ ARG ONEAPI_VERSION=2024.0
 COPY oneAPI.repo /etc/yum.repos.d/oneAPI.repo
 
 RUN dnf update -y && \
-    dnf install -y intel-oneapi-dpcpp-cpp-${ONEAPI_VERSION} \
-        intel-oneapi-mkl-${ONEAPI_VERSION} && \
+    dnf install -y intel-basekit-${ONEAPI_VERSION} && \
     dnf clean all -y && \
     rm -rf /var/cache/dnf/* && \
     rm /etc/yum.repos.d/oneAPI.repo

jupyter/datascience/ubi8-python-3.8/Pipfile

@@ -17,17 +17,14 @@ scikit-learn = "~=1.3.2"
 scipy = "~=1.10.1"
 skl2onnx = "~=1.16.0"
 onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
-codeflare-sdk = "~=0.15.0"
-
+codeflare-sdk = "~=0.16.0"
 # DB connectors
 pymongo = "~=4.6.2"
 psycopg = "~=3.1.18"
 pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
-
 # JupyterLab packages
 odh-elyra = "~=3.16.5"
-
 jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
 jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
 jupyter-server = "~=2.13.0"
@@ -39,7 +36,6 @@ jupyterlab-widgets = "~=3.0.10"
 jupyter-resource-usage = "~=0.7.2"
 nbdime = "~=3.2.1"
 nbgitpuller = "~=1.2.0"
-
 # Base packages
 wheel = "~=0.43.0"
 setuptools = "~=69.2.0"