Align with r0.52.0 release branch (#64)

* Update 0.52.0 release in version.py and RELEASE.md on master

* Update tensorflow-metadata dependency to >=1.21.0,<1.22.0

* Document tensorflow-metadata dependency update in RELEASE.md

* Pin com_github_tensorflow_metadata to stable 1.21.0 release

* Pin com_github_tensorflow_metadata to 1.21.0 commit da17f45

* Pre-pull ubuntu:22.04 from mirror.gcr.io in CI and capitalize AS in Dockerfile

* Add automated PyPI wheel publishing job using PYPI_API_TOKEN

* Enable PyPI wheel publishing across Python 3.10, 3.11, 3.12, 3.13 matrix

* Enable cross-platform PyPI publishing matrix across Linux and macOS

* Simplify PyPI publish job name for clean GitHub Actions sidebar presentation

* Fix SFrame assembler error by using -fno-asynchronous-unwind-tables in .bazelrc

* Restrict docker-serving-build job to master branch pushes

* Fix GNU assembler error by restoring -fno-asynchronous-unwind-tables flag in .bazelrc

* Remove sframe_fix config from default Linux and GitHub Actions runs; restore -Wa,--gsframe=no for local GCC 15 builds

* Integrate wheel build and PyPI publish steps into main build job; remove redundant 8-job pypi-publish matrix

* Simplify wheel build command by omitting default python binary arg

* Dynamically select Bazelisk architecture on macOS CI runners to support Apple Silicon (M1/M2 arm64) runners

* Conditionally compile Arrow AVX SIMD optimization sources only when building for x86_64 CPU architecture to prevent Apple Silicon macOS errors

* 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

* Add auditwheel repair step to Linux wheel build so wheels receive PyPI-compliant manylinux platform tags

* Exclude libtensorflow_framework.so from auditwheel repair since TensorFlow runtime provides it

Author: vkarampudi

.bazelrc

@@ -45,44 +45,14 @@ 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
+# 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: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"

.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
@@ -37,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
@@ -62,12 +68,56 @@ jobs:
       shell: bash -l {0}
       run: bazel build //...
 
+    - name: Build Release Wheel
+      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 --exclude 'libtensorflow_framework.so.*' dist/*.whl -w repaired_wheels/
+        rm -f dist/*.whl
+        mv repaired_wheels/*.whl dist/
+
+    - name: Upload Wheel Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: wheels-${{ matrix.os }}-${{ matrix.python-version }}
+        path: dist/*.whl
+
   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
+    - 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
         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

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

RELEASE.md

@@ -4,11 +4,22 @@
 
 ## 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
 
 *   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`.

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',

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"

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'

struct2tensor/workspace.bzl

@@ -71,10 +71,10 @@ 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 = "da17f4557749ae122284c5be3e43a2f211d3e6e2"  # 1.21.0
     http_archive(
         name = "com_github_tensorflow_metadata",
-        sha256 = "b574885016ea3afdf54133c4920849ac122c77a77b2a7a8356ad1fa548d75bc6",
+        sha256 = "126e7718dac19552be61de53c5f97da853a4166903a240aa33fce7e93b9e4fb2",
         strip_prefix = "metadata-%s" % _TFMD_COMMIT_HASH,
         urls = [
             "https://github.com/tensorflow/metadata/archive/%s.tar.gz" % _TFMD_COMMIT_HASH,

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",