Update Habana ImageStream with the 1.13 version and adding several do…

…cumentation fixes
opendatahub-io · Mar 28, 2024 · 6aad7e2 · 6aad7e2
1 parent e66dc95
commit 6aad7e2
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 10 deletions.
diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh
@@ -24,7 +24,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
 
 # This value needs to be updated everytime we deliberately change number of the
 # images we want to have in the `params.env` file.
-EXPECTED_NUM_RECORDS=19
+EXPECTED_NUM_RECORDS=20
 
 # ---------------------------- DEFINED FUNCTIONS ----------------------------- #
 
@@ -128,6 +128,12 @@ function check_image_variable_matches_name_and_commitref() {
             expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
             ;;
         odh-habana-notebook-image-n)
+            expected_name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8"
+            # expected_commitref="2024a"
+            expected_commitref="main"
+            expected_build_name="habana-jupyter-1.13.0-ubi8-python-3.8"
+            ;;
+        odh-habana-notebook-image-n-1)
             expected_name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8"
             # expected_commitref="2024a"
             expected_commitref="main"

diff --git a/habana/1.13.0/ubi8-python-3.8/Dockerfile b/habana/1.13.0/ubi8-python-3.8/Dockerfile
@@ -146,7 +146,7 @@ ENV TCMALLOC_LARGE_ALLOC_REPORT_THRESHOLD=7516192768
 RUN dnf clean all && rm -rf /var/cache/dnf && rm -rf /tmp/*
 
 ## Label the image with details required by ODH
-LABEL name="odh-notebook-habana-jupyter-1.3.0-ubi8-python-3.8" \
+LABEL name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8" \
     summary="Jupyter HabanaAI 1.13.0 notebook image for ODH notebooks" \
     description="Jupyter HabanaAI 1.13.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.13.0 notebook image for ODH notebooks" \

diff --git a/habana/1.13.0/ubi8-python-3.8/README.md b/habana/1.13.0/ubi8-python-3.8/README.md
@@ -1,19 +1,19 @@
 # Habana Notebook Image
-This directory contains the Dockerfile to build a Notebook image compatible with 1.11.0 Habana Version.  
+This directory contains the Dockerfile to build a Notebook image compatible with 1.13.0 Habana Version.  
 
 Currently supporting the support matrix:  
 https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix.html
 
 | Firmware                 | version          |
 | ------------------------ | ---------------- |
 | First-gen Gaudi Firmware | 1.2.3            |
-| Gaudi2 Firmware          | 1.13.0-fw-45.1.1 |
+| Gaudi2 Firmware          | 1.14.0-fw-48.0.1 |
 
 
 | Python-package | version |
 | -------------- | ------- |
 | torch          | 2.1.0   |
-| tensorflow     | 2.12.1  |
+| tensorflow     | 2.13.1  |
 | pandas         | 1.5.3   |
 | numpy          | 1.23.5  |
 | scipy          | 1.10.1  |

diff --git a/habana/README.md b/habana/README.md
@@ -4,6 +4,7 @@ This directory contains the Dockerfiles to build Notebook images compatible with
 Currently supporting the support matrix:  
 https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.9.0.html   
 https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.10.0.html   
+https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.13.0.html   
 https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix.html  
 
 
@@ -24,9 +25,11 @@ user can include the habanaAI compatible image directly to Opendatahub.
 https://github.com/HabanaAI/Setup_and_Install/tree/1.9.0  
 https://github.com/HabanaAI/Setup_and_Install/tree/1.10.0  
 https://github.com/HabanaAI/Setup_and_Install/tree/1.11.0  
+https://github.com/HabanaAI/Setup_and_Install/tree/1.13.0  
 
 
 For further documentation related to HabanaAI, please refer:  
 https://docs.habana.ai/en/v1.9.0/Gaudi_Overview/index.html   
 https://docs.habana.ai/en/v1.10.0/Gaudi_Overview/index.html  
 https://docs.habana.ai/en/v1.11.0/Gaudi_Overview/index.html  
+https://docs.habana.ai/en/v1.13.0/Gaudi_Overview/index.html
diff --git a/manifests/base/commit.env b/manifests/base/commit.env
@@ -10,7 +10,8 @@ odh-tensorflow-gpu-notebook-image-commit-n=6f4c36b
 odh-tensorflow-gpu-notebook-image-commit-n-1=ae2f0fc
 odh-trustyai-notebook-image-commit-n=6f4c36b
 odh-trustyai-notebook-image-commit-n-1=ae2f0fc
-odh-habana-notebook-image-commit-n=e5b5f1f
+odh-habana-notebook-image-commit-n=e66dc95
+odh-habana-notebook-image-commit-n-1=e5b5f1f
 odh-codeserver-notebook-image-commit-n=6f4c36b
 odh-codeserver-notebook-image-commit-n-1=ae2f0fc
 odh-rstudio-notebook-image-commit-n=6f4c36b

diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml
@@ -52,6 +52,10 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-habana-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-habana-notebook-image-commit-n-1
   - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
     kind: ImageStream
     apiGroup: image.openshift.io/v1

diff --git a/manifests/base/jupyter-habana-notebook-imagestream.yaml b/manifests/base/jupyter-habana-notebook-imagestream.yaml
@@ -15,16 +15,29 @@ spec:
   lookupPolicy:
     local: true
   tags:
-    # 1.10.0 Version of the image n-1
+    # 1.13.0 Version of the image n
     - annotations:
-        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.13"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.34"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.7"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"2.0"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.13"},{"name":"PyTorch","version":"2.1"},{"name":"ODH-Elyra","version":"3.16"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-habana-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-habana-notebook-image-n)
+      name: "2024.1"
+      referencePolicy:
+        type: Source
+    # 1.10.0 Version of the image n-1
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.12"},{"name":"PyTorch","version":"2.0"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        opendatahub.io/workbench-image-recommended: "false"
+        opendatahub.io/notebook-build-commit: $(odh-habana-notebook-image-commit-n-1)
+      from:
+        kind: DockerImage
+        name: $(odh-habana-notebook-image-n-1)
       name: "2023.2"
       referencePolicy:
         type: Source
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -116,6 +116,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-habana-notebook-image-n
+  - name: odh-habana-notebook-image-n-1
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-habana-notebook-image-n-1
   - name: odh-codeserver-notebook-n
     objref:
       kind: ConfigMap
@@ -249,6 +256,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-habana-notebook-image-commit-n
+  - name: odh-habana-notebook-image-commit-n-1
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-habana-notebook-image-commit-n-1
   - name: odh-codeserver-notebook-image-commit-n
     objref:
       kind: ConfigMap

diff --git a/manifests/base/params.env b/manifests/base/params.env
@@ -10,7 +10,8 @@ odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:
 odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b1b5395c6d41cbd5e7b13841a43430a41ad411feac712f2fb40df335c935e1f1
 odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:3e836a3b43b4397f79b794e9e4a43e90e48f1eaf46c7796672f10b66b3728bb9
 odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:f9cc94e6b2e5ab7798963a9394a582f95919e199e557dcc4b296c8ac285fdc74
-odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
+odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:a88431ba1556abde63016e054c3ff84699a36d6f666157dd3ac6ad7a0d8d5584
+odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
 odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:276b1e209ccf85b7a94f679ebd938496113d4d8d293151ff24c754d141b73966
 odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:79ba73f39ad44186403199eb802980308f5145549d856ba20209f4ba2a8da978
 odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:d1df688ec039ff8aa57f070d10254057daaa1573b1467d0001c12297aa0141ff

diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
@@ -52,6 +52,10 @@ varReference:
     kind: ImageStream
     apiGroup: image.openshift.io/v1
     name: odh-habana-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-habana-notebook-image-n-1
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1