From 5e06f283f79b0270f336ec393baea45be7d5b854 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:06:25 +0000
Subject: [PATCH 01/21] Update 0.52.0 release in version.py and RELEASE.md on
 master

---
 .bazelrc                 | 33 ---------------------------------
 README.md                |  3 ++-
 RELEASE.md               | 10 ++++++++++
 struct2tensor/version.py |  2 +-
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index a1b27849..bad3acde 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -53,36 +53,3 @@ build:macos --macos_minimum_os=10.12
 common --noenable_bzlmod
 
 test --noincompatible_check_sharding_support
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/google/home/vkarampudi/anaconda3/lib/python3.12/site-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/google/home/vkarampudi/anaconda3/lib/python3.12/site-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
-build --action_env TF_HEADER_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow/include"
-build --action_env TF_SHARED_LIBRARY_DIR="/usr/local/lib/python3.12/dist-packages/tensorflow"
-build --action_env TF_SHARED_LIBRARY_NAME="libtensorflow_framework.so.2"
diff --git a/README.md b/README.md
index 75114aeb..ab37a9c2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Struct2Tensor
 
-[![Python](https://img.shields.io/badge/python%7C3.9-blue)](https://github.com/google/struct2tensor)
+[![Python](https://img.shields.io/badge/python%7C3.10%7C3.11%7C3.12%7C3.13-blue)](https://github.com/google/struct2tensor)
 [![PyPI](https://badge.fury.io/py/struct2tensor.svg)](https://badge.fury.io/py/struct2tensor)
 
 <!--*
@@ -115,6 +115,7 @@ is an integer.
 
 struct2tensor                                                          | tensorflow
 ---------------------------------------------------------------------- | ----------
+[0.52.0](https://github.com/google/struct2tensor/releases/tag/v0.52.0) | 2.21.0
 [0.48.0](https://github.com/google/struct2tensor/releases/tag/v0.48.0) | 2.17.0
 [0.47.0](https://github.com/google/struct2tensor/releases/tag/v0.47.0) | 2.16.2
 [0.46.0](https://github.com/google/struct2tensor/releases/tag/v0.46.0) | 2.15.0
diff --git a/RELEASE.md b/RELEASE.md
index 43f185c7..e81ca149 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,6 +4,16 @@
 
 ## Major Features and Improvements
 
+## Bug Fixes and Other Changes
+
+## Breaking Changes
+
+## Deprecations
+
+## Version 0.52.0
+
+## Major Features and Improvements
+
 *   N/A
 
 ## Bug Fixes and Other Changes
diff --git a/struct2tensor/version.py b/struct2tensor/version.py
index b61835f5..b9ada47d 100644
--- a/struct2tensor/version.py
+++ b/struct2tensor/version.py
@@ -15,4 +15,4 @@
 """Contains the version string of struct2tensor."""
 
 # Note that setup.py uses this version.
-__version__ = '0.49.0.dev'
+__version__ = '0.53.0.dev'

From eb679537e978cf763328292fd8cdf1e1730a9d27 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:10:05 +0000
Subject: [PATCH 02/21] Update tensorflow-metadata dependency to
 >=1.21.0,<1.22.0

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 4eb9d273..30d8a180 100644
--- a/setup.py
+++ b/setup.py
@@ -83,8 +83,8 @@ def select_constraint(default, nightly=None, git_master=None):
         'tensorflow>=2.21,<2.22',
         'tensorflow-metadata'
         + select_constraint(
-            default='@git+https://github.com/tensorflow/metadata@master',
-            nightly='>=1.18.0.dev',
+            default='>=1.21.0,<1.22.0',
+            nightly='>=1.21.0.dev',
             git_master='@git+https://github.com/tensorflow/metadata@master',
         ),
         'pyarrow>=14',

From d56f6f77baaf526ceb62a8c697233b87dc6a7f73 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:11:10 +0000
Subject: [PATCH 03/21] Document tensorflow-metadata dependency update in
 RELEASE.md

---
 RELEASE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE.md b/RELEASE.md
index e81ca149..236dfd78 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -19,6 +19,7 @@
 ## Bug Fixes and Other Changes
 
 *   Depends on `tensorflow 2.21.0`.
+*   Depends on `tensorflow-metadata>=1.21.0,<1.22.0`.
 *   Depends on `protobuf==6.31.1`.
 *   Depends on `pyarrow==23.0.1`.
 *   Enforced C++17 in `.bazelrc`.

From 49042d35957f66150fbf899b773e08e931a5f220 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:13:30 +0000
Subject: [PATCH 04/21] Pin com_github_tensorflow_metadata to stable 1.21.0
 release

---
 struct2tensor/workspace.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/struct2tensor/workspace.bzl b/struct2tensor/workspace.bzl
index a58938b1..97b234ba 100644
--- a/struct2tensor/workspace.bzl
+++ b/struct2tensor/workspace.bzl
@@ -71,13 +71,13 @@ def struct2tensor_workspace():
         urls = ["https://github.com/apache/arrow/archive/%s.zip" % ARROW_COMMIT],
     )
 
-    _TFMD_COMMIT_HASH = "d3194a388344cb7a10d42b2a7c01bf384f3d1741"  #Align with TF 2.21
+    _TFMD_COMMIT_HASH = "1.21.0"
     http_archive(
         name = "com_github_tensorflow_metadata",
-        sha256 = "b574885016ea3afdf54133c4920849ac122c77a77b2a7a8356ad1fa548d75bc6",
+        sha256 = "6d6ff05c5a084e93b665e8c1959ba3c9ee1afc9c33b636aac14c472e5a3bf911",
         strip_prefix = "metadata-%s" % _TFMD_COMMIT_HASH,
         urls = [
-            "https://github.com/tensorflow/metadata/archive/%s.tar.gz" % _TFMD_COMMIT_HASH,
+            "https://github.com/tensorflow/metadata/archive/v%s.tar.gz" % _TFMD_COMMIT_HASH,
         ],
         patches = ["//third_party:tfmd.patch"],
         patch_args = ["-p1"],

From cd7dff840d8f9ea81ba76e69110bd91899b14d2f Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:15:08 +0000
Subject: [PATCH 05/21] Pin com_github_tensorflow_metadata to 1.21.0 commit
 da17f45

---
 struct2tensor/workspace.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/struct2tensor/workspace.bzl b/struct2tensor/workspace.bzl
index 97b234ba..50c86c0f 100644
--- a/struct2tensor/workspace.bzl
+++ b/struct2tensor/workspace.bzl
@@ -71,13 +71,13 @@ def struct2tensor_workspace():
         urls = ["https://github.com/apache/arrow/archive/%s.zip" % ARROW_COMMIT],
     )
 
-    _TFMD_COMMIT_HASH = "1.21.0"
+    _TFMD_COMMIT_HASH = "da17f4557749ae122284c5be3e43a2f211d3e6e2"  # 1.21.0
     http_archive(
         name = "com_github_tensorflow_metadata",
-        sha256 = "6d6ff05c5a084e93b665e8c1959ba3c9ee1afc9c33b636aac14c472e5a3bf911",
+        sha256 = "126e7718dac19552be61de53c5f97da853a4166903a240aa33fce7e93b9e4fb2",
         strip_prefix = "metadata-%s" % _TFMD_COMMIT_HASH,
         urls = [
-            "https://github.com/tensorflow/metadata/archive/v%s.tar.gz" % _TFMD_COMMIT_HASH,
+            "https://github.com/tensorflow/metadata/archive/%s.tar.gz" % _TFMD_COMMIT_HASH,
         ],
         patches = ["//third_party:tfmd.patch"],
         patch_args = ["-p1"],

From 80db0720a8cc6988697d201057024ccd9ebc706c Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:22:33 +0000
Subject: [PATCH 06/21] Pre-pull ubuntu:22.04 from mirror.gcr.io in CI and
 capitalize AS in Dockerfile

---
 .github/workflows/build.yml                      | 4 ++++
 struct2tensor/tools/tf_serving_docker/Dockerfile | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96ed6dec..0edab564 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,6 +67,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Pre-pull Ubuntu base image from GCR mirror to prevent Docker Hub timeouts
+      run: |
+        docker pull mirror.gcr.io/library/ubuntu:22.04
+        docker tag mirror.gcr.io/library/ubuntu:22.04 ubuntu:22.04
     - name: Build TF-Serving Docker Image
       run: |
         cd struct2tensor/tools/tf_serving_docker
diff --git a/struct2tensor/tools/tf_serving_docker/Dockerfile b/struct2tensor/tools/tf_serving_docker/Dockerfile
index d15357e1..52608389 100644
--- a/struct2tensor/tools/tf_serving_docker/Dockerfile
+++ b/struct2tensor/tools/tf_serving_docker/Dockerfile
@@ -15,7 +15,7 @@
 # Defines an image that contains a tensorflow-serving model server binary
 # that has struct2tensor ops linked in.
 
-FROM ubuntu:22.04 as base_build
+FROM ubuntu:22.04 AS base_build
 ARG TF_SERVING_VERSION_GIT_BRANCH=r2.19
 ARG TF_SERVING_VERSION_GIT_COMMIT=head
 ARG S2T_VERSION_GIT_BRANCH=master
@@ -126,7 +126,7 @@ RUN echo "local_repository(name=\"com_google_struct2tensor\", path=\"/struct2ten
         //tensorflow_serving/model_servers:tensorflow_model_server
 
 
-FROM base_build as binary_build
+FROM base_build AS binary_build
 ARG TF_SERVING_BUILD_OPTIONS="--config=release"
 RUN echo "Building with build options: ${TF_SERVING_BUILD_OPTIONS}"
 ARG TF_SERVING_BAZEL_OPTIONS="--noenable_bzlmod"

From 7c7d30cdf79dfd1cc51264661b62362783158f49 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:37:35 +0000
Subject: [PATCH 07/21] Add automated PyPI wheel publishing job using
 PYPI_API_TOKEN

---
 .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0edab564..ff75db60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,10 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 'r*' ]
+    tags: [ 'v*' ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, 'r*' ]
 
 env:
   USE_BAZEL_VERSION: 7.7.0
@@ -75,3 +76,38 @@ jobs:
       run: |
         cd struct2tensor/tools/tf_serving_docker
         docker build -t struct2tensor-serving:latest .
+
+  pypi-publish:
+    name: Build and Publish Wheels to PyPI
+    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up conda environment
+      uses: conda-incubator/setup-miniconda@v3
+      with:
+        auto-activate-base: false
+        activate-environment: s2t-env
+        environment-file: environment.yml
+        python-version: "3.12"
+        use-mamba: true
+
+    - name: Install Bazel
+      shell: bash -l {0}
+      run: |
+        curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64
+        chmod +x /tmp/bazelisk
+        sudo mv /tmp/bazelisk /usr/local/bin/bazel
+
+    - name: Build Release Wheel
+      shell: bash -l {0}
+      run: |
+        ./configure.sh
+        bazel run --config=sframe_fix //:build_pip_package -- --python_bin_path python
+
+    - name: Publish Package to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        packages-dir: dist/

From 67be91e9c1f58a5a8dada5150423e226037ff400 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:41:31 +0000
Subject: [PATCH 08/21] Enable PyPI wheel publishing across Python 3.10, 3.11,
 3.12, 3.13 matrix

---
 .github/workflows/build.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff75db60..20816457 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,9 +78,12 @@ jobs:
         docker build -t struct2tensor-serving:latest .
 
   pypi-publish:
-    name: Build and Publish Wheels to PyPI
+    name: Build and Publish Wheels to PyPI (Python ${{ matrix.python-version }})
     if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
     - uses: actions/checkout@v4
 
@@ -90,7 +93,7 @@ jobs:
         auto-activate-base: false
         activate-environment: s2t-env
         environment-file: environment.yml
-        python-version: "3.12"
+        python-version: ${{ matrix.python-version }}
         use-mamba: true
 
     - name: Install Bazel
@@ -111,3 +114,4 @@ jobs:
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}
         packages-dir: dist/
+        skip-existing: true

From 49549ccf0023c7bcc57608d28cfc8042cdc45068 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:43:27 +0000
Subject: [PATCH 09/21] Enable cross-platform PyPI publishing matrix across
 Linux and macOS

---
 .github/workflows/build.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20816457..597c271e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,11 +78,12 @@ jobs:
         docker build -t struct2tensor-serving:latest .
 
   pypi-publish:
-    name: Build and Publish Wheels to PyPI (Python ${{ matrix.python-version }})
+    name: Build and Publish Wheels to PyPI (${{ matrix.os }}, Python ${{ matrix.python-version }})
     if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, macos-latest]
         python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
     - uses: actions/checkout@v4
@@ -99,10 +100,19 @@ jobs:
     - name: Install Bazel
       shell: bash -l {0}
       run: |
-        curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64
+        if [ "$RUNNER_OS" == "Linux" ]; then
+          curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64
+        elif [ "$RUNNER_OS" == "macOS" ]; then
+          curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-darwin-amd64
+        fi
         chmod +x /tmp/bazelisk
         sudo mv /tmp/bazelisk /usr/local/bin/bazel
 
+    - name: Patch Apple CC toolchain (macOS only)
+      if: runner.os == 'macOS'
+      shell: bash -l {0}
+      run: bazel build //:patch_local_config_apple_cc
+
     - name: Build Release Wheel
       shell: bash -l {0}
       run: |

From b2abe9d6e42bb65fd43f31b975301dff9bfca9c8 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Tue, 9 Jun 2026 21:51:27 +0000
Subject: [PATCH 10/21] Simplify PyPI publish job name for clean GitHub Actions
 sidebar presentation

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 597c271e..834e78cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
         docker build -t struct2tensor-serving:latest .
 
   pypi-publish:
-    name: Build and Publish Wheels to PyPI (${{ matrix.os }}, Python ${{ matrix.python-version }})
+    name: Build and Publish Wheels to PyPI
     if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
     runs-on: ${{ matrix.os }}
     strategy:

From 70403ab3e5ffb778d9649c71de69123c02bafd8c Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 00:20:42 +0000
Subject: [PATCH 11/21] Fix SFrame assembler error by using
 -fno-asynchronous-unwind-tables in .bazelrc

---
 .bazelrc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index bad3acde..ec195900 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -45,8 +45,10 @@ build:macos --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 
-# Config to disable sframe in assembler to avoid linker errors with gcc 15
-build:sframe_fix --copt=-Wa,--gsframe=no
+# Config to disable sframe unwind tables to avoid assembler/linker errors with gcc 15
+build:sframe_fix --copt=-fno-asynchronous-unwind-tables
+build:sframe_fix --host_copt=-fno-asynchronous-unwind-tables
+build:linux --config=sframe_fix
 
 build:macos --macos_minimum_os=10.12
 

From fd2e86e64d8d8f23545b7e7f93042b96d170b1af Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 01:05:32 +0000
Subject: [PATCH 12/21] Restrict docker-serving-build job to master branch
 pushes

---
 .bazelrc                    | 6 ++++--
 .github/workflows/build.yml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index ec195900..0d03563e 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -46,8 +46,10 @@ build:macos --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 
 # Config to disable sframe unwind tables to avoid assembler/linker errors with gcc 15
-build:sframe_fix --copt=-fno-asynchronous-unwind-tables
-build:sframe_fix --host_copt=-fno-asynchronous-unwind-tables
+build:sframe_fix --copt=-Wa,--gsframe=no
+build:sframe_fix --cxxopt=-Wa,--gsframe=no
+build:sframe_fix --host_copt=-Wa,--gsframe=no
+build:sframe_fix --host_cxxopt=-Wa,--gsframe=no
 build:linux --config=sframe_fix
 
 build:macos --macos_minimum_os=10.12
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 834e78cb..2cc1a93d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,6 +65,7 @@ jobs:
 
   docker-serving-build:
     name: Build Docker Serving Image
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

From 9d4cd6f39c9c63abb95fdb29ce15cdb9e2f29d55 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 01:22:26 +0000
Subject: [PATCH 13/21] Fix GNU assembler error by restoring
 -fno-asynchronous-unwind-tables flag in .bazelrc

---
 .bazelrc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 0d03563e..ec195900 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -46,10 +46,8 @@ build:macos --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 
 # Config to disable sframe unwind tables to avoid assembler/linker errors with gcc 15
-build:sframe_fix --copt=-Wa,--gsframe=no
-build:sframe_fix --cxxopt=-Wa,--gsframe=no
-build:sframe_fix --host_copt=-Wa,--gsframe=no
-build:sframe_fix --host_cxxopt=-Wa,--gsframe=no
+build:sframe_fix --copt=-fno-asynchronous-unwind-tables
+build:sframe_fix --host_copt=-fno-asynchronous-unwind-tables
 build:linux --config=sframe_fix
 
 build:macos --macos_minimum_os=10.12

From af54889d19957ef917b1b0da5e501c8de580af5c Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 01:34:32 +0000
Subject: [PATCH 14/21] Remove sframe_fix config from default Linux and GitHub
 Actions runs; restore -Wa,--gsframe=no for local GCC 15 builds

---
 .bazelrc                    | 7 ++++---
 .github/workflows/build.yml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index ec195900..47331f97 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -46,9 +46,10 @@ build:macos --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=1
 build:short_logs --output_filter=DONT_MATCH_ANYTHING
 
 # Config to disable sframe unwind tables to avoid assembler/linker errors with gcc 15
-build:sframe_fix --copt=-fno-asynchronous-unwind-tables
-build:sframe_fix --host_copt=-fno-asynchronous-unwind-tables
-build:linux --config=sframe_fix
+build:sframe_fix --copt=-Wa,--gsframe=no
+build:sframe_fix --cxxopt=-Wa,--gsframe=no
+build:sframe_fix --host_copt=-Wa,--gsframe=no
+build:sframe_fix --host_cxxopt=-Wa,--gsframe=no
 
 build:macos --macos_minimum_os=10.12
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cc1a93d..8d9cf23f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
       shell: bash -l {0}
       run: |
         ./configure.sh
-        bazel run --config=sframe_fix //:build_pip_package -- --python_bin_path python
+        bazel run //:build_pip_package -- --python_bin_path python
 
     - name: Publish Package to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1

From 5b04ed6e08e6b43546ae3737165fcccf192b6b0d Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 01:37:56 +0000
Subject: [PATCH 15/21] Integrate wheel build and PyPI publish steps into main
 build job; remove redundant 8-job pypi-publish matrix

---
 .github/workflows/build.yml | 61 ++++++++-----------------------------
 1 file changed, 12 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d9cf23f..da6e91bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,18 @@ jobs:
       shell: bash -l {0}
       run: bazel build //...
 
+    - name: Build Release Wheel
+      shell: bash -l {0}
+      run: bazel run //:build_pip_package -- --python_bin_path python
+
+    - name: Publish Package to PyPI
+      if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        packages-dir: dist/
+        skip-existing: true
+
   docker-serving-build:
     name: Build Docker Serving Image
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -77,52 +89,3 @@ jobs:
       run: |
         cd struct2tensor/tools/tf_serving_docker
         docker build -t struct2tensor-serving:latest .
-
-  pypi-publish:
-    name: Build and Publish Wheels to PyPI
-    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up conda environment
-      uses: conda-incubator/setup-miniconda@v3
-      with:
-        auto-activate-base: false
-        activate-environment: s2t-env
-        environment-file: environment.yml
-        python-version: ${{ matrix.python-version }}
-        use-mamba: true
-
-    - name: Install Bazel
-      shell: bash -l {0}
-      run: |
-        if [ "$RUNNER_OS" == "Linux" ]; then
-          curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64
-        elif [ "$RUNNER_OS" == "macOS" ]; then
-          curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-darwin-amd64
-        fi
-        chmod +x /tmp/bazelisk
-        sudo mv /tmp/bazelisk /usr/local/bin/bazel
-
-    - name: Patch Apple CC toolchain (macOS only)
-      if: runner.os == 'macOS'
-      shell: bash -l {0}
-      run: bazel build //:patch_local_config_apple_cc
-
-    - name: Build Release Wheel
-      shell: bash -l {0}
-      run: |
-        ./configure.sh
-        bazel run //:build_pip_package -- --python_bin_path python
-
-    - name: Publish Package to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        packages-dir: dist/
-        skip-existing: true

From 9e448bd8472bea56521b0424b0809ecd710abf36 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 01:40:17 +0000
Subject: [PATCH 16/21] Simplify wheel build command by omitting default python
 binary arg

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da6e91bd..65d908a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Build Release Wheel
       shell: bash -l {0}
-      run: bazel run //:build_pip_package -- --python_bin_path python
+      run: bazel run //:build_pip_package
 
     - name: Publish Package to PyPI
       if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))

From 848055e68c35dfb34fde111c548b9970b515cb39 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 06:18:24 +0000
Subject: [PATCH 17/21] Dynamically select Bazelisk architecture on macOS CI
 runners to support Apple Silicon (M1/M2 arm64) runners

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 65d908a9..3a556abf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,12 @@ jobs:
         if [ "$RUNNER_OS" == "Linux" ]; then
           curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64
         elif [ "$RUNNER_OS" == "macOS" ]; then
-          curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-darwin-amd64
+          ARCH=$(uname -m)
+          if [ "$ARCH" == "arm64" ]; then
+            curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-darwin-arm64
+          else
+            curl -Lo /tmp/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-darwin-amd64
+          fi
         fi
         chmod +x /tmp/bazelisk
         sudo mv /tmp/bazelisk /usr/local/bin/bazel

From f7fc8d343c0136ac3f32c31bf9c3926932cc8213 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 06:31:11 +0000
Subject: [PATCH 18/21] Conditionally compile Arrow AVX SIMD optimization
 sources only when building for x86_64 CPU architecture to prevent Apple
 Silicon macOS errors

---
 third_party/arrow.BUILD | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/third_party/arrow.BUILD b/third_party/arrow.BUILD
index 34d7c0ee..11d2236b 100644
--- a/third_party/arrow.BUILD
+++ b/third_party/arrow.BUILD
@@ -53,6 +53,14 @@ fbs_headers = [
     "cpp/src/generated/Tensor_generated.h",
 ]
 
+arrow_simd_srcs = select({
+    "@platforms//cpu:x86_64": glob([
+        "cpp/src/arrow/compute/**/*_avx2.cc",
+        "cpp/src/arrow/compute/**/*_avx512.cc",
+    ]),
+    "//conditions:default": [],
+})
+
 cc_library(
     name = "arrow",
     srcs = glob(
@@ -87,6 +95,8 @@ cc_library(
             "cpp/src/arrow/util/bpacking_avx512.*",
             "cpp/src/arrow/util/bpacking_neon*",
             "cpp/src/arrow/util/bpacking_simd*",
+            "cpp/src/arrow/compute/**/*_avx2.*",
+            "cpp/src/arrow/compute/**/*_avx512.*",
             "cpp/src/arrow/util/compression_brotli*",
             "cpp/src/arrow/util/compression_bz2*",
             "cpp/src/arrow/util/compression_lz4*",
@@ -106,7 +116,7 @@ cc_library(
             #"cpp/src/arrow/vendored/datetime/**",
             "cpp/src/parquet/encryption/encryption_internal.cc",
         ],
-    ),
+    ) + arrow_simd_srcs,
     hdrs = [
         # Headers from above genrules.
         "cpp/src/arrow/util/config.h",

From b456d2ec4a3dc422cf605514978748834d88ac6b Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 08:12:34 +0000
Subject: [PATCH 19/21] Split wheel upload and PyPI publish into separate
 optimized jobs so all matrix runners build wheels and a unified Linux job
 publishes them to PyPI

---
 .github/workflows/build.yml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a556abf..a00fe271 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,13 +72,11 @@ jobs:
       shell: bash -l {0}
       run: bazel run //:build_pip_package
 
-    - name: Publish Package to PyPI
-      if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
-      uses: pypa/gh-action-pypi-publish@release/v1
+    - name: Upload Wheel Artifact
+      uses: actions/upload-artifact@v4
       with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        packages-dir: dist/
-        skip-existing: true
+        name: wheels-${{ matrix.os }}-${{ matrix.python-version }}
+        path: dist/*.whl
 
   docker-serving-build:
     name: Build Docker Serving Image
@@ -94,3 +92,23 @@ jobs:
       run: |
         cd struct2tensor/tools/tf_serving_docker
         docker build -t struct2tensor-serving:latest .
+
+  pypi-publish:
+    name: Publish Wheels to PyPI
+    needs: build
+    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/r'))
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download all wheels
+      uses: actions/download-artifact@v4
+      with:
+        pattern: wheels-*
+        path: dist/
+        merge-multiple: true
+
+    - name: Publish Package to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        packages-dir: dist/
+        skip-existing: true

From 12778d19f26bc01ef24f8e66f648c8aa239e93e8 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 17:19:10 +0000
Subject: [PATCH 20/21] Add auditwheel repair step to Linux wheel build so
 wheels receive PyPI-compliant manylinux platform tags

---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a00fe271..f97f67ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,6 +72,15 @@ jobs:
       shell: bash -l {0}
       run: bazel run //:build_pip_package
 
+    - name: Repair Linux Wheel with Auditwheel
+      if: runner.os == 'Linux'
+      shell: bash -l {0}
+      run: |
+        python -m pip install auditwheel
+        auditwheel repair dist/*.whl -w repaired_wheels/
+        rm -f dist/*.whl
+        mv repaired_wheels/*.whl dist/
+
     - name: Upload Wheel Artifact
       uses: actions/upload-artifact@v4
       with:

From 1956734f98642fd69c814fce715906e3010df020 Mon Sep 17 00:00:00 2001
From: Venkata Sai Madhur Karampudi <vkarampudi@google.com>
Date: Wed, 10 Jun 2026 17:53:52 +0000
Subject: [PATCH 21/21] Exclude libtensorflow_framework.so from auditwheel
 repair since TensorFlow runtime provides it

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f97f67ae..acf54b0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,7 +77,7 @@ jobs:
       shell: bash -l {0}
       run: |
         python -m pip install auditwheel
-        auditwheel repair dist/*.whl -w repaired_wheels/
+        auditwheel repair --exclude 'libtensorflow_framework.so.*' dist/*.whl -w repaired_wheels/
         rm -f dist/*.whl
         mv repaired_wheels/*.whl dist/