Skip to content

Commit da5d4bf

Browse files
harshad16dibryant
harshad16
and
dibryant
authored
Set the manifests in right order with minor fixes (#735)
* Set the manifests in right order with minor fixes - Introduce ROCm based images to imagestream list - Updated ROCm based images with amd.com/gpu annotation Signed-off-by: Harshad Reddy Nalla <[email protected]> * Adjust the annotation containing python package information Signed-off-by: Harshad Reddy Nalla <[email protected]> --------- Signed-off-by: Harshad Reddy Nalla <[email protected]> Co-authored-by: Diamond Bryant <[email protected]>
1 parent 6347ae5 commit da5d4bf

10 files changed

+110
-41
lines changed

‎manifests/base/README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# IDE Imagestreams
2+
3+
Listing the order in which each imagestreams are introduced.
4+
5+
1. jupyter-minimal-notebook-imagestream.yaml
6+
2. jupyter-datascience-notebook-imagestream.yaml
7+
3. jupyter-minimal-gpu-notebook-imagestream.yaml
8+
4. jupyter-pytorch-notebook-imagestream.yaml
9+
5. jupyter-tensorflow-notebook-imagestream.yaml
10+
6. jupyter-trustyai-notebook-imagestream.yaml
11+
7. ~~jupyter-habana-notebook-imagestream.yaml~~ # Deprecated
12+
8. code-server-notebook-imagestream.yaml
13+
9. rstudio-notebook-imagestream.yaml
14+
10. rstudio-gpu-notebook-imagestream.yaml
15+
11. jupyter-rocm-minimal-notebook-imagestream.yaml
16+
12. jupyter-rocm-pytorch-notebook-imagestream.yaml
17+
13. jupyter-rocm-tensorflow-notebook-imagestream.yaml
18+
19+
The order would also be same as `opendatahub.io/notebook-image-order` listed in each imagestreams.
20+
*Note*: On deprecation/removal of imagestream, the index of that image is retired with it.

‎manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
# N Version of the image
1919
- annotations:
2020
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"}]'
21-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"},{"name": "Notebook","version": "6.5"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"}]'
2222
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2323
opendatahub.io/workbench-image-recommended: 'true'
2424
opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n)

‎manifests/base/jupyter-minimal-notebook-imagestream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
# N Version of the image
1818
- annotations:
1919
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
20-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "4.2"}, {"name": "Notebook","version": "6.5"}]'
20+
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "4.2"}]'
2121
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2222
opendatahub.io/workbench-image-recommended: 'true'
2323
opendatahub.io/default-image: "true"

‎manifests/base/jupyter-pytorch-notebook-imagestream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
# N Version of the image
1919
- annotations:
2020
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"},{"name":"PyTorch","version":"2.4"}]'
21-
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.17"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.17"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
2222
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2323
opendatahub.io/workbench-image-recommended: 'true'
2424
opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n)

‎manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ metadata:
88
opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm"
99
opendatahub.io/notebook-image-name: "ROCm"
1010
opendatahub.io/notebook-image-desc: "Jupyter ROCm notebook image for ODH notebooks."
11-
opendatahub.io/notebook-image-order: "9"
11+
opendatahub.io/notebook-image-order: "11"
12+
opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
1213
name: jupyter-rocm-minimal
1314
spec:
1415
lookupPolicy:
@@ -17,13 +18,13 @@ spec:
1718
# N Version of the image
1819
- annotations:
1920
opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.11"}]'
20-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"}]'
2122
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2223
opendatahub.io/workbench-image-recommended: 'true'
23-
opendatahub.io/notebook-build-commit: $(jupyter-rocm-minimal-notebook-image-commit-n)
24+
opendatahub.io/notebook-build-commit: $(odh-rocm-minimal-notebook-image-commit-n)
2425
from:
2526
kind: DockerImage
26-
name: $(jupyter-rocm-minimal-notebook-image-n)
27+
name: $(odh-rocm-minimal-notebook-image-n)
2728
name: "2024.2"
2829
referencePolicy:
2930
type: Source

