Skip to content

Commit f53511d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #361 from dibryant/amd
[RHOAI] Updated image manifests with AMD images for minimal pytorch and tensorflow
2 parents cb6982f + b8f2be0 commit f53511d

9 files changed

+181
-1
lines changed

‎ci/check-params-env.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
2525

2626
# This value needs to be updated everytime we deliberately change number of the
2727
# images we want to have in the `params.env` file.
28-
EXPECTED_NUM_RECORDS=27
28+
EXPECTED_NUM_RECORDS=30
2929

3030
# ---------------------------- DEFINED FUNCTIONS ----------------------------- #
3131

@@ -225,6 +225,21 @@ function check_image_variable_matches_name_and_commitref() {
225225
expected_commitref="release-2023b"
226226
expected_build_name="codeserver-ubi9-python-3.9-amd64"
227227
;;
228+
odh-rocm-minimal-notebook-image-n)
229+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
230+
expected_commitref="release-2024b"
231+
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
232+
;;
233+
odh-rocm-pytorch-notebook-image-n)
234+
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
235+
expected_commitref="release-2024b"
236+
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
237+
;;
238+
odh-rocm-tensorflow-notebook-image-n)
239+
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
240+
expected_commitref="release-2024b"
241+
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
242+
;;
228243
*)
229244
echo "Unimplemented variable name: '${image_variable}'"
230245
return 1

‎manifests/base/commit.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ odh-codeserver-notebook-image-commit-n=b5a8318
2525
odh-codeserver-notebook-image-commit-n-1=76a016f
2626
odh-habana-notebook-image-commit-n=b5a8318
2727
odh-habana-notebook-image-commit-n-1=76a016f
28+
odh-rocm-minimal-notebook-image-commit-n=31ad6bc
29+
odh-rocm-pytorch-notebook-image-commit-n=31ad6bc
30+
odh-rocm-tensorflow-notebook-image-commit-n=31ad6bc

