diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml b/jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml index 1e1f6294e7..74b46e43a2 100644 --- a/jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml +++ b/jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml @@ -2202,12 +2202,6 @@ marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and s sdist = { url = "https://files.pythonhosted.org/packages/8a/11/965c6fd8e5cc254f1fe142d547387da17a8ebfd75a3455f637c663fb38a0/terminado-0.18.1.tar.gz", upload-time = 2024-03-12T14:34:39Z, size = 32701, hashes = { sha256 = "de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e" } } wheels = [{ url = "https://files.pythonhosted.org/packages/6a/9e/2064975477fdc887e47ad42157e214526dcad8f317a948dee17e1659a62f/terminado-0.18.1-py3-none-any.whl", upload-time = 2024-03-12T14:34:36Z, size = 14154, hashes = { sha256 = "a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0" } }] -[[packages]] -name = "tf2onnx" -version = "1.16.1" -marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'" -wheels = [{ url = "https://files.pythonhosted.org/packages/3f/48/826db3d02645d84e7ee5d5ce8407f771057d40fe224d9c3e89536674ccef/tf2onnx-1.16.1-py3-none-any.whl", upload-time = 2024-01-16T10:30:19Z, size = 455820, hashes = { sha256 = "90fb5f62575896d47884d27dc313cfebff36b8783e1094335ad00824ce923a8a" } }] - [[packages]] name = "threadpoolctl" version = "3.6.0" diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml b/jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml index ad95fa7bd8..9711466a2b 100644 --- a/jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml +++ b/jupyter/rocm/tensorflow/ubi9-python-3.12/pyproject.toml @@ -4,7 +4,6 @@ version = "0.1.0" requires-python = "==3.12.*" dependencies = [ - "tf2onnx~=1.16.1", # ROCm TensorFlow packages # https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/3rd-party/tensorflow-install.html#using-a-wheels-package @@ -62,7 +61,8 @@ override-dependencies = [ "jupyterlab>=4.5.7", # RHAIENG-3211: CVE-2026-26007 cryptography Subgroup Attack "cryptography>=46.0.7", - # tf2onnx has pinned protobuf version, that causes conflict with other packages + # tensorflow-rocm depends on protobuf>=3.20.3, <6.0.0 and kfp depends on protobuf>=6.31.1 + # RHAIENG-4324: protobuf 6.33.x UPB C extension segfaults on s390x; pin 6.31.1 (ROCm is amd64-only but matches fleet pin) "protobuf==6.31.1", "keras>=3.14.0", # RHAIENG-2458: CVE-2025-66418 urllib3 decompression vulnerability diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb b/jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb index 0229c51c2a..afbdd3567e 100644 --- a/jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb +++ b/jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb @@ -14,7 +14,6 @@ "from platform import python_version\n", "\n", "import tensorflow as tf\n", - "import tf2onnx\n", "\n", "\n", "def get_major_minor(s):\n", @@ -49,22 +48,6 @@ " actual_major_minor = get_major_minor(tf.__version__)\n", " self.assertEqual(actual_major_minor, expected_major_minor, \"incorrect version\")\n", "\n", - " @unittest.skip(\"https://github.com/onnx/tensorflow-onnx/issues/2329 about Keras 3 incompatibility\")\n", - " def test_tf2onnx_conversion(self):\n", - " # Replace this with an actual TensorFlow model conversion using tf2onnx\n", - " model = tf.keras.Sequential([tf.keras.layers.Dense(1, input_shape=(10,))])\n", - "\n", - " # WORKAROUND: known issue https://github.com/onnx/tensorflow-onnx/issues/2319 with tf 2.15+: the conversion would fail with\n", - " # AttributeError: 'Sequential' object has no attribute 'output_names'. Did you mean: 'output_shape'?\n", - " model.output_names=['output']\n", - "\n", - "\n", - " # known issue https://github.com/keras-team/keras/issues/18430 with tf 2.15+: the conversion would fail with\n", - " # AttributeError: 'Sequential' object has no attribute '_get_save_spec'. Did you mean: '_set_save_spec'?\n", - " onnx_model = tf2onnx.convert.from_keras(model)\n", - "\n", - " self.assertTrue(onnx_model is not None)\n", - "\n", " def test_mnist_model(self):\n", " # A basic test from the official tensorflow webpage https://www.tensorflow.org/tutorials/quickstart/beginner\n", " mnist = tf.keras.datasets.mnist\n", diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm b/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm index 4a7ce7ce47..53363e90ab 100644 --- a/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm +++ b/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.konflux.rocm @@ -73,8 +73,6 @@ RUN chmod -R g+w /opt/app-root/lib/python3.12/site-packages && \ fix-permissions /opt/app-root -P USER 1001 -COPY ${JUPYTER_REUSABLE_UTILS}/usercustomize.pth ${JUPYTER_REUSABLE_UTILS}/monkey_patch_protobuf_6x.py /opt/app-root/lib/python3.12/site-packages/ - # Workaround for https://issues.redhat.com/browse/AIPCC-8152 ENV ROCM_PATH=/opt/rocm # Workaround for 2.25.2 issue https://issues.redhat.com/browse/RHAIENG-1638 missing rocm package in older AIPCC builds diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm b/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm index d6d3a66a68..14462835f0 100644 --- a/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm +++ b/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm @@ -83,8 +83,6 @@ RUN chmod -R g+w /opt/app-root/lib/python3.12/site-packages && \ fix-permissions /opt/app-root -P USER 1001 -COPY ${JUPYTER_REUSABLE_UTILS}/usercustomize.pth ${JUPYTER_REUSABLE_UTILS}/monkey_patch_protobuf_6x.py /opt/app-root/lib/python3.12/site-packages/ - # Workaround for https://issues.redhat.com/browse/AIPCC-8152 ENV ROCM_PATH=/opt/rocm # Workaround for 2.25.2 issue https://issues.redhat.com/browse/RHAIENG-1638 missing rocm package in older AIPCC builds diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml b/runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml index 1c4fbe3b5e..eaf2a564b4 100644 --- a/runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml +++ b/runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml @@ -1244,12 +1244,12 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/cd/24/3b7a0818484df9c [[packages]] name = "protobuf" -version = "6.31.1" +version = "5.29.6" marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'" -sdist = { url = "https://files.pythonhosted.org/packages/52/f3/b9655a711b32c19720253f6f06326faf90580834e2e83f840472d752bc8b/protobuf-6.31.1.tar.gz", upload-time = 2025-05-28T19:25:54Z, size = 441797, hashes = { sha256 = "d8cac4c982f0b957a4dc73a80e2ea24fab08e679c0de9deb835f4a12d69aca9a" } } +sdist = { url = "https://files.pythonhosted.org/packages/7e/57/394a763c103e0edf87f0938dafcd918d53b4c011dfc5c8ae80f3b0452dbb/protobuf-5.29.6.tar.gz", upload-time = 2026-02-04T22:54:40Z, size = 425623, hashes = { sha256 = "da9ee6a5424b6b30fd5e45c5ea663aef540ca95f9ad99d1e887e819cdf9b8723" } } wheels = [ - { url = "https://files.pythonhosted.org/packages/fa/b1/b59d405d64d31999244643d88c45c8241c58f17cc887e73bcb90602327f8/protobuf-6.31.1-cp39-abi3-manylinux2014_x86_64.whl", upload-time = 2025-05-28T19:25:50Z, size = 321070, hashes = { sha256 = "4ee898bf66f7a8b0bd21bce523814e6fbd8c6add948045ce958b73af7e8878c6" } }, - { url = "https://files.pythonhosted.org/packages/f7/af/ab3c51ab7507a7325e98ffe691d9495ee3d3aa5f589afad65ec920d39821/protobuf-6.31.1-py3-none-any.whl", upload-time = 2025-05-28T19:25:53Z, size = 168724, hashes = { sha256 = "720a6c7e6b77288b85063569baae8536671b39f15cc22037ec7045658d80489e" } }, + { url = "https://files.pythonhosted.org/packages/e3/dd/cadd6ec43069247d91f6345fa7a0d2858bef6af366dbd7ba8f05d2c77d3b/protobuf-5.29.6-cp38-abi3-manylinux2014_x86_64.whl", upload-time = 2026-02-04T22:54:32Z, size = 320478, hashes = { sha256 = "e3387f44798ac1106af0233c04fb8abf543772ff241169946f698b3a9a3d3ab9" } }, + { url = "https://files.pythonhosted.org/packages/5a/cb/e3065b447186cb70aa65acc70c86baf482d82bf75625bf5a2c4f6919c6a3/protobuf-5.29.6-py3-none-any.whl", upload-time = 2026-02-04T22:54:39Z, size = 173126, hashes = { sha256 = "6b9edb641441b2da9fa8f428760fc136a49cf97a52076010cf22a2ff73438a86" } }, ] [[packages]] @@ -1678,12 +1678,6 @@ marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and s sdist = { url = "https://files.pythonhosted.org/packages/46/79/cf31d7a93a8fdc6aa0fbb665be84426a8c5a557d9240b6239e9e11e35fc5/termcolor-3.3.0.tar.gz", upload-time = 2025-12-29T12:55:21Z, size = 14434, hashes = { sha256 = "348871ca648ec6a9a983a13ab626c0acce02f515b9e1983332b17af7979521c5" } } wheels = [{ url = "https://files.pythonhosted.org/packages/33/d1/8bb87d21e9aeb323cc03034f5eaf2c8f69841e40e4853c2627edf8111ed3/termcolor-3.3.0-py3-none-any.whl", upload-time = 2025-12-29T12:55:20Z, size = 7734, hashes = { sha256 = "cf642efadaf0a8ebbbf4bc7a31cec2f9b5f21a9f726f4ccbb08192c9c26f43a5" } }] -[[packages]] -name = "tf2onnx" -version = "1.16.1" -marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'" -wheels = [{ url = "https://files.pythonhosted.org/packages/3f/48/826db3d02645d84e7ee5d5ce8407f771057d40fe224d9c3e89536674ccef/tf2onnx-1.16.1-py3-none-any.whl", upload-time = 2024-01-16T10:30:19Z, size = 455820, hashes = { sha256 = "90fb5f62575896d47884d27dc313cfebff36b8783e1094335ad00824ce923a8a" } }] - [[packages]] name = "threadpoolctl" version = "3.6.0" diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml b/runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml index a0701fb8a4..8127fc473a 100644 --- a/runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml +++ b/runtimes/rocm-tensorflow/ubi9-python-3.12/pyproject.toml @@ -4,7 +4,6 @@ version = "0.1.0" requires-python = "==3.12.*" dependencies = [ - "tf2onnx~=1.16.1", # ROCm TensorFlow packages # https://rocm.docs.amd.com/projects/install-on-linux/en/latest/install/3rd-party/tensorflow-install.html#using-a-wheels-package @@ -63,8 +62,6 @@ dependencies = [ override-dependencies = [ # RHAIENG-3211: CVE-2026-26007 cryptography Subgroup Attack "cryptography>=46.0.7", - # tf2onnx has pinned protobuf version, that causes conflict with other packages - "protobuf==6.31.1", "keras>=3.14.0", # RHAIENG-3209: CVE-2026-25990 Pillow: Out-of-bounds Write # Upstream: https://github.com/vllm-project/llm-compressor/releases/tag/0.7.1.1