Merge pull request #598 from harshad16/sync-2024a

Sync 2024a branch with main branch

Author: harshad16

.github/workflows/build-notebooks.yaml

@@ -444,6 +444,61 @@
             },
             "secrets": "inherit"
         },
+        "amd-c9s-python-3_9": {
+            "needs": [
+                "base-c9s-python-3_9"
+            ],
+            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
+            "with": {
+                "target": "amd-c9s-python-3.9",
+                "github": "${{ toJSON(github) }}"
+            },
+            "secrets": "inherit"
+        },
+        "amd-jupyter-minimal-c9s-python-3_9": {
+            "needs": [
+                "amd-c9s-python-3_9"
+            ],
+            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
+            "with": {
+                "target": "amd-jupyter-minimal-c9s-python-3.9",
+                "github": "${{ toJSON(github) }}"
+            },
+            "secrets": "inherit"
+        },
+        "amd-jupyter-datascience-c9s-python-3_9": {
+            "needs": [
+                "amd-jupyter-minimal-c9s-python-3_9"
+            ],
+            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
+            "with": {
+                "target": "amd-jupyter-datascience-c9s-python-3.9",
+                "github": "${{ toJSON(github) }}"
+            },
+            "secrets": "inherit"
+        },
+        "amd-jupyter-tensorflow-c9s-python-3_9": {
+            "needs": [
+                "amd-jupyter-datascience-c9s-python-3_9"
+            ],
+            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
+            "with": {
+                "target": "amd-jupyter-tensorflow-c9s-python-3.9",
+                "github": "${{ toJSON(github) }}"
+            },
+            "secrets": "inherit"
+        },
+        "amd-jupyter-pytorch-c9s-python-3_9": {
+            "needs": [
+                "amd-jupyter-datascience-c9s-python-3_9"
+            ],
+            "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
+            "with": {
+                "target": "amd-jupyter-pytorch-c9s-python-3.9",
+                "github": "${{ toJSON(github) }}"
+            },
+            "secrets": "inherit"
+        },
         "base-anaconda-python-3_8": {
             "needs": [],
             "uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",

Makefile

@@ -274,16 +274,16 @@ amd-c9s-python-3.9: base-c9s-python-3.9
 
 # We are only using c9s base image here onwards, 
 # DON'T confuse due to the ubi9 mention, it just directory name.
-.PHONY: amd-minimal-c9s-python-3.9
-amd-minimal-c9s-python-3.9: amd-c9s-python-3.9
+.PHONY: amd-jupyter-minimal-c9s-python-3.9
+amd-jupyter-minimal-c9s-python-3.9: amd-c9s-python-3.9
 	$(call image,$@,jupyter/minimal/ubi9-python-3.9,$<)
 
-# Build and push cuda-jupyter-datascience-ubi9-python-3.9 image to the registry
+# Build and push jupyter-datascience-ubi9-python-3.9 image to the registry
 .PHONY: amd-jupyter-datascience-c9s-python-3.9
-amd-jupyter-datascience-c9s-python-3.9: amd-jupyter-minimal-ubi9-python-3.9
+amd-jupyter-datascience-c9s-python-3.9: amd-jupyter-minimal-c9s-python-3.9
 	$(call image,$@,jupyter/datascience/ubi9-python-3.9,$<)
 
-# Build and push cuda-jupyter-tensorflow-ubi9-python-3.9 image to the registry
+# Build and push jupyter-tensorflow-ubi9-python-3.9 image to the registry
 .PHONY: amd-jupyter-tensorflow-c9s-python-3.9
 amd-jupyter-tensorflow-c9s-python-3.9: amd-jupyter-datascience-c9s-python-3.9
 	$(call image,$@,jupyter/amd/tensorflow/ubi9-python-3.9,$<)

jupyter/amd/pytorch/ubi9-python-3.9/Pipfile

@@ -27,7 +27,8 @@ scikit-learn = "~=1.4.0"
 scipy = "~=1.12.0"
 skl2onnx = "~=1.16.0"
 onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
-codeflare-sdk = "~=0.15.1"
+codeflare-sdk = "~=0.16.4"
+memray = "~=1.10.0"  # any version above this would cause issue with rich package
 
 # DB connectors
 pymongo = "~=4.6.2"
@@ -36,7 +37,7 @@ pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
 
 # JupyterLab packages
-odh-elyra = "~=3.16.5"
+odh-elyra = "~=3.16.7"
 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"