From b1748dec39f15baa95a5ff5a0a076a1df1355a44 Mon Sep 17 00:00:00 2001 From: Diamond Bryant Date: Wed, 26 Jun 2024 15:07:12 -0400 Subject: [PATCH] Updated image manifests with AMD images for pytorch and tensorflow --- ci/check-params-env.sh | 17 ++++++++++- manifests/base/commit.env | 3 ++ manifests/base/commit.yaml | 12 ++++++++ ...ter-rocm-minimal-notebook-imagestream.yaml | 29 +++++++++++++++++++ ...ter-rocm-pytorch-notebook-imagestream.yaml | 29 +++++++++++++++++++ ...-rocm-tensorflow-notebook-imagestream.yaml | 29 +++++++++++++++++++ manifests/base/params.env | 3 ++ manifests/base/params.yaml | 12 ++++++++ 8 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml create mode 100644 manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml create mode 100644 manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh index 52d40d0cd..5c9bd3295 100755 --- a/ci/check-params-env.sh +++ b/ci/check-params-env.sh @@ -25,7 +25,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=20 +EXPECTED_NUM_RECORDS=23 # ---------------------------- DEFINED FUNCTIONS ----------------------------- # @@ -193,6 +193,21 @@ function check_image_variable_matches_name_and_commitref() { expected_commitref="2023b" expected_build_name="cuda-rstudio-c9s-python-3.9-amd64" ;; + odh-rocm-minimal-notebook-image-n) + expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9" + expected_commitref="2024a" + expected_build_name="rocm-jupyter-minimal-ubi9-python-3.9-amd64" + ;; + odh-rocm-pytorch-notebook-image-n) + expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.9" + expected_commitref="2024a" + expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.9-amd64" + ;; + odh-rocm-tensorflow-notebook-image-n) + expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9" + expected_commitref="2024a" + expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.9-amd64" + ;; *) echo "Unimplemented variable name: '${image_variable}'" return 1 diff --git a/manifests/base/commit.env b/manifests/base/commit.env index d7b5bc836..ca9d57be2 100644 --- a/manifests/base/commit.env +++ b/manifests/base/commit.env @@ -18,3 +18,6 @@ odh-rstudio-notebook-image-commit-n=81acd47 odh-rstudio-notebook-image-commit-n-1=5ad18c6 odh-rstudio-gpu-notebook-image-commit-n=81acd47 odh-rstudio-gpu-notebook-image-commit-n-1=5ad18c6 +odh-rocm-minimal-notebook-image-commit-n=89da2fc +odh-rocm-pytorch-notebook-image-commit-n=89da2fc +odh-rocm-tensorflow-notebook-image-commit-n=89da2fc diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml index ebf4b92ba..5d3e16053 100644 --- a/manifests/base/commit.yaml +++ b/manifests/base/commit.yaml @@ -80,3 +80,15 @@ varReference: kind: ImageStream apiGroup: image.openshift.io/v1 name: odh-rstudio-gpu-notebook-image-commit-n-1 + - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-minimal-notebook-image-commit-n + - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-pytorch-notebook-image-commit-n + - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-tensorflow-notebook-image-commit-n diff --git a/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml new file mode 100644 index 000000000..4b53c8693 --- /dev/null +++ b/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + labels: + opendatahub.io/notebook-image: "true" + annotations: + opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm" + opendatahub.io/notebook-image-name: "ROCM" + opendatahub.io/notebook-image-desc: "Jupyter ROCM notebook image for ODH notebooks." + opendatahub.io/notebook-image-order: "9" + name: jupyter-rocm-minimal +spec: + lookupPolicy: + local: true + tags: + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"ROCM","version":"6.1"},{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]' + openshift.io/imported-from: quay.io/opendatahub/workbench-images + opendatahub.io/workbench-image-recommended: 'true' + opendatahub.io/notebook-build-commit: $(jupyter-rocm-minimal-notebook-image-commit-n) + from: + kind: DockerImage + name: $(jupyter-rocm-minimal-notebook-image-n) + name: "2024.1" + referencePolicy: + type: Source diff --git a/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml new file mode 100644 index 000000000..d3227807e --- /dev/null +++ b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + labels: + opendatahub.io/notebook-image: "true" + annotations: + opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/pytorch" + opendatahub.io/notebook-image-name: "ROCM-PyTorch" + opendatahub.io/notebook-image-desc: "Jupyter ROCM optimized PyTorch notebook image for ODH notebooks." + opendatahub.io/notebook-image-order: "14" + name: jupyter-rocm-pytorch +spec: + lookupPolicy: + local: true + tags: + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCM-PyTorch","version":"2.3"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"ROCM-PyTorch","version":"2.3"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.8"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.4"},{"name":"Scipy","version":"1.12"},{"name":"Elyra","version":"3.16"},{"name":"PyMongo","version":"4.6"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.15"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]' + openshift.io/imported-from: quay.io/opendatahub/workbench-images + opendatahub.io/workbench-image-recommended: 'true' + opendatahub.io/notebook-build-commit: $(odh-rocm-pytorch-notebook-image-commit-n) + from: + kind: DockerImage + name: $(odh-rocm-pytorch-notebook-image-commit-n) + name: "2024.1" + referencePolicy: + type: Source diff --git a/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml new file mode 100644 index 000000000..629d1cdb4 --- /dev/null +++ b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + labels: + opendatahub.io/notebook-image: "true" + annotations: + opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/tensorflow" + opendatahub.io/notebook-image-name: "ROCM-TensorFlow" + opendatahub.io/notebook-image-desc: "Jupyter ROCM optimized TensorFlow notebook image for ODH notebooks." + opendatahub.io/notebook-image-order: "15" + name: jupyter-rocm-tensorflow +spec: + lookupPolicy: + local: true + tags: + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"},{"name":"ROCM-TensorFlow","version":"2.15"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"ROCM-TensorFlow","version":"2.15"},{"name":"Tensorboard","version":"2.15"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.8"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.4"},{"name":"Scipy","version":"1.12"},{"name":"Elyra","version":"3.16"},{"name":"PyMongo","version":"4.6"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.15"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]' + openshift.io/imported-from: quay.io/opendatahub/workbench-images + opendatahub.io/workbench-image-recommended: 'true' + opendatahub.io/notebook-build-commit: $(odh-rocm-tensorflow-notebook-image-commit-n) + from: + kind: DockerImage + name: $(odh-rocm-tensorflow-notebook-image-commit-n) + name: "2024.1" + referencePolicy: + type: Source diff --git a/manifests/base/params.env b/manifests/base/params.env index a2b3dbc25..c32aa9fee 100644 --- a/manifests/base/params.env +++ b/manifests/base/params.env @@ -18,3 +18,6 @@ odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:0221e88 odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:06c39f6bfe37df62d5964da786c23c8cef0218c9c1835c2299e6d8575cfab630 odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:0851ca8b5d00414d73c6a0f8628b777f4dbfeed4f6d394b03771e6bd70988b30 odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:1466ee1ad83c3a99b64d6635f8e57fc92658723650399c2a743195fca41cfb65 +odh-rocm-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:cd5237a06edf83773e16e76550619d095f9199f9a212443ca46bf829304375d2 +odh-rocm-pytorch-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:a259f8072f21a97c5cec0ef1b9e50bd37aebea1686550bdc0cebdc21c2d4c8c7 +odh-rocm-tensorflow-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:39ccee3c69aa1f49e8ca6ae7b7f437e0106646c046034a00e05257671d40fe2c diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml index e1bafc7a4..a7755920f 100644 --- a/manifests/base/params.yaml +++ b/manifests/base/params.yaml @@ -80,3 +80,15 @@ varReference: kind: ImageStream apiGroup: image.openshift.io/v1 name: odh-rstudio-gpu-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-minimal-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-pytorch-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rocm-tensorflow-notebook-image-n