Merge remote-tracking branch 'upstream/main'

Author: jiridanek

base-images/cpu/c9s-python-3.12/Dockerfile.cpu

@@ -0,0 +1,22 @@
+ARG TARGETARCH
+
+FROM quay.io/sclorg/python-312-c9s:c9s AS buildscripts
+COPY base-images/utils/aipcc.sh /mnt/aipcc.sh
+
+####################
+# base             #
+####################
+FROM quay.io/sclorg/python-312-c9s:c9s AS base
+
+USER 0
+
+RUN \
+--mount=from=buildscripts,source=/mnt,target=/mnt \
+--mount=type=cache,sharing=locked,id=dnf-c9s,target=/var/cache/dnf \
+/bin/bash <<'EOF'
+/mnt/aipcc.sh
+EOF
+
+# Restore user workspace
+USER 1001
+WORKDIR /opt/app-root/src

base-images/cpu/ubi9-python-3.12/Dockerfile.cpu

@@ -0,0 +1,22 @@
+ARG TARGETARCH
+
+FROM registry.access.redhat.com/ubi9/python-312:latest AS buildscripts
+COPY base-images/utils/aipcc.sh /mnt/aipcc.sh
+
+####################
+# base             #
+####################
+FROM registry.access.redhat.com/ubi9/python-312:latest AS base
+
+USER 0
+
+RUN \
+--mount=from=buildscripts,source=/mnt,target=/mnt \
+--mount=type=cache,sharing=locked,id=dnf-ubi9,target=/var/cache/dnf \
+/bin/bash <<'EOF'
+/mnt/aipcc.sh
+EOF
+
+# Restore user workspace
+USER 1001
+WORKDIR /opt/app-root/src

base-images/utils/aipcc.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -Eeuxo pipefail
+
+DNF_OPTS=(-y --nodocs --setopt=install_weak_deps=False --setopt=keepcache=True)
+
+function install_epel() {
+    dnf install "${DNF_OPTS[@]}" https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+}
+
+function uninstall_epel() {
+    dnf remove "${DNF_OPTS[@]}" epel-release
+}
+
+function main() {
+    install_epel
+    trap uninstall_epel EXIT
+
+    dnf install "${DNF_OPTS[@]}" zeromq
+    if ! test -f /usr/lib64/libzmq.so.5; then
+        echo "Error: libzmq.so.5 was not found after installation"
+        exit 1
+    fi
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+  main "$@"
+fi

jupyter/rocm/tensorflow/ubi9-python-3.12/test/test_notebook.ipynb

@@ -49,9 +49,18 @@
     "        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",