‎manifests/base/commit.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,15 @@ varReference:
108108
kind: ImageStream
109109
apiGroup: image.openshift.io/v1
110110
name: odh-codeserver-notebook-image-commit-n-1
111+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
112+
kind: ImageStream
113+
apiGroup: image.openshift.io/v1
114+
name: odh-rocm-minimal-notebook-image-commit-n
115+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
116+
kind: ImageStream
117+
apiGroup: image.openshift.io/v1
118+
name: odh-rocm-pytorch-notebook-image-commit-n
119+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
120+
kind: ImageStream
121+
apiGroup: image.openshift.io/v1
122+
name: odh-rocm-tensorflow-notebook-image-commit-n

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/rocm"
9+
opendatahub.io/notebook-image-name: "ROCm"
10+
opendatahub.io/notebook-image-desc: "Jupyter ROCm notebook image for ODH notebooks."
11+
opendatahub.io/notebook-image-order: "90"
12+
opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
13+
name: jupyter-rocm-minimal
14+
spec:
15+
lookupPolicy:
16+
local: true
17+
tags:
18+
# N Version of the image
19+
- annotations:
20+
opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.11"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
22+
openshift.io/imported-from: quay.io/modh/rocm-notebooks
23+
opendatahub.io/workbench-image-recommended: 'true'
24+
opendatahub.io/notebook-build-commit: $(odh-rocm-minimal-notebook-image-commit-n)
25+
from:
26+
kind: DockerImage
27+
name: $(odh-rocm-minimal-notebook-image-n)
28+
name: "2024.2"
29+
referencePolicy:
30+
type: Source

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/rocm/pytorch"
9+
opendatahub.io/notebook-image-name: "ROCm-PyTorch"
10+
opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized PyTorch notebook image for ODH notebooks."
11+
opendatahub.io/notebook-image-order: "40"
12+
opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
13+
name: jupyter-rocm-pytorch
14+
spec:
15+
lookupPolicy:
16+
local: true
17+
tags:
18+
# N Version of the image
19+
- annotations:
20+
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"3.0"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"3.0"},{"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.19"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
22+
openshift.io/imported-from: quay.io/modh/rocm-notebooks
23+
opendatahub.io/workbench-image-recommended: 'true'
24+
opendatahub.io/notebook-build-commit: $(odh-rocm-pytorch-notebook-image-commit-n)
25+
from:
26+
kind: DockerImage
27+
name: $(odh-rocm-pytorch-notebook-image-n)
28+
name: "2024.2"
29+
referencePolicy:
30+
type: Source

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/rocm/tensorflow"
9+
opendatahub.io/notebook-image-name: "ROCm-TensorFlow"
10+
opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized TensorFlow notebook image for ODH notebooks."
11+
opendatahub.io/notebook-image-order: "50"
12+
opendatahub.io/recommended-accelerators: '[amd.com/gpu"]'
13+
name: jupyter-rocm-tensorflow
14+
spec:
15+
lookupPolicy:
16+
local: true
17+
tags:
18+
# N Version of the image
19+
- annotations:
20+
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-TensorFlow","version":"2.14"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.14"},{"name":"Tensorboard","version":"2.14"},{"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.19"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
22+
openshift.io/imported-from: quay.io/modh/rocm-notebooks
23+
opendatahub.io/workbench-image-recommended: 'true'
24+
opendatahub.io/notebook-build-commit: $(odh-rocm-tensorflow-notebook-image-commit-n)
25+
from:
26+
kind: DockerImage
27+
name: $(odh-rocm-tensorflow-notebook-image-n)
28+
name: "2024.2"
29+
referencePolicy:
30+
type: Source

‎manifests/base/kustomization.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ resources:
1212
- code-server-notebook-imagestream.yaml
1313
- rstudio-buildconfig.yaml
1414
- cuda-rstudio-buildconfig.yaml
15+
- jupyter-rocm-minimal-notebook-imagestream.yaml
16+
- jupyter-rocm-pytorch-notebook-imagestream.yaml
17+
- jupyter-rocm-tensorflow-notebook-imagestream.yaml
1518

1619
commonLabels:
1720
opendatahub.io/component: "true"
@@ -214,6 +217,27 @@ vars:
214217
apiVersion: v1
215218
fieldref:
216219
fieldpath: data.odh-codeserver-notebook-image-n-1
220+
- name: odh-rocm-minimal-notebook-image-n
221+
objref:
222+
kind: ConfigMap
223+
name: notebooks-parameters
224+
apiVersion: v1
225+
fieldref:
226+
fieldpath: data.odh-rocm-minimal-notebook-image-n
227+
- name: odh-rocm-pytorch-notebook-image-n
228+
objref:
229+
kind: ConfigMap
230+
name: notebooks-parameters
231+
apiVersion: v1
232+
fieldref:
233+
fieldpath: data.odh-rocm-pytorch-notebook-image-n
234+
- name: odh-rocm-tensorflow-notebook-image-n
235+
objref:
236+
kind: ConfigMap
237+
name: notebooks-parameters
238+
apiVersion: v1
239+
fieldref:
240+
fieldpath: data.odh-rocm-tensorflow-notebook-image-n
217241
- name: odh-minimal-notebook-image-commit-n
218242
objref:
219243
kind: ConfigMap
@@ -403,6 +427,27 @@ vars:
403427
apiVersion: v1
404428
fieldref:
405429
fieldpath: data.odh-codeserver-notebook-image-commit-n-1
430+
- name: odh-rocm-minimal-notebook-image-commit-n
431+
objref:
432+
kind: ConfigMap
433+
name: notebook
434+
apiVersion: v1
435+
fieldref:
436+
fieldpath: data.odh-rocm-minimal-notebook-image-commit-n
437+
- name: odh-rocm-pytorch-notebook-image-commit-n
438+
objref:
439+
kind: ConfigMap
440+
name: notebook
441+
apiVersion: v1
442+
fieldref:
443+
fieldpath: data.odh-rocm-pytorch-notebook-image-commit-n
444+
- name: odh-rocm-tensorflow-notebook-image-commit-n
445+
objref:
446+
kind: ConfigMap
447+
name: notebook
448+
apiVersion: v1
449+
fieldref:
450+
fieldpath: data.odh-rocm-tensorflow-notebook-image-commit-n
406451
configurations:
407452
- params.yaml
408453
- commit.yaml

‎manifests/base/params.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ odh-codeserver-notebook-image-n=quay.io/modh/codeserver@sha256:4b6b563e75f9e642b
2525
odh-codeserver-notebook-image-n-1=quay.io/modh/codeserver@sha256:b1a048f3711149e36a89e0eda1a5601130fb536ecc0aabae42ab6e4d26977354
2626
odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:4317c67037e1150fc62f8c688696d3210e4151d6ed4415dd969e60850e871c64
2727
odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:6923f084d66bf6b9b2bf87edfb9b3c1f8f9a5f2005482fbcc060c9872db8d28a
28+
odh-rocm-minimal-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:64a90dbbe594463ff4ee6974fe8e555dc71b93fe3c3a53330b0e760784b717c0
29+
odh-rocm-pytorch-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:49b4c02cc00cbc4a1b1fd2b446e086d3f5ebbd987f998431d036b5c7208cab06
30+
odh-rocm-tensorflow-notebook-image-n=quay.io/modh/rocm-notebooks@sha256:1eda675fa9b67ac3c71d29b7391a8142946972bb92912908927d9fa5bf7ef4aa

‎manifests/base/params.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,15 @@ varReference:
108108
kind: ImageStream
109109
apiGroup: image.openshift.io/v1
110110
name: odh-codeserver-notebook-image-n-1
111+
- path: spec/tags[]/from/name
112+
kind: ImageStream
113+
apiGroup: image.openshift.io/v1
114+
name: odh-rocm-minimal-notebook-image-n
115+
- path: spec/tags[]/from/name
116+
kind: ImageStream
117+
apiGroup: image.openshift.io/v1
118+
name: odh-rocm-pytorch-notebook-image-n
119+
- path: spec/tags[]/from/name
120+
kind: ImageStream
121+
apiGroup: image.openshift.io/v1
122+
name: odh-rocm-tensorflow-notebook-image-n

0 commit comments

Comments
 (0)