‎manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@ metadata:
88
opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/pytorch"
99
opendatahub.io/notebook-image-name: "ROCm-PyTorch"
1010
opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized PyTorch notebook image for ODH notebooks."
11-
opendatahub.io/notebook-image-order: "14"
11+
opendatahub.io/notebook-image-order: "12"
12+
opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
1213
name: jupyter-rocm-pytorch
1314
spec:
1415
lookupPolicy:
1516
local: true
1617
tags:
1718
# N Version of the image
1819
- annotations:
19-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"3.0"}]'
20-
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"3.0"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
20+
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"2.4"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
2122
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2223
opendatahub.io/workbench-image-recommended: 'true'
2324
opendatahub.io/notebook-build-commit: $(odh-rocm-pytorch-notebook-image-commit-n)
2425
from:
2526
kind: DockerImage
26-
name: $(odh-rocm-pytorch-notebook-image-commit-n)
27+
name: $(odh-rocm-pytorch-notebook-image-n)
2728
name: "2024.2"
2829
referencePolicy:
2930
type: Source

‎manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ metadata:
88
opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/tensorflow"
99
opendatahub.io/notebook-image-name: "ROCm-TensorFlow"
1010
opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized TensorFlow notebook image for ODH notebooks."
11-
opendatahub.io/notebook-image-order: "15"
11+
opendatahub.io/notebook-image-order: "13"
12+
opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
1213
name: jupyter-rocm-tensorflow
1314
spec:
1415
lookupPolicy:
@@ -17,13 +18,13 @@ spec:
1718
# N Version of the image
1819
- annotations:
1920
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-TensorFlow","version":"2.14"}]'
20-
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.14"},{"name":"Tensorboard","version":"2.14"},{"name":"Kafka-Python","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.14"},{"name":"Tensorboard","version":"2.14"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
2122
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2223
opendatahub.io/workbench-image-recommended: 'true'
2324
opendatahub.io/notebook-build-commit: $(odh-rocm-tensorflow-notebook-image-commit-n)
2425
from:
2526
kind: DockerImage
26-
name: $(odh-rocm-tensorflow-notebook-image-commit-n)
27+
name: $(odh-rocm-tensorflow-notebook-image-n)
2728
name: "2024.2"
2829
referencePolicy:
2930
type: Source

‎manifests/base/jupyter-tensorflow-notebook-imagestream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
# N Version of the image
1919
- annotations:
2020
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"},{"name":"TensorFlow","version":"2.17"}]'
21-
opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.17"},{"name":"Tensorboard","version":"2.17"},{"name":"Nvidia-CUDA-CU12-Bundle","version":"2.13"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.5"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.17"},{"name":"Tensorboard","version":"2.17"},{"name":"Nvidia-CUDA-CU12-Bundle","version":"2.13"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.5"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
2222
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2323
opendatahub.io/workbench-image-recommended: 'true'
2424
opendatahub.io/notebook-build-commit: $(odh-tensorflow-gpu-notebook-image-commit-n)

‎manifests/base/jupyter-trustyai-notebook-imagestream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
# N Version of the image
1818
- annotations:
1919
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
20-
opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.6"},{"name":"Transformers","version":"4.36"},{"name":"Datasets","version":"2.21"},{"name":"Accelerate","version":"0.34"},{"name":"Torch","version":"2.2"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
20+
opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.6"},{"name":"Transformers","version":"4.36"},{"name":"Datasets","version":"2.21"},{"name":"Accelerate","version":"0.34"},{"name":"Torch","version":"2.2"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
2121
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2222
opendatahub.io/workbench-image-recommended: 'true'
2323
opendatahub.io/notebook-build-commit: $(odh-trustyai-notebook-image-commit-n)

0 commit comments

Comments
 (0)