Skip to content

Commit 9bfef1f

Browse files
atheo89atheo89
authored
Merge pull request opendatahub-io#2595 from jiridanek/jd_rocm_63
RHAIENG-1512: fix(ROCm/TensorFlow) repository URL to install ROCm 6.3.4 as in AIPCC base image
2 parents 475983e + 9958ffb commit 9bfef1f

File tree

8 files changed

+212
-1646
lines changed

8 files changed

+212
-1646
lines changed

‎jupyter/rocm/tensorflow/ubi9-python-3.12/build-args/rocm.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BASE_IMAGE=quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:v6.4
1+
BASE_IMAGE=quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:v6.3

‎jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml‎

Lines changed: 92 additions & 786 deletions
Large diffs are not rendered by default.

‎jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ dependencies = [
88

99
# ROCm TensorFlow packages
1010
# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/3rd-party/tensorflow-install.html#using-a-wheels-package
11-
"tensorflow-rocm @ https://repo.radeon.com/rocm/manylinux/rocm-rel-6.4/tensorflow_rocm-2.18.1-cp312-cp312-manylinux_2_28_x86_64.whl#sha256=814a5e4842b0c92d63c7a0bb4df0baf51ff2db8615535d83fe8958204b840598",
12-
"tensorboard~=2.18.0", # tensorflow-rocm==2.18.1 is available and tensorflow-rocm==2.18.1 depends on tensorboard>=2.18,<2.19
11+
# TODO(jdanek): consider adding #sha256=814a5e4842b0c92d63c7a0bb4df0baf51ff2db8615535d83fe8958204b840598
12+
"tensorflow-rocm @ https://repo.radeon.com/rocm/manylinux/rocm-rel-6.3/tensorflow_rocm-2.17.0-cp312-cp312-manylinux_2_28_x86_64.whl",
13+
# tensorflow-rocm==2.x needs tensorboard>=2.x,<2.x+1
14+
"tensorboard~=2.17.0",
1315

1416
# Datascience and useful extensions
1517
"boto3~=1.40.52",
1618
"kafka-python-ng~=2.2.3",
1719
"kfp~=2.14.6",
1820
"matplotlib~=3.10.7",
19-
"numpy~=2.0.2",
21+
"numpy~=1.26.4",
2022
"pandas~=2.3.3",
2123
"plotly~=6.3.1",
2224
"scikit-learn~=1.7.2",
@@ -25,7 +27,6 @@ dependencies = [
2527
"onnxconverter-common~=1.13.0", # Required for skl2onnx, as upgraded version is not compatible with protobuf
2628
"codeflare-sdk~=0.32.0",
2729
"kubeflow-training==1.9.3",
28-
"feast~=0.55.0",
2930

3031
# DB connectors
3132
"pymongo~=4.15.3",
@@ -61,6 +62,11 @@ override-dependencies = [
6162
"protobuf==6.31.1"
6263
]
6364

65+
constraint-dependencies = [
66+
# AttributeError: module 'ml_dtypes' has no attribute 'float4_e2m1fn'
67+
"onnx<1.19.0",
68+
]
69+
6470
environments = [
6571
"sys_platform == 'linux' and implementation_name == 'cpython'",
6672
]

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,26 @@ spec:
2020
# language=json
2121
opendatahub.io/notebook-software: |
2222
[
23-
{"name": "ROCm", "version": "v6.4"},
23+
{"name": "ROCm", "version": "v6.3"},
2424
{"name": "Python", "version": "v3.12"},
25-
{"name": "TensorFlow-ROCm", "version": "2.18"}
25+
{"name": "TensorFlow-ROCm", "version": "2.17"}
2626
]
2727
# language=json
2828
opendatahub.io/notebook-python-dependencies: |
2929
[
3030
{"name": "JupyterLab","version": "4.4"},
31-
{"name": "TensorFlow-ROCm", "version": "2.18"},
32-
{"name": "Tensorboard", "version": "2.18"},
31+
{"name": "TensorFlow-ROCm", "version": "2.17"},
32+
{"name": "Tensorboard", "version": "2.17"},
3333
{"name": "Kafka-Python-ng", "version": "2.2"},
3434
{"name": "Matplotlib", "version": "3.10"},
35-
{"name": "Numpy", "version": "2.0"},
35+
{"name": "Numpy", "version": "1.26"},
3636
{"name": "Pandas", "version": "2.3"},
3737
{"name": "Scikit-learn", "version": "1.7"},
3838
{"name": "Scipy", "version": "1.16"},
3939
{"name": "Odh-Elyra", "version": "4.3"},
4040
{"name": "PyMongo", "version": "4.15"},
4141
{"name": "Pyodbc", "version": "5.2"},
4242
{"name": "Codeflare-SDK", "version": "0.32"},
43-
{"name": "Feast", "version": "0.55"},
4443
{"name": "Sklearn-onnx", "version": "1.19"},
4544
{"name": "Psycopg", "version": "3.2"},
4645
{"name": "MySQL Connector/Python", "version": "9.4"}

‎runtimes/rocm-tensorflow/ubi9-python-3.12/build-args/rocm.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BASE_IMAGE=quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:v6.2
1+
BASE_IMAGE=quay.io/opendatahub/odh-base-image-rocm-py312-ubi9:v6.3

‎runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml‎

Lines changed: 91 additions & 840 deletions
Large diffs are not rendered by default.

‎runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ dependencies = [
88

99
# ROCm TensorFlow packages
1010
# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/3rd-party/tensorflow-install.html#using-a-wheels-package
11-
"tensorflow-rocm @ https://repo.radeon.com/rocm/manylinux/rocm-rel-6.4/tensorflow_rocm-2.18.1-cp312-cp312-manylinux_2_28_x86_64.whl#sha256=814a5e4842b0c92d63c7a0bb4df0baf51ff2db8615535d83fe8958204b840598",
12-
"tensorboard~=2.18.0", # tensorflow-rocm==2.18.1 is available and tensorflow-rocm==2.18.1 depends on tensorboard>=2.18,<2.19
11+
# TODO(jdanek): consider adding #sha256=814a5e4842b0c92d63c7a0bb4df0baf51ff2db8615535d83fe8958204b840598
12+
"tensorflow-rocm @ https://repo.radeon.com/rocm/manylinux/rocm-rel-6.3/tensorflow_rocm-2.17.0-cp312-cp312-manylinux_2_28_x86_64.whl",
13+
# tensorflow-rocm==2.x needs tensorboard>=2.x,<2.x+1
14+
"tensorboard~=2.17.0",
1315

1416
# Datascience and useful extensions
1517
"boto3~=1.40.52",
1618
"kafka-python-ng~=2.2.3",
1719
"matplotlib~=3.10.7",
18-
"numpy~=2.0.2",
20+
"numpy~=1.26.4",
1921
"pandas~=2.3.3",
2022
"plotly~=6.3.1",
2123
"scikit-learn~=1.7.2",
@@ -24,7 +26,6 @@ dependencies = [
2426
# Required for skl2onnx, as upgraded version is not compatible with protobuf
2527
"onnxconverter-common~=1.13.0",
2628
"codeflare-sdk~=0.32.0",
27-
"feast~=0.55.0",
2829

2930
# DB connectors
3031
"pymongo~=4.15.3",
@@ -64,6 +65,11 @@ override-dependencies = [
6465
"protobuf==6.31.1"
6566
]
6667

68+
constraint-dependencies = [
69+
# AttributeError: module 'ml_dtypes' has no attribute 'float4_e2m1fn'
70+
"onnx<1.19.0",
71+
]
72+
6773
environments = [
6874
"sys_platform == 'linux' and implementation_name == 'cpython'",
6975
]

‎tests/test_main.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,12 @@ class VersionData:
225225
"Numpy",
226226
(
227227
"1.26", # trustyai 0.6.2 depends on numpy~=1.26.4
228-
"2.0", # for tensorflow rocm
229228
"2.1", # for tensorflow cuda
230229
"2.2", # for python 3.11 n-1 images
231230
"2.3", # this is our latest where possible
232231
),
233232
),
234-
("Tensorboard", ("2.20", "2.18")),
233+
("Tensorboard", ("2.20", "2.17")),
235234
("PyTorch", ("2.6", "2.7")),
236235
)
237236

@@ -277,7 +276,7 @@ def test_image_pyprojects_version_alignment(subtests: pytest_subtests.plugin.Sub
277276
# ("package name", ("allowed specifier 1", "allowed specifier 2", ...))
278277
("setuptools", ("~=80.9.0", "==80.9.0")),
279278
("wheel", ("==0.45.1", "~=0.45.1")),
280-
("tensorboard", ("~=2.18.0", "~=2.20.0")),
279+
("tensorboard", ("~=2.17.0", "~=2.20.0")),
281280
("torch", ("==2.7.1", "==2.7.1+cu128", "==2.7.1+rocm6.2.4")),
282281
("torchvision", ("==0.22.1", "~=0.22.1", "==0.22.1+cu128", "==0.22.1+rocm6.2.4")),
283282
(
@@ -288,7 +287,6 @@ def test_image_pyprojects_version_alignment(subtests: pytest_subtests.plugin.Sub
288287
"numpy",
289288
(
290289
"~=1.26.4", # trustyai 0.6.2 depends on numpy~=1.26.4
291-
"~=2.0.2", # for tensorflow rocm
292290
"~=2.1.3",
293291
"~=2.2.6",
294292
"~=2.3.4", # for tensorflow cuda and latest possible

0 commit comments

Comments
 (0)