diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
new file mode 100755
index 000000000..95da4fe82
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -0,0 +1,72 @@
+# This file was generated automatically from conda-smithy. To update this configuration,
+# update the conda-forge.yml and/or the recipe/meta.yaml.
+# -*- mode: yaml -*-
+
+jobs:
+- job: linux
+  pool:
+    vmImage: ubuntu-latest
+  strategy:
+    matrix:
+      osx_64_python3.10.____cpython:
+        CONFIG: osx_64_python3.10.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_64_python3.11.____cpython:
+        CONFIG: osx_64_python3.11.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_64_python3.12.____cpython:
+        CONFIG: osx_64_python3.12.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_64_python3.9.____cpython:
+        CONFIG: osx_64_python3.9.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_arm64_python3.10.____cpython:
+        CONFIG: osx_arm64_python3.10.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_arm64_python3.11.____cpython:
+        CONFIG: osx_arm64_python3.11.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_arm64_python3.12.____cpython:
+        CONFIG: osx_arm64_python3.12.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+      osx_arm64_python3.9.____cpython:
+        CONFIG: osx_arm64_python3.9.____cpython
+        UPLOAD_PACKAGES: 'True'
+        DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+  timeoutInMinutes: 360
+  variables: {}
+
+  steps:
+  # configure qemu binfmt-misc running.  This allows us to run docker containers
+  # embedded qemu-static
+  - script: |
+      docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
+      ls /proc/sys/fs/binfmt_misc/
+    condition: not(startsWith(variables['CONFIG'], 'linux_64'))
+    displayName: Configure binfmt_misc
+
+  - script: |
+        export CI=azure
+        export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt)
+        export remote_url=$(Build.Repository.Uri)
+        export sha=$(Build.SourceVersion)
+        export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
+        export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
+        if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then
+          export IS_PR_BUILD="True"
+        else
+          export IS_PR_BUILD="False"
+        fi
+        .scripts/run_docker_build.sh
+    displayName: Run docker build
+    env:
+      BINSTAR_TOKEN: $(BINSTAR_TOKEN)
+      FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN)
+      STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)
\ No newline at end of file
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
deleted file mode 100755
index 8868805c6..000000000
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file was generated automatically from conda-smithy. To update this configuration,
-# update the conda-forge.yml and/or the recipe/meta.yaml.
-# -*- mode: yaml -*-
-
-jobs:
-- job: osx
-  pool:
-    vmImage: macOS-13
-  strategy:
-    matrix:
-      osx_64_python3.10.____cpython:
-        CONFIG: osx_64_python3.10.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_64_python3.11.____cpython:
-        CONFIG: osx_64_python3.11.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_64_python3.12.____cpython:
-        CONFIG: osx_64_python3.12.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_64_python3.9.____cpython:
-        CONFIG: osx_64_python3.9.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_arm64_python3.10.____cpython:
-        CONFIG: osx_arm64_python3.10.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_arm64_python3.11.____cpython:
-        CONFIG: osx_arm64_python3.11.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_arm64_python3.12.____cpython:
-        CONFIG: osx_arm64_python3.12.____cpython
-        UPLOAD_PACKAGES: 'True'
-      osx_arm64_python3.9.____cpython:
-        CONFIG: osx_arm64_python3.9.____cpython
-        UPLOAD_PACKAGES: 'True'
-  timeoutInMinutes: 1
-  variables: {}
-
-  steps:
-  # TODO: Fast finish on azure pipelines?
-  - script: |
-      export CI=azure
-      export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt)
-      export remote_url=$(Build.Repository.Uri)
-      export sha=$(Build.SourceVersion)
-      export OSX_FORCE_SDK_DOWNLOAD="1"
-      export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
-      export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
-      if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then
-        export IS_PR_BUILD="True"
-      else
-        export IS_PR_BUILD="False"
-      fi
-      ./.scripts/run_osx_build.sh
-    displayName: Run OSX build
-    env:
-      BINSTAR_TOKEN: $(BINSTAR_TOKEN)
-      FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN)
-      STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)
\ No newline at end of file
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml
deleted file mode 100644
index e2f780e78..000000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.10.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml
deleted file mode 100644
index a5c499032..000000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.23'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.11.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml
deleted file mode 100644
index 687f43393..000000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.26'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.12.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml
deleted file mode 100644
index 519ac3da5..000000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.9.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml
deleted file mode 100644
index ece2ee591..000000000
--- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '13'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '13'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.10.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml
deleted file mode 100644
index 53d5ba0e1..000000000
--- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '13'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '13'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.23'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.11.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml
deleted file mode 100644
index 2ea107bec..000000000
--- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '13'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '13'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.26'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.12.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml
deleted file mode 100644
index 00d5b9a30..000000000
--- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '13'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '9'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '13'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 24.3.25
-giflib:
-- '5.2'
-github_actions_labels:
-- cirun-openstack-cpu-xlarge
-icu:
-- '75'
-libabseil:
-- '20240722'
-libcurl:
-- '8'
-libgrpc:
-- '1.65'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 5.27.5
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-python:
-- 3.9.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1.2'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-tensorflow:
-- '2.16'
-zip_keys:
-- - c_compiler_version
-  - cxx_compiler_version
-  - c_stdlib_version
-  - cdt_name
-  - cuda_compiler
-  - cuda_compiler_version
-  - docker_image
-- - python
-  - numpy
-  - python_impl
-zlib:
-- '1'
diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
deleted file mode 100644
index abfb9cb82..000000000
--- a/.ci_support/migrations/cuda120.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-migrator_ts: 1682985063
-__migrator:
-  kind:
-    version
-  migration_number:
-    3
-  build_number:
-    1
-  paused: false
-  override_cbc_keys:
-    - cuda_compiler_stub
-  operation: key_add
-  check_solvable: false
-  primary_key: cuda_compiler_version
-  ordering:
-    cxx_compiler_version:
-      - 9
-      - 8
-      - 7
-    c_compiler_version:
-      - 9
-      - 8
-      - 7
-    fortran_compiler_version:
-      - 9
-      - 8
-      - 7
-    docker_image:
-      - quay.io/condaforge/linux-anvil-comp7              # [os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-aarch64            # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
-      - quay.io/condaforge/linux-anvil-ppc64le            # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
-      - quay.io/condaforge/linux-anvil-armv7l             # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"]
-      - quay.io/condaforge/linux-anvil-cuda:9.2           # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:10.0          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:10.1          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:10.2          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:11.0          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:11.1          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:11.2          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      # case: native compilation (build == target)
-      - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2  # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
-      - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2  # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
-      # case: cross-compilation (build != target)
-      - quay.io/condaforge/linux-anvil-cuda:11.2          # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      - quay.io/condaforge/linux-anvil-cuda:11.2          # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-      # case: non-CUDA builds
-      - quay.io/condaforge/linux-anvil-cos7-x86_64        # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-    cuda_compiler_version:
-      - None
-      - 10.2                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-      - 11.0                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-      - 11.1                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-      - 11.2                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-      - 12.0                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  commit_message: |
-    Rebuild for CUDA 12 w/arch + Windows support
-    
-    The transition to CUDA 12 SDK includes new packages for all CUDA libraries and
-    build tools. Notably, the cudatoolkit package no longer exists, and packages
-    should depend directly on the specific CUDA libraries (libcublas, libcusolver,
-    etc) as needed. For an in-depth overview of the changes and to report problems
-    [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ).
-    Please feel free to raise any issues encountered there. Thank you! :pray:
-
-cuda_compiler:                 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - cuda-nvcc                  # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cuda_compiler_version:         # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 12.0                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-c_compiler_version:            # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cxx_compiler_version:          # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-fortran_compiler_version:      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cdt_name:                      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - cos7                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-docker_image:                                      # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  - quay.io/condaforge/linux-anvil-cos7-x86_64     # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  # case: native compilation (build == target)
-  - quay.io/condaforge/linux-anvil-ppc64le         # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
-  - quay.io/condaforge/linux-anvil-aarch64         # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
-  # case: cross-compilation (build != target)
-  - quay.io/condaforge/linux-anvil-cos7-x86_64     # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
-  - quay.io/condaforge/linux-anvil-cos7-x86_64     # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
diff --git a/.ci_support/migrations/cudnn9.yaml b/.ci_support/migrations/cudnn9.yaml
deleted file mode 100644
index 30ba547e7..000000000
--- a/.ci_support/migrations/cudnn9.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-__migrator:
-  build_number: 1
-  commit_message: Rebuild for cudnn 9
-  kind: version
-  migration_number: 1
-cudnn:
-- '9'
-migrator_ts: 1724175586.3831317
diff --git a/.ci_support/migrations/flatbuffers241223.yaml b/.ci_support/migrations/flatbuffers241223.yaml
new file mode 100644
index 000000000..90d5d5cf6
--- /dev/null
+++ b/.ci_support/migrations/flatbuffers241223.yaml
@@ -0,0 +1,8 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for flatbuffers 24.12.23
+  kind: version
+  migration_number: 1
+flatbuffers:
+- 24.12.23
+migrator_ts: 1736590646.156009
diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
deleted file mode 100644
index 85540a1ff..000000000
--- a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-__migrator:
-  build_number: 1
-  commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
-  kind: version
-  migration_number: 1
-  exclude:
-    - abseil-cpp
-    - grpc-cpp
-    - libprotobuf
-    - protobuf
-    - re2
-libabseil:
-- 20240722
-libgrpc:
-- "1.65"
-libprotobuf:
-- 5.27.5
-migrator_ts: 1727040240.8650293
diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml
new file mode 100644
index 000000000..fd981b850
--- /dev/null
+++ b/.ci_support/migrations/numpy2.yaml
@@ -0,0 +1,52 @@
+__migrator:
+  build_number: 1
+  kind: version
+  commit_message: |
+    Rebuild for numpy 2.0
+    
+    TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot
+    PR has updated the recipe to account for the changes (see below for details).
+    
+    The biggest change is that we no longer need to use the oldest available numpy
+    version at build time in order to support old numpy version at runtime - numpy
+    will by default use a compatible ABI for the oldest still-supported numpy versions.
+    
+    Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a
+    run requirement - this has been handled for more than two years now by a
+    run-export on the numpy package itself. The migrator will therefore remove
+    any occurrences of this.
+    
+    However, you will still need to add the lower bound for the numpy version,
+    in line with what the upstream package requires. The default lower bound from
+    the run-export is `>=1.19`; if your package needs a newer version than that,
+    please add `numpy >=x.y` under `run:`.
+    
+    Finally, by default, building against numpy 2.0 will assume that the package
+    is compatible with numpy 2.0, which is not necessarily the case. You should
+    check that the upstream package explicitly supports numpy 2.0, otherwise you
+    need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy
+    issue 26191 for an overview of the most important packages).
+    
+    ### To-Dos:
+      * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility)
+        * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`.
+        * If upstream is already compatible with numpy 2.0, double-check their supported numpy versions.
+        * If upstream requires a minimum numpy version newer than 1.19, you need to add `numpy >=x.y` under `run:`.
+      * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed.
+    
+    PS. If the build does not compile anymore, this is almost certainly a sign that
+    the upstream project is not yet ready for numpy 2.0; do not close this PR until
+    a version compatible with numpy 2.0 has been released upstream and on this
+    feedstock (in the meantime, you can keep the bot from reopening this PR in
+    case of git conflicts by marking it as a draft).
+
+  migration_number: 1
+
+# needs to match length of zip {python, python_impl, numpy}
+# as it is in global CBC in order to override it
+numpy:
+  - 2.0
+  - 2.0
+  - 2.0
+  - 2.0
+migrator_ts: 1713572489.295986
diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml
deleted file mode 100644
index 784a0a25d..000000000
--- a/.ci_support/migrations/python312.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-migrator_ts: 1695046563
-__migrator:
-  migration_number: 1
-  operation: key_add
-  primary_key: python
-  ordering:
-    python:
-      - 3.6.* *_cpython
-      - 3.7.* *_cpython
-      - 3.8.* *_cpython
-      - 3.9.* *_cpython
-      - 3.10.* *_cpython
-      - 3.11.* *_cpython
-      - 3.12.* *_cpython  # new entry
-      - 3.6.* *_73_pypy
-      - 3.7.* *_73_pypy
-      - 3.8.* *_73_pypy
-      - 3.9.* *_73_pypy
-  paused: false
-  longterm: True
-  pr_limit: 30
-  max_solver_attempts: 6  # this will make the bot retry "not solvable" stuff 6 times
-  exclude:
-    # this shouldn't attempt to modify the python feedstocks
-    - python
-    - pypy3.6
-    - pypy-meta
-    - cross-python
-    - python_abi
-  exclude_pinned_pkgs: false
-
-python:
-  - 3.12.* *_cpython
-# additional entries to add for zip_keys
-numpy:
-  - 1.26
-python_impl:
-  - cpython
diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml
index 807994357..d6689e621 100644
--- a/.ci_support/osx_64_python3.10.____cpython.yaml
+++ b/.ci_support/osx_64_python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.22'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
index 8881b7b25..ddbe36bd0 100644
--- a/.ci_support/osx_64_python3.11.____cpython.yaml
+++ b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.23'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml
index 9d0f31c86..90ab20ddc 100644
--- a/.ci_support/osx_64_python3.12.____cpython.yaml
+++ b/.ci_support/osx_64_python3.12.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.26'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
index 97dd727cb..6f72ea95d 100644
--- a/.ci_support/osx_64_python3.9.____cpython.yaml
+++ b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.22'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.9.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
index c6fa878a4..5fb1556d6 100644
--- a/.ci_support/osx_arm64_python3.10.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:
-- '1.22'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
index 33dde1c7f..0b5a0c572 100644
--- a/.ci_support/osx_arm64_python3.11.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:
-- '1.23'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml
index 93dfb0b7a..2d662ad75 100644
--- a/.ci_support/osx_arm64_python3.12.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:
-- '1.26'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
index 900e33f6b..28eac98d4 100644
--- a/.ci_support/osx_arm64_python3.9.____cpython.yaml
+++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -21,13 +21,15 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
+docker_image:
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 flatbuffers:
-- 24.3.25
+- 24.12.23
 giflib:
 - '5.2'
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-cpu-2xlarge
 icu:
 - '75'
 libabseil:
@@ -35,17 +37,17 @@ libabseil:
 libcurl:
 - '8'
 libgrpc:
-- '1.65'
+- '1.67'
 libjpeg_turbo:
 - '3'
 libpng:
 - '1.6'
 libprotobuf:
-- 5.27.5
+- 5.28.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:
-- '1.22'
+- '2.0'
 openssl:
 - '3'
 pin_run_as_build:
@@ -54,8 +56,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.9.* *_cpython
-python_impl:
-- cpython
 snappy:
 - '1.2'
 sqlite:
@@ -69,6 +69,5 @@ zip_keys:
   - cxx_compiler_version
 - - python
   - numpy
-  - python_impl
 zlib:
 - '1'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
deleted file mode 100644
index 0535f6aa8..000000000
--- a/.github/workflows/automerge.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-on:
-  status: {}
-  check_suite:
-    types:
-      - completed
-
-jobs:
-  automerge-action:
-    runs-on: ubuntu-latest
-    name: automerge
-    steps:
-      - name: automerge-action
-        id: automerge-action
-        uses: conda-forge/automerge-action@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
deleted file mode 100644
index 22aa35492..000000000
--- a/.github/workflows/conda-build.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-# This file was generated automatically from conda-smithy. To update this configuration,
-# update the conda-forge.yml and/or the recipe/meta.yaml.
-# -*- mode: yaml -*-
-
-name: Build conda package
-on:
-  push:
-
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: ${{ matrix.CONFIG }}
-    runs-on: ${{ matrix.runs_on }}
-    timeout-minutes: 720
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h91fe0f008d', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hed7027e077', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h11ed5249c8', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h625cfcfe2e', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h1a635e5433', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h70857f1454', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h2dff17f9f4', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython
-            UPLOAD_PACKAGES: True
-            os: ubuntu
-            runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbe4b9baad6', 'linux', 'x64', 'self-hosted']
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-    steps:
-
-    - name: Checkout code
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
-
-    - name: Build on Linux
-      if: matrix.os == 'ubuntu'
-      env:
-        CONFIG: ${{ matrix.CONFIG }}
-        UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
-        DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
-        CI: github_actions
-        CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
-        BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
-        FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
-        STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
-      shell: bash
-      run: |
-        echo "::group::Configure binfmt_misc"
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
-        export flow_run_id="github_$GITHUB_RUN_ID"
-        export remote_url="https://github.com/$GITHUB_REPOSITORY"
-        export sha="$GITHUB_SHA"
-        export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
-        export GIT_BRANCH="$(basename $GITHUB_REF)"
-        if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
-          export IS_PR_BUILD="True"
-        else
-          export IS_PR_BUILD="False"
-        fi
-        echo "::endgroup::"
-        ./.scripts/run_docker_build.sh
-
-    - name: Build on macOS
-      if: matrix.os == 'macos'
-      env:
-        CONFIG: ${{ matrix.CONFIG }}
-        UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
-        CI: github_actions
-        BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
-        FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
-        STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
-      shell: bash
-      run: |
-        export flow_run_id="github_$GITHUB_RUN_ID"
-        export remote_url="https://github.com/$GITHUB_REPOSITORY"
-        export sha="$GITHUB_SHA"
-        export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
-        export GIT_BRANCH="$(basename $GITHUB_REF)"
-        if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
-          export IS_PR_BUILD="True"
-        else
-          export IS_PR_BUILD="False"
-        fi
-        ./.scripts/run_osx_build.sh
-
-    - name: Install Miniconda for windows
-      uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
-      with:
-        miniforge-version: latest
-      if: matrix.os == 'windows'
-
-    - name: Build on windows
-      shell: cmd
-      run: |
-        set "flow_run_id=github_%GITHUB_RUN_ID%"
-        set "remote_url=https://github.com/%GITHUB_REPOSITORY%"
-        set "sha=%GITHUB_SHA%"
-        call ".scripts\run_win_build.bat"
-      env:
-        PYTHONUNBUFFERED: 1
-        CONFIG: ${{ matrix.CONFIG }}
-        CI: github_actions
-        UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
-        BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
-        FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
-        STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
-      if: matrix.os == 'windows'
\ No newline at end of file
diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml
deleted file mode 100644
index d6f06b5c9..000000000
--- a/.github/workflows/webservices.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-on: repository_dispatch
-
-jobs:
-  webservices:
-    runs-on: ubuntu-latest
-    name: webservices
-    steps:
-      - name: webservices
-        id: webservices
-        uses: conda-forge/webservices-dispatch-action@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 179afe55e..bb3853666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@
 /build_artifacts
 
 *.pyc
+
+# Rattler-build's artifacts are in `output` when not specifying anything.
+/output
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 8601d5313..a421602c0 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -31,13 +31,13 @@ pkgs_dirs:
 solver: libmamba
 
 CONDARC
+mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S)
+echo > /opt/conda/conda-meta/history
+micromamba install --root-prefix ~/.conda --prefix /opt/conda \
+    --yes --override-channels --channel conda-forge --strict-channel-priority \
+    pip  python=3.12 conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1"
-
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
@@ -50,6 +50,9 @@ make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
 if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then
     EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
+    if [[ "${BUILD_PLATFORM}" == linux-* ]]; then
+        export CONDA_OVERRIDE_OSX="11.0"
+    fi
 fi
 
 
@@ -76,8 +79,8 @@ else
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
     ( startgroup "Inspecting artifacts" ) 2> /dev/null
 
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"
 
     ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
deleted file mode 100755
index 353866d9d..000000000
--- a/.scripts/run_osx_build.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-
-# -*- mode: jinja-shell -*-
-
-source .scripts/logging_utils.sh
-
-set -xe
-
-MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
-
-( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
-curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
-rm -rf ${MINIFORGE_HOME}
-bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
-
-( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-( startgroup "Configuring conda" ) 2> /dev/null
-
-source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
-conda activate base
-export CONDA_SOLVER="libmamba"
-export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
-
-mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1"
-
-
-
-echo -e "\n\nSetting up the condarc and mangling the compiler."
-setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
-
-if [[ "${CI:-}" != "" ]]; then
-  mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml
-fi
-
-if [[ "${CI:-}" != "" ]]; then
-  echo -e "\n\nMangling homebrew in the CI to avoid conflicts."
-  /usr/bin/sudo mangle_homebrew
-  /usr/bin/sudo -k
-else
-  echo -e "\n\nNot mangling homebrew as we are not running in CI"
-fi
-
-if [[ "${sha:-}" == "" ]]; then
-  sha=$(git rev-parse HEAD)
-fi
-
-echo -e "\n\nRunning the build setup script."
-source run_conda_forge_build_setup
-
-
-
-( endgroup "Configuring conda" ) 2> /dev/null
-
-echo -e "\n\nMaking the build clobber file"
-make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
-
-if [[ -f LICENSE.txt ]]; then
-  cp LICENSE.txt "recipe/recipe-scripts-license.txt"
-fi
-
-if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
-    if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then
-        EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}"
-    fi
-    conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \
-        ${EXTRA_CB_OPTIONS:-} \
-        --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
-
-    # Drop into an interactive shell
-    /bin/bash
-else
-
-    if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then
-        EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
-    fi
-
-    CONDA_SOLVER=libmamba conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \
-        --suppress-variables ${EXTRA_CB_OPTIONS:-} \
-        --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
-        --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
-
-    ( startgroup "Inspecting artifacts" ) 2> /dev/null
-
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
-
-    ( endgroup "Inspecting artifacts" ) 2> /dev/null
-    ( startgroup "Validating outputs" ) 2> /dev/null
-
-    validate_recipe_outputs "${FEEDSTOCK_NAME}"
-
-    ( endgroup "Validating outputs" ) 2> /dev/null
-
-    ( startgroup "Uploading packages" ) 2> /dev/null
-
-    if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then
-      upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml
-    fi
-
-    ( endgroup "Uploading packages" ) 2> /dev/null
-fi
\ No newline at end of file
diff --git a/README.md b/README.md
index 1ea77e280..7c640e83d 100644
--- a/README.md
+++ b/README.md
@@ -37,62 +37,6 @@ Current build status
         <table>
           <thead><tr><th>Variant</th><th>Status</th></tr></thead>
           <tbody><tr>
-              <td>linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/tensorflow-feedstock?branchName=main&jobName=linux&configuration=linux%20linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
               <td>osx_64_python3.10.____cpython</td>
               <td>
                 <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=4385&branchName=main">
@@ -167,7 +111,6 @@ Current release info
 | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) |
 | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) |
 | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) |
-| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) |
 
 Installing tensorflow
 =====================
@@ -179,16 +122,16 @@ conda config --add channels conda-forge
 conda config --set channel_priority strict
 ```
 
-Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with `conda`:
+Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator` can be installed with `conda`:
 
 ```
-conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu
+conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator
 ```
 
 or with `mamba`:
 
 ```
-mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu
+mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator
 ```
 
 It is possible to list all of the versions of `libtensorflow` available on your platform with `conda`:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e21431e51..d309e84b2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,14 +13,13 @@ stages:
         RET: 'true'
       steps:
       - checkout: self
-        
         fetchDepth: '2'
       - bash: |
           git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "`
           echo "##vso[task.setvariable variable=log]$git_log"
         displayName: Obtain commit message
       - bash: echo "##vso[task.setvariable variable=RET]false"
-        condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))
+        condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')))
         displayName: Skip build?
       - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET"
         name: result
@@ -29,4 +28,4 @@ stages:
   condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true'))
   dependsOn: Check
   jobs:
-    - template: ./.azure-pipelines/azure-pipelines-osx.yml
\ No newline at end of file
+    - template: ./.azure-pipelines/azure-pipelines-linux.yml
\ No newline at end of file
diff --git a/build-locally.py b/build-locally.py
index 6788aea66..c4a56c667 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -26,6 +26,13 @@ def setup_environment(ns):
             os.path.dirname(__file__), "miniforge3"
         )
 
+    # The default cache location might not be writable using docker on macOS.
+    if ns.config.startswith("linux") and platform.system() == "Darwin":
+        os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = (
+            os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "")
+            + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache"
+        )
+
 
 def run_docker_build(ns):
     script = ".scripts/run_docker_build.sh"
diff --git a/conda-forge.yml b/conda-forge.yml
index 1518f6828..e25f63563 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -1,10 +1,9 @@
 azure:
-  settings_linux:
-    timeoutInMinutes: 1
   settings_osx:
     timeoutInMinutes: 1
 build_platform:
-  osx_arm64: osx_64
+  osx_64: linux_64
+  osx_arm64: linux_64
 conda_build:
   pkg_format: '2'
 conda_build_tool: conda-build+conda-libmamba-solver
@@ -18,6 +17,4 @@ github_actions:
   triggers:
   - push
   - pull_request
-provider:
-  linux_64: github_actions
 test: native_and_emulated
diff --git a/recipe/build.sh b/recipe/build.sh
index 409215a23..91f5dc1bc 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -84,6 +84,9 @@ export CC_OPT_FLAGS="-O2"
 # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in
 if [[ "${target_platform}" == osx-* ]]; then
   export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup"
+  mkdir ${PREFIX}/sdk
+  cp -R ${CONDA_BUILD_SYSROOT}/* ${PREFIX}/sdk
+  export CONDA_BUILD_SYSROOT=${PREFIX}/sdk
 else
   export LDFLAGS="${LDFLAGS} -lrt"
 fi
@@ -96,29 +99,57 @@ if [[ ${cuda_compiler_version} != "None" ]]; then
     export TF_NEED_CUDA=1
     export TF_CUDA_VERSION="${cuda_compiler_version}"
     export TF_CUDNN_VERSION="${cudnn}"
+    export HERMETIC_CUDA_VERSION="${cuda_compiler_version}"
+    export HERMETIC_CUDNN_VERSION="${cudnn}"
     export TF_NCCL_VERSION=$(pkg-config nccl --modversion | grep -Po '\d+\.\d+')
 
     export LDFLAGS="${LDFLAGS//-Wl,-z,now/-Wl,-z,lazy}"
     export CC_OPT_FLAGS="-march=nocona -mtune=haswell"
 
     if [[ ${cuda_compiler_version} == 11.8 ]]; then
-        export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,sm_87,sm_89,sm_90,compute_90
+        export HERMETIC_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,sm_87,sm_89,sm_90,compute_90
         export TF_CUDA_PATHS="${PREFIX},${CUDA_HOME}"
     elif [[ "${cuda_compiler_version}" == 12* ]]; then
-        export TF_CUDA_COMPUTE_CAPABILITIES=sm_60,sm_70,sm_75,sm_80,sm_86,sm_89,sm_90,compute_90
-	export CUDNN_INSTALL_PATH=$PREFIX
-	export NCCL_INSTALL_PATH=$PREFIX
-	export CUDA_HOME="${BUILD_PREFIX}/targets/x86_64-linux"
+        export HERMETIC_CUDA_COMPUTE_CAPABILITIES=sm_60,sm_70,sm_75,sm_80,sm_86,sm_89,sm_90,compute_90
+        export CUDNN_INSTALL_PATH=$PREFIX
+        export NCCL_INSTALL_PATH=$PREFIX
+        export CUDA_HOME="${BUILD_PREFIX}/targets/x86_64-linux"
         export TF_CUDA_PATHS="${BUILD_PREFIX}/targets/x86_64-linux,${PREFIX}/targets/x86_64-linux"
-	# XLA can only cope with a single cuda header include directory, merge both
-	rsync -a ${PREFIX}/targets/x86_64-linux/include/ ${BUILD_PREFIX}/targets/x86_64-linux/include/
-
-	# hmaarrfk -- 2023/12/30
+        # XLA can only cope with a single cuda header include directory, merge both
+        rsync -a ${PREFIX}/targets/x86_64-linux/include/ ${BUILD_PREFIX}/targets/x86_64-linux/include/
+
+        # Although XLA supports a non-hermetic build, it still tries to find headers in the hermetic locations.
+        # We do this in the BUILD_PREFIX to not have any impact on the resulting jaxlib package.
+        # Otherwise, these copied files would be included in the package.
+        rm -rf ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party
+        mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI
+        cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/
+        cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI/
+        mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn
+        cp ${PREFIX}/include/cudnn*.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn/
+        mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl
+        cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/
+        rsync -a ${PREFIX}/targets/x86_64-linux/lib/ ${BUILD_PREFIX}/targets/x86_64-linux/lib/
+        ln -s ${BUILD_PREFIX}/bin/fatbinary ${BUILD_PREFIX}/targets/x86_64-linux/bin/fatbinary
+        ln -s ${BUILD_PREFIX}/bin/nvlink ${BUILD_PREFIX}/targets/x86_64-linux/bin/nvlink
+        ln -s ${BUILD_PREFIX}/bin/ptxas ${BUILD_PREFIX}/targets/x86_64-linux/bin/ptxas
+
+        export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux"
+        export LOCAL_CUDNN_PATH="${PREFIX}"
+        export LOCAL_NCCL_PATH="${PREFIX}"
+
+        # hmaarrfk -- 2023/12/30
         # This logic should be safe to keep in even when the underlying issue is resolved
         # xref: https://github.com/conda-forge/cuda-nvcc-impl-feedstock/issues/9
         if [[ -x ${BUILD_PREFIX}/nvvm/bin/cicc ]]; then
             cp ${BUILD_PREFIX}/nvvm/bin/cicc ${BUILD_PREFIX}/bin/cicc
         fi
+
+        # Needs GCC 13+
+        echo "build --define=xnn_enable_avxvnniint8=false" >> .bazelrc
+
+        # cuda-compat is used for providing libcuda.so.1 temporarily
+        cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1
     else
         echo "unsupported cuda version."
         exit 1
@@ -127,11 +158,18 @@ else
     export TF_NEED_CUDA=0
 fi
 
+echo "run gen-bazel-toolchain.sh"
 source ${RECIPE_DIR}/gen-bazel-toolchain.sh
 
+#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo'
+#echo "after gen-bazel-toolchain.sh"
+#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo'
+#find ./custom_toolchain | xargs cat
+#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo'
+
 if [[ "${target_platform}" == "osx-64" ]]; then
   # Tensorflow doesn't cope yet with an explicit architecture (darwin_x86_64) on osx-64 yet.
-  TARGET_CPU=darwin
+  TARGET_CPU=darwin_x86_64
   # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
   export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
 fi
@@ -146,6 +184,8 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then
   echo "build --config=macos_arm64" >> .bazelrc
   # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
   export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
+elif [[ "${target_platform}" == "osx-64" ]]; then
+  echo "build --config=macos" >> .bazelrc
 fi
 export TF_ENABLE_XLA=1
 export BUILD_TARGET="//tensorflow/tools/pip_package:wheel //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}"
@@ -187,11 +227,11 @@ fi
 
 cat >> .bazelrc <<EOF
 build --crosstool_top=//custom_toolchain:toolchain
+build --@local_config_cuda//cuda:override_include_cuda_libs=true
 build --logging=6
 build --verbose_failures
 build --define=PREFIX=${PREFIX}
 build --define=PROTOBUF_INCLUDE_PATH=${PREFIX}/include
-build --config=noaws
 build --cpu=${TARGET_CPU}
 build --local_cpu_resources=${CPU_COUNT}
 EOF
@@ -202,6 +242,7 @@ flatc --cpp --gen-object-api schema.fbs
 popd
 rm -f tensorflow/lite/schema/conversion_metadata_generated.h
 rm -f tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h
+rm -f tensorflow/lite/acceleration/configuration/configuration_generated.h
 sed -ie "s;BUILD_PREFIX;${BUILD_PREFIX};g" tensorflow/tools/pip_package/build_pip_package.py
 
 # build using bazel
@@ -242,3 +283,4 @@ bazel clean
 
 # This was only needed for protobuf_python
 rm -rf $PREFIX/include/python
+rm -f $PREFIX/lib/libcuda.so.1
diff --git a/recipe/build_estimator.sh b/recipe/build_estimator.sh
index ad6a70b58..9dc4b74d6 100644
--- a/recipe/build_estimator.sh
+++ b/recipe/build_estimator.sh
@@ -2,6 +2,11 @@
 
 set -exuo pipefail
 
+if [[ "${cuda_compiler_version}" == 12* ]]; then
+    # cuda-compat is used for providing libcuda.so.1 temporarily
+    cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1
+fi
+
 pushd tensorflow-estimator
 
 WHEEL_DIR=${PWD}/wheel_dir
@@ -14,3 +19,9 @@ bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package ${WHEEL_DIR}
 ${PYTHON} -m pip install --no-deps ${WHEEL_DIR}/*.whl
 bazel clean
 popd
+
+if [[ "${cuda_compiler_version}" == 12* ]]; then
+    # This was needed to load in the cuda symbols correctly temporarily
+    # https://github.com/conda-forge/tensorflow-feedstock/pull/408#issuecomment-2585259178
+    rm -f $PREFIX/lib/libcuda.so.1
+fi
diff --git a/recipe/build_pkg.sh b/recipe/build_pkg.sh
index 22eb89296..dc40b3109 100644
--- a/recipe/build_pkg.sh
+++ b/recipe/build_pkg.sh
@@ -1,9 +1,19 @@
 #! /bin/bash
 
 set -exuo pipefail
+if [[ "${cuda_compiler_version}" == 12* ]]; then
+    # cuda-compat is used for providing libcuda.so.1 temporarily
+    cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1
+fi
 
 # install the whl making sure to use host pip/python if cross-compiling
 ${PYTHON} -m pip install --no-deps $SRC_DIR/tensorflow_pkg/*.whl
 
 # The tensorboard package has the proper entrypoint
 rm -f ${PREFIX}/bin/tensorboard
+
+if [[ "${cuda_compiler_version}" == 12* ]]; then
+    # This was needed to load in the cuda symbols correctly temporarily
+    # https://github.com/conda-forge/tensorflow-feedstock/pull/408#issuecomment-2585259178
+    rm -f $PREFIX/lib/libcuda.so.1
+fi
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 84b5a2fba..a8be50340 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -1,2 +1,3 @@
 github_actions_labels:
-- cirun-openstack-cpu-xlarge
+- cirun-openstack-gpu-2xlarge   # [linux]
+- cirun-openstack-cpu-2xlarge   # [osx]
diff --git a/recipe/cp_libtensorflow.sh b/recipe/cp_libtensorflow.sh
index 80848cd7f..303f84ea4 100644
--- a/recipe/cp_libtensorflow.sh
+++ b/recipe/cp_libtensorflow.sh
@@ -1,7 +1,5 @@
 # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/lib_package/README.md
 tar -C ${PREFIX} -xzf $SRC_DIR/libtensorflow.tar.gz
 
-mv $PREFIX/include/external/local_tsl/tsl $PREFIX/include
-
 # Make writable so patchelf can do its magic
 chmod u+w $PREFIX/lib/libtensorflow*
diff --git a/recipe/custom_toolchain/CROSSTOOL.template b/recipe/custom_toolchain/CROSSTOOL.template
index 840230023..84da99173 100644
--- a/recipe/custom_toolchain/CROSSTOOL.template
+++ b/recipe/custom_toolchain/CROSSTOOL.template
@@ -29,19 +29,18 @@ toolchain {
   cxx_flag: "-std=c++17"
   cxx_flag: "-fmessage-length=0"
   linker_flag: "-Wl,-pie"
-  linker_flag: "-headerpad_max_install_names"
+  linker_flag: "-Wl,-headerpad_max_install_names"
   linker_flag: "-Wl,-dead_strip_dylibs"
   linker_flag: "-undefined"
   linker_flag: "dynamic_lookup"
   linker_flag: "-force_load"
-  linker_flag: "${BUILD_PREFIX}/lib/libc++.a"
+  linker_flag: "${PREFIX}/lib/libc++.a"
   linker_flag: "-force_load"
-  linker_flag: "${BUILD_PREFIX}/lib/libc++abi.a"
+  linker_flag: "-lc++abi.a"
   linker_flag: "-nostdlib"
   linker_flag: "-lc"
   linker_flag: "-isysroot${CONDA_BUILD_SYSROOT}"
   cxx_builtin_include_directory: "${PREFIX}/include/c++/v1"
-  cxx_builtin_include_directory: "${PREFIX}/lib/clang/10.0.0/include"
   cxx_builtin_include_directory: "${CONDA_BUILD_SYSROOT}/usr/include"
   cxx_builtin_include_directory: "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks"
   objcopy_embed_flag: "-I"
@@ -60,16 +59,16 @@ toolchain {
   compiler_flag: "-fstack-protector-strong"
   compiler_flag: "-O2"
   compiler_flag: "-pipe"
-  tool_path {name: "ld" path: "${LD}" }
-  tool_path {name: "cpp" path: "/usr/bin/cpp" }
+  tool_path {name: "ld" path: "${BUILD_PREFIX}/bin/${LD}" }
+  tool_path {name: "cpp" path: "${BUILD_PREFIX}/bin/clang-cpp" }
   tool_path {name: "dwp" path: "/usr/bin/dwp" }
   tool_path {name: "gcov" path: "/usr/bin/gcov" }
-  tool_path {name: "nm" path: "${NM}" }
-  tool_path {name: "objcopy" path: "/usr/bin/objcopy" }
-  tool_path {name: "objdump" path: "/usr/bin/objdump" }
-  tool_path {name: "strip" path: "${STRIP}" }
+  tool_path {name: "nm" path: "${BUILD_PREFIX}/bin/${NM}" }
+  tool_path {name: "objcopy" path: "${BUILD_PREFIX}/bin/llvm-objcopy" }
+  tool_path {name: "objdump" path: "${BUILD_PREFIX}/bin/llvm-objdump" }
+  tool_path {name: "strip" path: "${BUILD_PREFIX}/bin/${STRIP}" }
   tool_path {name: "gcc" path: "cc_wrapper.sh" }
-  tool_path {name: "ar" path: "${LIBTOOL}" }
+  tool_path {name: "ar" path: "${BUILD_PREFIX}/bin/${AR}" }
 
   compilation_mode_flags {
     mode: DBG
diff --git a/recipe/custom_toolchain/WORKSPACE b/recipe/custom_toolchain/WORKSPACE
index 125586504..f9517e4e3 100644
--- a/recipe/custom_toolchain/WORKSPACE
+++ b/recipe/custom_toolchain/WORKSPACE
@@ -1 +1,6 @@
 workspace(name = "local_config_cc")
+
+local_repository(
+    name = "macos_sdk",
+    path = "${CONDA_BUILD_SYSROOT}",
+)
diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl
index af32bf84c..9b4926c5d 100644
--- a/recipe/custom_toolchain/cc_toolchain_config.bzl
+++ b/recipe/custom_toolchain/cc_toolchain_config.bzl
@@ -22,7 +22,7 @@ def _impl(ctx):
         ),
         tool_path(
             name = "ld",
-            path = "${LD}",
+            path = "${BUILD_PREFIX}/bin/${LD}",
         ),
         tool_path(
             name = "ar",
@@ -34,7 +34,7 @@ def _impl(ctx):
         ),
         tool_path(
             name = "cpp",
-            path = "/usr/bin/cpp",
+            path = "${BUILD_PREFIX}/bin/clang-cpp",
         ),
         tool_path(
             name = "gcov",
@@ -42,15 +42,15 @@ def _impl(ctx):
         ),
         tool_path(
             name = "nm",
-            path = "${NM}",
+            path = "${BUILD_PREFIX}/bin/${NM}",
         ),
         tool_path(
             name = "objdump",
-            path = "/usr/bin/objdump",
+            path = "${BUILD_PREFIX}/bin/llvm-objdump",
         ),
         tool_path(
             name = "strip",
-            path = "${STRIP}",
+            path = "${BUILD_PREFIX}/bin/${STRIP}",
         ),
     ]
 
@@ -150,6 +150,10 @@ def _impl(ctx):
     toolchain_include_directories_flags = [
         "-isystem",
         "${PREFIX}/include",
+        "-isystem",
+        "${PREFIX}/include/c++/v1",
+        "-isystem",
+        "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include",
     ]
 
     toolchain_include_directories_feature = feature(
@@ -283,27 +287,14 @@ def _impl(ctx):
         ],
     )
 
-    if "TARGET_PLATFORM".startswith("osx"):
-        cxx_builtin_include_directories = [
-            "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks",
-            "${CONDA_BUILD_SYSROOT}/usr/include",
-            "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include",
-            "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include",
-            "${BUILD_PREFIX}/include/c++/v1",
-            "${PREFIX}/include",
-        ]
-    else:
-        cxx_builtin_include_directories = [
-            "${CONDA_BUILD_SYSROOT}/usr/include",
-            "${BUILD_PREFIX}/lib/gcc/${HOST}/${COMPILER_VERSION}",
-            "${BUILD_PREFIX}/${HOST}/include/c++/${COMPILER_VERSION}",
-            "${PREFIX}/include",
-        ]
-
-        if (len("${CUDA_HOME}")):
-            cxx_builtin_include_directories.append("${CUDA_HOME}/include")
-            cxx_builtin_include_directories.append("${CUDA_HOME}/targets/x86_64-linux/include/")
-            cxx_builtin_include_directories.append("${PREFIX}/targets/x86_64-linux/include")
+    cxx_builtin_include_directories = [
+        "@macos_sdk//System/Library/Frameworks",
+        "@macos_sdk//usr/include",
+        "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include",
+        "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include",
+        "${PREFIX}/include/c++/v1",
+        "${PREFIX}/include",
+    ]
 
     return cc_common.create_cc_toolchain_config_info(
         ctx = ctx,
@@ -317,6 +308,7 @@ def _impl(ctx):
         abi_version = "local",
         abi_libc_version = "local",
         tool_paths = tool_paths,
+        builtin_sysroot = "${CONDA_BUILD_SYSROOT}",
         cxx_builtin_include_directories = cxx_builtin_include_directories,
         features = [toolchain_include_directories_feature, compiler_flags, cxx_flags, supports_pic_feature, linker_flags, supports_dynamic_linker, link_libcpp_feature, objcpp_flags],
     )
diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template
index 947c1aa69..b59571cbc 100644
--- a/recipe/custom_toolchain/cc_wrapper.sh.template
+++ b/recipe/custom_toolchain/cc_wrapper.sh.template
@@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do
 done
 
 if [[ "${target_platform}" == "osx-arm64" ]]; then
-  /usr/bin/codesign -s - -f ${OUTPUT}
+  ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate -f ${OUTPUT}
 fi
diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh
index 73208eae2..84606d78d 100755
--- a/recipe/gen-bazel-toolchain.sh
+++ b/recipe/gen-bazel-toolchain.sh
@@ -44,6 +44,7 @@ pushd custom_toolchain
     export BAZEL_TOOLCHAIN_COMPILER_VERSION=$($CC -v 2>&1 | head -n1 | cut -d' ' -f3)
     export SHORT_BAZEL_TOOLCHAIN_COMPILER_VERSION=$(echo ${BAZEL_TOOLCHAIN_COMPILER_VERSION} | cut -d. -f1)
     sed -e "s:\${CLANG}:${CLANG}:" \
+        -e "s:\${BUILD_PREFIX}:${BUILD_PREFIX}:" \
         -e "s:\${target_platform}:${target_platform}:" \
         -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL}:" \
         -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \
@@ -52,6 +53,7 @@ pushd custom_toolchain
         cc_wrapper.sh.template > cc_wrapper.sh
     chmod +x cc_wrapper.sh
     sed -e "s:\${CLANG}:${CC_FOR_BUILD}:" \
+        -e "s:\${BUILD_PREFIX}:${BUILD_PREFIX}:" \
         -e "s:\${target_platform}:${target_platform}:" \
         -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL//${HOST}/${BUILD}}:" \
         -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \
@@ -129,6 +131,7 @@ pushd custom_toolchain
   cp cc_toolchain_config.bzl cc_toolchain_build_config.bzl
   apply_cc_template cc_toolchain_config.bzl
   apply_cc_template crosstool_wrapper_driver_is_not_gcc
+  apply_cc_template WORKSPACE
   (
     if [[ "${build_platform}" != "${target_platform}" ]]; then
       if [[ "${target_platform}" == osx-* ]]; then
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 4001732e4..d3fefecf0 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,15 +1,14 @@
-{% set version = "2.17.0" %}
+{% set version = "2.18.0" %}
 {% set estimator_version = "2.15.0" %}
-{% set build = 3 %}
+{% set build = 0 %}
 
 {% if cuda_compiler_version != "None" %}
 {% set build = build + 200 %}
 {% endif %}
 
-# 2.17.0.rc1 uses unreleased commit
-# https://github.com/jax-ml/ml_dtypes/commit/24084d9ed2c3d45bf83b7a9bff833aa185bf9172
-# see
-# https://github.com/tensorflow/tensorflow/blob/v2.17.0-rc1/third_party/py/ml_dtypes/workspace.bzl
+# Quite often libml_dtypes-headers and ml_dtypes diverge.
+# https://github.com/tensorflow/tensorflow/blob/v2.18.0/third_party/py/ml_dtypes/workspace.bzl
+{% set libml_dtypes_version = "0.5.0" %}
 {% set ml_dtypes_version = "0.4.0" %}
 
 package:
@@ -18,7 +17,7 @@ package:
 
 source:
   - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
-    sha256: 9cc4d5773b8ee910079baaecb4086d0c28939f024dd74b33fc5e64779b6533dc
+    sha256: d7876f4bb0235cac60eb6316392a7c48676729860da1ab659fb440379ad5186d
     patches:
       - patches/0001-loosen-requirements.patch
       - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch
@@ -47,15 +46,15 @@ source:
       - patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch
       - patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch
       - patches/0027-Protobuf-5-compatability.patch
+      - patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch
+      - patches/0029-set-the-cpu-type-for-macos-target.patch
   - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz
     sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530
     folder: tensorflow-estimator
 
 build:
   number: {{ build }}
-  skip: true  # [win]
-  skip: true  # [python_impl == 'pypy']
-  skip: true  # [py<39]
+  skip: true  # [not osx]
   # The following skip can be removed when the absl::StrFormat build issues are fixed.
   skip: true  # [cuda_compiler_version == "11.8"]
 
@@ -91,6 +90,7 @@ requirements:
     # so we install coreutils here
     - coreutils  # [cuda_compiler_version != "None"]
   host:
+    - libcxx-devel  # [osx]
     # GPU requirements for CUDA
     - cudnn      # [cuda_compiler_version != "None"]
     - nccl       # [cuda_compiler_version != "None"]
@@ -104,6 +104,8 @@ requirements:
     - libcurand-dev     # [(cuda_compiler_version or "").startswith("12")]
     - libcufft-dev      # [(cuda_compiler_version or "").startswith("12")]
     - libcusparse-dev   # [(cuda_compiler_version or "").startswith("12")]
+    - cuda-compat       # [(cuda_compiler_version or "").startswith("12")]
+    - libnvjitlink-dev  # [(cuda_compiler_version or "").startswith("12")]
     # conda build requirements
     - python
     - pip
@@ -143,6 +145,7 @@ requirements:
     - sqlite
     - snappy
     - zlib
+    - ml_dtypes >={{ ml_dtypes_version }},<0.5
 
 outputs:
   # 2021/12/29: hmaarrfk
@@ -191,6 +194,8 @@ outputs:
         - libcurand-dev     # [(cuda_compiler_version or "").startswith("12")]
         - libcufft-dev      # [(cuda_compiler_version or "").startswith("12")]
         - libcusparse-dev   # [(cuda_compiler_version or "").startswith("12")]
+        - cuda-compat       # [(cuda_compiler_version or "").startswith("12")]
+        - libnvjitlink-dev  # [(cuda_compiler_version or "").startswith("12")]
         # conda build requirements
         - python
         - pip
@@ -222,7 +227,7 @@ outputs:
         - astunparse >=1.6.0
         - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2
         - google-pasta >=0.1.1
-        - h5py >=3.10
+        - h5py >=3.11
         - ml_dtypes >={{ ml_dtypes_version }},<0.5
         - numpy
         - opt_einsum >=2.3.2
@@ -235,7 +240,7 @@ outputs:
         - typing_extensions >=3.6.6
         - wrapt >=1.11.0
         # TF-API needs to move in sync
-        - tensorboard >=2.17,<2.18
+        - tensorboard >=2.18,<2.19
         - keras >=3.0
       run:
         - python
@@ -245,7 +250,7 @@ outputs:
         - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2
         - google-pasta >=0.1.1
         - grpcio {{ libgrpc }}.*
-        - h5py >=3.10
+        - h5py >=3.11
         - ml_dtypes >={{ ml_dtypes_version }},<0.5
         - opt_einsum >=2.3.2
         - protobuf >=5.26,<6
@@ -256,7 +261,7 @@ outputs:
         - typing_extensions >=3.6.6
         - wrapt >=1.11.0
         # TF-API needs to move in sync
-        - tensorboard >=2.17,<2.18
+        - tensorboard >=2.18,<2.19
         - keras >=3.0
         # avoid that people without GPUs needlessly download ~0.5-1GB
         - __cuda                                                  # [cuda_compiler_version != "None"]
@@ -337,6 +342,7 @@ outputs:
         - icu                                      # [build_platform != target_platform]
         - {{ pin_subpackage('tensorflow-base') }}  # [build_platform != target_platform]
       host:
+        - cuda-compat       # [(cuda_compiler_version or "").startswith("12")]
         - python
         - pip
         - packaging
@@ -441,7 +447,7 @@ outputs:
         - sqlite
         - zlib
       run:
-        - libml_dtypes-headers >={{ ml_dtypes_version }},<0.5
+        - libml_dtypes-headers >={{ libml_dtypes_version }},<0.6
         # avoid that people without GPUs needlessly download ~200-300MB
         - __cuda  # [cuda_compiler_version != "None"]
     test:
diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch
index c6df4eb87..e06a14be0 100644
--- a/recipe/patches/0001-loosen-requirements.patch
+++ b/recipe/patches/0001-loosen-requirements.patch
@@ -1,7 +1,7 @@
-From e6a16ebf1cb912b32f8fa6f9b26dbe8add0d930b Mon Sep 17 00:00:00 2001
+From a95d80c7a5576ea26a6ed92cc46e47630aaafcb3 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 30 Dec 2021 06:57:09 +0200
-Subject: [PATCH 01/27] loosen requirements
+Subject: [PATCH 01/29] loosen requirements
 
 * Remove unused libclang requirement
 * Remove unecessary tensorflow-io-gcs-filesystem
@@ -11,32 +11,22 @@ Co-authored-by: Mark Harfouche <mark.harfouche@gmail.com>
 Co-authored-by: ngam
 Co-authored-by: Uwe L. Korn <uwelk@xhochy.com>
 ---
- tensorflow/tools/pip_package/setup.py | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ tensorflow/tools/pip_package/setup.py | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index 88da8b54..ac24634f 100644
+index 746adba6911..c04ce221255 100644
 --- a/tensorflow/tools/pip_package/setup.py
 +++ b/tensorflow/tools/pip_package/setup.py
-@@ -82,16 +82,12 @@ REQUIRED_PACKAGES = [
+@@ -81,7 +81,6 @@ REQUIRED_PACKAGES = [
+     'flatbuffers >= 24.3.25',
      'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2',
      'google_pasta >= 0.1.1',
-     'h5py >= 3.10.0',
 -    'libclang >= 13.0.0',
-     'ml_dtypes >= 0.3.1, < 0.5.0',
--    # TODO(b/304751256): Adjust the numpy pin to a single version, when ready
--    'numpy >= 1.23.5, < 2.0.0 ; python_version <= "3.11"',
--    'numpy >= 1.26.0, < 2.0.0 ; python_version >= "3.12"',
      'opt_einsum >= 2.3.2',
      'packaging',
      # pylint:disable=line-too-long
-     (
--        'protobuf>=3.20.3,<5.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5'
-+        'protobuf>=3.20.3,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5'
-     ),
-     'requests >= 2.21.0, < 3',
-     'setuptools',
-@@ -99,8 +95,6 @@ REQUIRED_PACKAGES = [
+@@ -94,8 +93,6 @@ REQUIRED_PACKAGES = [
      'termcolor >= 1.1.0',
      'typing_extensions >= 3.6.6',
      'wrapt >= 1.11.0',
@@ -45,3 +35,13 @@ index 88da8b54..ac24634f 100644
      # grpcio does not build correctly on big-endian machines due to lack of
      # BoringSSL support.
      # See https://github.com/tensorflow/tensorflow/issues/17882.
+@@ -111,9 +108,6 @@ REQUIRED_PACKAGES = [
+     # 'keras >= 2.14.0rc0, < 2.15' on the release branch after the branch cut.
+     'tensorboard >= 2.18, < 2.19',
+     'keras >= 3.5.0',
+-    # TODO(b/367877753): Update the upper bound to <2.2.0 once the compatibility
+-    # issues with numpy 2.1.0 is fixed.
+-    'numpy >= 1.26.0, < 2.1.0',
+     'h5py >= 3.11.0',
+     'ml_dtypes >= 0.4.0, < 0.5.0',
+ ]
diff --git a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch
index db5cd2baa..380e5d38c 100644
--- a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch
+++ b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch
@@ -1,14 +1,14 @@
-From 14a1b6162855bfe8d8d16cbd054f98afba4f16e5 Mon Sep 17 00:00:00 2001
+From bd12dfa052423307c28bc471c1675f070c91bf4c Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 30 Jun 2023 08:39:32 +0000
-Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC
+Subject: [PATCH 02/29] Add additional absl_synchronization linkage to gRPC
 
 ---
  third_party/systemlibs/grpc.BUILD | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/third_party/systemlibs/grpc.BUILD b/third_party/systemlibs/grpc.BUILD
-index 8b703f11..417baf5d 100644
+index 8b703f11556..417baf5d342 100644
 --- a/third_party/systemlibs/grpc.BUILD
 +++ b/third_party/systemlibs/grpc.BUILD
 @@ -10,6 +10,7 @@ cc_library(
diff --git a/recipe/patches/0003-Fix-missing-abseil-linkages.patch b/recipe/patches/0003-Fix-missing-abseil-linkages.patch
index 047d0fb0f..517957962 100644
--- a/recipe/patches/0003-Fix-missing-abseil-linkages.patch
+++ b/recipe/patches/0003-Fix-missing-abseil-linkages.patch
@@ -1,14 +1,14 @@
-From 7dc829cca3ae349278ca7f9186c5c5db5a81a390 Mon Sep 17 00:00:00 2001
+From 49676c262c8e55e59edfcc5a5af570aff074478c Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Mon, 3 Jul 2023 04:45:46 +0000
-Subject: [PATCH 03/27] Fix missing abseil linkages
+Subject: [PATCH 03/29] Fix missing abseil linkages
 
 ---
  third_party/absl/system.absl.strings.BUILD | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD
-index fa9a7a84..d04776c9 100644
+index fa9a7a84f67..d04776c98bf 100644
 --- a/third_party/absl/system.absl.strings.BUILD
 +++ b/third_party/absl/system.absl.strings.BUILD
 @@ -26,7 +26,7 @@ cc_library(
diff --git a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch
index 925704b26..52e543826 100644
--- a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch
+++ b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch
@@ -1,7 +1,7 @@
-From d70aa0acf092f069a154502100abd8c6f230129d Mon Sep 17 00:00:00 2001
+From 5678ef4465522b829b2cf56ec5de64da439a032d Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Wed, 30 Aug 2023 16:58:41 +0200
-Subject: [PATCH 04/27] Fix protobuf_python for systemlibs
+Subject: [PATCH 04/29] Fix protobuf_python for systemlibs
 
 ---
  tensorflow/workspace2.bzl                     |  9 ++++---
@@ -12,10 +12,10 @@ Subject: [PATCH 04/27] Fix protobuf_python for systemlibs
  create mode 100644 third_party/systemlibs/protobuf_python.bzl
 
 diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
-index fd29dff0..dc78011d 100644
+index be83c971749..5320aa187fd 100644
 --- a/tensorflow/workspace2.bzl
 +++ b/tensorflow/workspace2.bzl
-@@ -382,6 +382,7 @@ def _tf_repositories():
+@@ -390,6 +390,7 @@ def _tf_repositories():
          system_link_files = {
              "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl",
              "//third_party/systemlibs:protobuf_deps.bzl": "protobuf_deps.bzl",
@@ -23,7 +23,7 @@ index fd29dff0..dc78011d 100644
          },
          urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"),
      )
-@@ -786,10 +787,10 @@ def _tf_repositories():
+@@ -794,10 +795,10 @@ def _tf_repositories():
  
      tf_http_archive(
          name = "pybind11_protobuf",
@@ -40,7 +40,7 @@ index fd29dff0..dc78011d 100644
      tf_http_archive(
 diff --git a/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch
 new file mode 100644
-index 00000000..18a1ddf8
+index 00000000000..18a1ddf84f3
 --- /dev/null
 +++ b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch
 @@ -0,0 +1,26 @@
@@ -72,7 +72,7 @@ index 00000000..18a1ddf8
 +
 diff --git a/third_party/systemlibs/protobuf_python.bzl b/third_party/systemlibs/protobuf_python.bzl
 new file mode 100644
-index 00000000..982617a7
+index 00000000000..982617a765c
 --- /dev/null
 +++ b/third_party/systemlibs/protobuf_python.bzl
 @@ -0,0 +1,5 @@
diff --git a/recipe/patches/0005-Add-absl_log-systemlib.patch b/recipe/patches/0005-Add-absl_log-systemlib.patch
index fffca4ebc..e421e423c 100644
--- a/recipe/patches/0005-Add-absl_log-systemlib.patch
+++ b/recipe/patches/0005-Add-absl_log-systemlib.patch
@@ -1,7 +1,7 @@
-From 6d4c056204f6417cc7b01706d0a6b063a50e40e3 Mon Sep 17 00:00:00 2001
+From f0fb9b8ac9f6e7d529b3c10ccb2a4f959ac73364 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Wed, 30 Aug 2023 16:59:28 +0200
-Subject: [PATCH 05/27] Add absl_log systemlib
+Subject: [PATCH 05/29] Add absl_log systemlib
 
 ---
  third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++
@@ -11,7 +11,7 @@ Subject: [PATCH 05/27] Add absl_log systemlib
 
 diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
 new file mode 100644
-index 00000000..0248bda0
+index 00000000000..0248bda0f52
 --- /dev/null
 +++ b/third_party/absl/system.absl.log.BUILD
 @@ -0,0 +1,22 @@
@@ -38,7 +38,7 @@ index 00000000..0248bda0
 +    ],
 +)
 diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl
-index 06f75166..c54df3cf 100644
+index 9565a82c331..addb2410abd 100644
 --- a/third_party/absl/workspace.bzl
 +++ b/third_party/absl/workspace.bzl
 @@ -20,6 +20,7 @@ def repo():
diff --git a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
index 77c293cb5..ad635dfee 100644
--- a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
+++ b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
@@ -1,7 +1,7 @@
-From 5c31fdbd5aec3c392ae578bcac615c4d2c77e564 Mon Sep 17 00:00:00 2001
+From a84e4c7e3eee860b46c01dbae890f3e1c29f9796 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 15 Sep 2023 11:06:27 +0200
-Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is
+Subject: [PATCH 06/29] Omit linking to layout_proto_cc if protobuf linkage is
  shared
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is
  1 file changed, 1 deletion(-)
 
 diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
-index c3f9a377..b0432b14 100644
+index 0ad8e84b889..43843f32910 100644
 --- a/tensorflow/python/BUILD
 +++ b/tensorflow/python/BUILD
-@@ -1366,7 +1366,6 @@ tf_python_pybind_extension(
+@@ -1363,7 +1363,6 @@ tf_python_pybind_extension(
      features = ["-layering_check"],
      deps = [
          ":pywrap_densor_device_headers",
diff --git a/recipe/patches/0007-Fix-further-abseil-linkage.patch b/recipe/patches/0007-Fix-further-abseil-linkage.patch
index 000b22397..56b194196 100644
--- a/recipe/patches/0007-Fix-further-abseil-linkage.patch
+++ b/recipe/patches/0007-Fix-further-abseil-linkage.patch
@@ -1,14 +1,14 @@
-From 46645306963d53e96f4bde85a7a7fd4960a5a447 Mon Sep 17 00:00:00 2001
+From 1f38410e6f0d5059851ec2507dabb82a43359cd8 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Mon, 18 Sep 2023 14:47:08 +0000
-Subject: [PATCH 07/27] Fix further abseil linkage
+Subject: [PATCH 07/29] Fix further abseil linkage
 
 ---
  third_party/absl/system.absl.base.BUILD | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
-index d6bf8748..b3e42f4d 100644
+index d6bf8748dee..b3e42f4dd8b 100644
 --- a/third_party/absl/system.absl.base.BUILD
 +++ b/third_party/absl/system.absl.base.BUILD
 @@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"])
diff --git a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch
index 64e6905e6..7503fb8cb 100644
--- a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch
+++ b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch
@@ -1,14 +1,14 @@
-From 6d8aae7e5e303b9b0bb6731e13032388d4e38d50 Mon Sep 17 00:00:00 2001
+From 36c3dce398b05a0700148f44d05e1ef478e6371b Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 27 Oct 2023 11:20:12 +0200
-Subject: [PATCH 08/27] Add constraint to pybind11 systemlib
+Subject: [PATCH 08/29] Add constraint to pybind11 systemlib
 
 ---
  third_party/systemlibs/pybind11.BUILD | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD
-index 44e7496f..21ec073b 100644
+index 44e7496fc25..21ec073b7a4 100644
 --- a/third_party/systemlibs/pybind11.BUILD
 +++ b/third_party/systemlibs/pybind11.BUILD
 @@ -6,3 +6,9 @@ cc_library(
diff --git a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch
index 430ed382f..60a603fdc 100644
--- a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch
+++ b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch
@@ -1,14 +1,14 @@
-From a2a3cc6043d732aa17498ef46735405498c59bf7 Mon Sep 17 00:00:00 2001
+From d01328340a5236bb822f866c0975a9380bcf27af Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 27 Oct 2023 11:21:11 +0200
-Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE
+Subject: [PATCH 09/29] Different file ending for flatbuffers LICENSE
 
 ---
  third_party/flatbuffers/BUILD.system | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system
-index 8fe4d7a5..297f8baf 100644
+index 8fe4d7a5907..297f8baf0c0 100644
 --- a/third_party/flatbuffers/BUILD.system
 +++ b/third_party/flatbuffers/BUILD.system
 @@ -5,6 +5,11 @@ filegroup(
diff --git a/recipe/patches/0010-Use-correct-hermetic-python.patch b/recipe/patches/0010-Use-correct-hermetic-python.patch
index 757f74b9f..b45e9b7ab 100644
--- a/recipe/patches/0010-Use-correct-hermetic-python.patch
+++ b/recipe/patches/0010-Use-correct-hermetic-python.patch
@@ -1,7 +1,7 @@
-From 95485b5d00566df1982a410672821a951697d05f Mon Sep 17 00:00:00 2001
+From a4f0bb2fd93ae32fac3f29762a2dd7e43b6e200e Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 27 Oct 2023 11:21:38 +0200
-Subject: [PATCH 10/27] Use correct, hermetic python
+Subject: [PATCH 10/29] Use correct, hermetic python
 
 ---
  .../tensorflow/gen_quantized_function_library.py             | 5 +++++
@@ -9,7 +9,7 @@ Subject: [PATCH 10/27] Use correct, hermetic python
  2 files changed, 7 insertions(+)
 
 diff --git a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py
-index 8352b974..7eed8b4e 100644
+index 8352b974996..7eed8b4e373 100644
 --- a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py
 +++ b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py
 @@ -14,6 +14,11 @@
@@ -25,7 +25,7 @@ index 8352b974..7eed8b4e 100644
  import re
  import string
 diff --git a/tensorflow/python/tools/api/generator/create_python_api.py b/tensorflow/python/tools/api/generator/create_python_api.py
-index cd76ae73..c12533c9 100644
+index cd76ae73f77..c12533c9b57 100644
 --- a/tensorflow/python/tools/api/generator/create_python_api.py
 +++ b/tensorflow/python/tools/api/generator/create_python_api.py
 @@ -18,6 +18,8 @@ import collections
diff --git a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch
index ee28b2922..d8ce09cba 100644
--- a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch
+++ b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch
@@ -1,14 +1,14 @@
-From a878cc2a275f4887f0309ace423a049a30b1a39e Mon Sep 17 00:00:00 2001
+From 5dc74494a5ebe9a7cb22f3653979355bcdb4bef3 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Wed, 15 Nov 2023 09:18:28 +0100
-Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib
+Subject: [PATCH 11/29] Add well_known_types_py_pb2 to protobuf systemlib
 
 ---
  third_party/systemlibs/protobuf.BUILD | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD
-index c7d94060..504bc81a 100644
+index c7d940605f9..504bc81af0d 100644
 --- a/third_party/systemlibs/protobuf.BUILD
 +++ b/third_party/systemlibs/protobuf.BUILD
 @@ -111,3 +111,10 @@ py_library(
diff --git a/recipe/patches/0012-Add-protobuf-toolchain.patch b/recipe/patches/0012-Add-protobuf-toolchain.patch
index 4cc9dea81..66e3ba680 100644
--- a/recipe/patches/0012-Add-protobuf-toolchain.patch
+++ b/recipe/patches/0012-Add-protobuf-toolchain.patch
@@ -1,14 +1,14 @@
-From de24030836aeecfa290e5f5ba11e61f9c6dbcbc5 Mon Sep 17 00:00:00 2001
+From 1ac99cf3d59dafde68d4f1a58a19f723d63653f0 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Wed, 15 Nov 2023 10:32:41 +0000
-Subject: [PATCH 12/27] Add protobuf toolchain
+Subject: [PATCH 12/29] Add protobuf toolchain
 
 ---
  third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD
-index 504bc81a..4f105d33 100644
+index 504bc81af0d..4f105d33f84 100644
 --- a/third_party/systemlibs/protobuf.BUILD
 +++ b/third_party/systemlibs/protobuf.BUILD
 @@ -65,12 +65,26 @@ cc_library(
diff --git a/recipe/patches/0013-fix-genproto.patch b/recipe/patches/0013-fix-genproto.patch
index e6da4e235..c35163dcf 100644
--- a/recipe/patches/0013-fix-genproto.patch
+++ b/recipe/patches/0013-fix-genproto.patch
@@ -1,17 +1,17 @@
-From f9bf16ddf1cb2d288694871fa3383d90aa874a1a Mon Sep 17 00:00:00 2001
+From d7e69912774696308bb6f61a98ed9381294a7f28 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 16 Nov 2023 06:38:27 +0000
-Subject: [PATCH 13/27] fix genproto
+Subject: [PATCH 13/29] fix genproto
 
 ---
  .../third_party/tsl/tsl/platform/default/build_config.bzl    | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl
-index 35cdcdc5..ca4bdd0e 100644
+index 726f54634c5..62837c84837 100644
 --- a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl
 +++ b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl
-@@ -401,10 +401,7 @@ def py_proto_library(
+@@ -400,10 +400,7 @@ def py_proto_library(
  
      genproto_deps = []
      for dep in deps:
diff --git a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch
index ad416592c..d2636abe3 100644
--- a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch
+++ b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch
@@ -1,7 +1,7 @@
-From ae92d44a00de6f162bdc045052be0d6140fc081f Mon Sep 17 00:00:00 2001
+From 4c3408a720c8127576dd0aecbe9dd28f02c123da Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 23 Nov 2023 09:05:37 +0000
-Subject: [PATCH 14/27] Remove some usage of absl::str_format in CUDA
+Subject: [PATCH 14/29] Remove some usage of absl::str_format in CUDA
 
 nvcc from CUDA 11 is unable to correctly handle the new C++ features
 used in this template. We use a different implementation that should
@@ -13,7 +13,7 @@ yield the same results without the usage of absl.
  3 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/tensorflow/core/framework/resource_base.h b/tensorflow/core/framework/resource_base.h
-index 46a76ea0..2f8d0a21 100644
+index 46a76ea094c..2f8d0a21878 100644
 --- a/tensorflow/core/framework/resource_base.h
 +++ b/tensorflow/core/framework/resource_base.h
 @@ -18,8 +18,9 @@ limitations under the License.
@@ -42,7 +42,7 @@ index 46a76ea0..2f8d0a21 100644
  
    // Returns memory used by this resource.
 diff --git a/tensorflow/core/framework/resource_var.cc b/tensorflow/core/framework/resource_var.cc
-index c441a8e2..7e1f1fdf 100644
+index c441a8e2648..7e1f1fdf0ea 100644
 --- a/tensorflow/core/framework/resource_var.cc
 +++ b/tensorflow/core/framework/resource_var.cc
 @@ -18,6 +18,8 @@ limitations under the License.
@@ -55,7 +55,7 @@ index c441a8e2..7e1f1fdf 100644
  
  Status Var::AsGraphDef(GraphDefBuilder* builder, Node** out) const {
 diff --git a/tensorflow/core/kernels/conv_ops_gpu.h b/tensorflow/core/kernels/conv_ops_gpu.h
-index 627450ef..d0c97527 100644
+index 627450ef2d6..d0c97527284 100644
 --- a/tensorflow/core/kernels/conv_ops_gpu.h
 +++ b/tensorflow/core/kernels/conv_ops_gpu.h
 @@ -22,7 +22,7 @@ limitations under the License.
diff --git a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch
index 3cc7bdd0b..588106012 100644
--- a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch
+++ b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch
@@ -1,22 +1,22 @@
-From 38ca4efe105b78c1622f2246cc5b66c5c6aa5e7a Mon Sep 17 00:00:00 2001
+From 9c6c561823988ae34c2af979486b06cace20ebee Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <mark.harfouche@gmail.com>
 Date: Sat, 27 Jan 2024 22:27:56 -0500
-Subject: [PATCH 15/27] Adjust relative path for libdevice
+Subject: [PATCH 15/29] Adjust relative path for libdevice
 
 ---
  .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc
-index 46321e74..fd0cab0d 100644
+index ac0a804b4df..fe8305fd893 100644
 --- a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc
 +++ b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc
-@@ -51,7 +51,7 @@ std::vector<std::string> CandidateCudaRoots() {
+@@ -69,7 +69,7 @@ std::vector<std::string> CandidateCudaRoots() {
      // TF lib binaries are located in both the package's root dir and within a
      // 'python' subdirectory (for pywrap libs). So we check two possible paths
      // relative to the current binary for the wheel-based nvcc package.
 -    for (auto path : {"../nvidia/cuda_nvcc", "../../nvidia/cuda_nvcc"})
 +    for (auto path : {"../nvidia/cuda_nvcc", "../../nvidia/cuda_nvcc", "../../../.."})
        roots.emplace_back(io::JoinPath(dir, path));
-   }
- #endif  // defined(PLATFORM_POSIX) && !defined(__APPLE__)
+ 
+     // Also add the path to the copy of libdevice.10.bc that we include within
diff --git a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch
index a60d2f5a7..cba24e483 100644
--- a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch
+++ b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch
@@ -1,7 +1,7 @@
-From 346c37a3c4273ee4d65a9275c26617b391876c33 Mon Sep 17 00:00:00 2001
+From 172568f92566ab51e268b13125cb7647a7463d34 Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <mark.harfouche@gmail.com>
 Date: Mon, 26 Feb 2024 22:30:08 -0500
-Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags
+Subject: [PATCH 16/29] Link to absl_log_flags instead of absl_flags
 
 ---
  third_party/absl/system.absl.flags.BUILD                        | 2 +-
@@ -9,7 +9,7 @@ Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD
-index aff653c7..ee2e1bfe 100644
+index aff653c7e5b..ee2e1bfe5e3 100644
 --- a/third_party/absl/system.absl.flags.BUILD
 +++ b/third_party/absl/system.absl.flags.BUILD
 @@ -97,7 +97,7 @@ cc_library(
@@ -22,7 +22,7 @@ index aff653c7..ee2e1bfe 100644
          ":config",
          ":flag_internal",
 diff --git a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD
-index aff653c7..ee2e1bfe 100644
+index aff653c7e5b..ee2e1bfe5e3 100644
 --- a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD
 +++ b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD
 @@ -97,7 +97,7 @@ cc_library(
diff --git a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch
index a69d1c977..e17075e08 100644
--- a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch
+++ b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch
@@ -1,7 +1,7 @@
-From 81ff1b5ec7052ab02abc008d031b9a85a82069e0 Mon Sep 17 00:00:00 2001
+From ee83172851b5edbf302918785a58af0bdb5d2782 Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <mark.harfouche@gmail.com>
 Date: Tue, 27 Feb 2024 18:01:19 -0500
-Subject: [PATCH 17/27] Update ABSL Log Definition for
+Subject: [PATCH 17/29] Update ABSL Log Definition for
  libabsl_vlog_config_internal.so
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 17/27] Update ABSL Log Definition for
  1 file changed, 2 insertions(+)
 
 diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
-index 0248bda0..1fe1e342 100644
+index 0248bda0f52..1fe1e342594 100644
 --- a/third_party/absl/system.absl.log.BUILD
 +++ b/third_party/absl/system.absl.log.BUILD
 @@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"])
diff --git a/recipe/patches/0018-add-absl_string_view-target.patch b/recipe/patches/0018-add-absl_string_view-target.patch
index c0b4ad49e..6dfa50ebc 100644
--- a/recipe/patches/0018-add-absl_string_view-target.patch
+++ b/recipe/patches/0018-add-absl_string_view-target.patch
@@ -1,14 +1,14 @@
-From 3d79a13204bb6fa626dc1cb82e03506280a53590 Mon Sep 17 00:00:00 2001
+From 31d97aaad5483ed8135834530d4576f77856e475 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 12 May 2024 18:45:03 +1100
-Subject: [PATCH 18/27] add absl_string_view target
+Subject: [PATCH 18/29] add absl_string_view target
 
 ---
  third_party/absl/system.absl.strings.BUILD | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD
-index d04776c9..9f537def 100644
+index d04776c98bf..9f537def3d7 100644
 --- a/third_party/absl/system.absl.strings.BUILD
 +++ b/third_party/absl/system.absl.strings.BUILD
 @@ -2,6 +2,18 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
diff --git a/recipe/patches/0019-add-absl_nullability-target.patch b/recipe/patches/0019-add-absl_nullability-target.patch
index f094ab3cb..3ede34c1e 100644
--- a/recipe/patches/0019-add-absl_nullability-target.patch
+++ b/recipe/patches/0019-add-absl_nullability-target.patch
@@ -1,14 +1,14 @@
-From c1ab28a6ca9909f0310cac9008569a5df03ef4a1 Mon Sep 17 00:00:00 2001
+From 00230b46bc1df8951ce5917d7d3ddd700e611dba Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 12 May 2024 19:30:44 +1100
-Subject: [PATCH 19/27] add absl_nullability target
+Subject: [PATCH 19/29] add absl_nullability target
 
 ---
  third_party/absl/system.absl.base.BUILD | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
-index b3e42f4d..a423d5f7 100644
+index b3e42f4dd8b..a423d5f70da 100644
 --- a/third_party/absl/system.absl.base.BUILD
 +++ b/third_party/absl/system.absl.base.BUILD
 @@ -25,6 +25,14 @@ cc_library(
diff --git a/recipe/patches/0020-add-absl_prefetch-target.patch b/recipe/patches/0020-add-absl_prefetch-target.patch
index 32b944163..95d04dddb 100644
--- a/recipe/patches/0020-add-absl_prefetch-target.patch
+++ b/recipe/patches/0020-add-absl_prefetch-target.patch
@@ -1,14 +1,14 @@
-From 16b223f630d00a46d1c90ad129924afb6f7143e4 Mon Sep 17 00:00:00 2001
+From 713e64e743e198245f61270629828397f92b55f0 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 12 May 2024 22:29:25 +1100
-Subject: [PATCH 20/27] add absl_prefetch target
+Subject: [PATCH 20/29] add absl_prefetch target
 
 ---
  third_party/absl/system.absl.base.BUILD | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
-index a423d5f7..b31592d3 100644
+index a423d5f70da..b31592d31a3 100644
 --- a/third_party/absl/system.absl.base.BUILD
 +++ b/third_party/absl/system.absl.base.BUILD
 @@ -116,6 +116,14 @@ cc_library(
diff --git a/recipe/patches/0021-add-absl_die_if_null-target.patch b/recipe/patches/0021-add-absl_die_if_null-target.patch
index 43e54b7df..7c84ae96a 100644
--- a/recipe/patches/0021-add-absl_die_if_null-target.patch
+++ b/recipe/patches/0021-add-absl_die_if_null-target.patch
@@ -1,17 +1,17 @@
-From cf4e36f47e874278b60c2fdab575bfb33fe803ac Mon Sep 17 00:00:00 2001
+From b1f716e00675cb578b9cc9187136ab67b07aa261 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 12 May 2024 22:46:04 +1100
-Subject: [PATCH 21/27] add absl_die_if_null target
+Subject: [PATCH 21/29] add absl_die_if_null target
 
 ---
- third_party/absl/system.absl.log.BUILD | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ third_party/absl/system.absl.log.BUILD | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
 diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
-index 1fe1e342..6606aaa5 100644
+index 1fe1e342594..141bb319489 100644
 --- a/third_party/absl/system.absl.log.BUILD
 +++ b/third_party/absl/system.absl.log.BUILD
-@@ -2,6 +2,17 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
+@@ -2,6 +2,22 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
  
  package(default_visibility = ["//visibility:public"])
  
@@ -25,6 +25,11 @@ index 1fe1e342..6606aaa5 100644
 +        "//absl/strings",
 +    ],
 +)
++
++alias(
++    name = "absl_log",
++    actual = ":log",
++)
 +
  cc_library(
      name = "log",
diff --git a/recipe/patches/0022-add-absl_crc32c-targets.patch b/recipe/patches/0022-add-absl_crc32c-targets.patch
index 5cfc12292..4e5dcbe2a 100644
--- a/recipe/patches/0022-add-absl_crc32c-targets.patch
+++ b/recipe/patches/0022-add-absl_crc32c-targets.patch
@@ -1,7 +1,7 @@
-From 3d268a099e1a3f62922c913f049f503fb77ad613 Mon Sep 17 00:00:00 2001
+From 94ad23f0de536c9bced102cb7ae7495bc4279753 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Mon, 13 May 2024 09:41:09 +1100
-Subject: [PATCH 22/27] add absl_crc32c targets
+Subject: [PATCH 22/29] add absl_crc32c targets
 
 ---
  third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++
@@ -11,7 +11,7 @@ Subject: [PATCH 22/27] add absl_crc32c targets
 
 diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD
 new file mode 100644
-index 00000000..487c36ff
+index 00000000000..487c36ff45b
 --- /dev/null
 +++ b/third_party/absl/system.absl.crc.BUILD
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..487c36ff
 +    ],
 +)
 diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl
-index c54df3cf..94ee77bb 100644
+index addb2410abd..e71aa167260 100644
 --- a/third_party/absl/workspace.bzl
 +++ b/third_party/absl/workspace.bzl
 @@ -14,6 +14,7 @@ def repo():
diff --git a/recipe/patches/0023-add-kernel_timeout_internal-target.patch b/recipe/patches/0023-add-kernel_timeout_internal-target.patch
index e83dca615..4cb4f58cd 100644
--- a/recipe/patches/0023-add-kernel_timeout_internal-target.patch
+++ b/recipe/patches/0023-add-kernel_timeout_internal-target.patch
@@ -1,14 +1,14 @@
-From 63e72374d50094425d0675059c2b11e3c95d3135 Mon Sep 17 00:00:00 2001
+From f62987a80c0f75dc4526d21a52a056124b4d5862 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Mon, 13 May 2024 23:36:48 +1100
-Subject: [PATCH 23/27] add kernel_timeout_internal target
+Subject: [PATCH 23/29] add kernel_timeout_internal target
 
 ---
  .../absl/system.absl.synchronization.BUILD        | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 diff --git a/third_party/absl/system.absl.synchronization.BUILD b/third_party/absl/system.absl.synchronization.BUILD
-index c0fa37aa..b47309de 100644
+index c0fa37aacd7..b47309deb39 100644
 --- a/third_party/absl/system.absl.synchronization.BUILD
 +++ b/third_party/absl/system.absl.synchronization.BUILD
 @@ -16,14 +16,29 @@ cc_library(
diff --git a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch
index 55b7c7ed4..f9d779abe 100644
--- a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch
+++ b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch
@@ -1,7 +1,7 @@
-From a89bade09f737a1cd5f7e2ee7ec26b38dfb771dd Mon Sep 17 00:00:00 2001
+From 956d7230488a7f96625078a0766933178f31b523 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 19 May 2024 20:52:35 +1100
-Subject: [PATCH 24/27] work around for warning that clang falsely treats as
+Subject: [PATCH 24/29] work around for warning that clang falsely treats as
  error
 
 see https://github.com/llvm/llvm-project/issues/92630
@@ -10,10 +10,10 @@ see https://github.com/llvm/llvm-project/issues/92630
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/.bazelrc b/.bazelrc
-index fb80a081..01668b2c 100644
+index f48811d13d2..0d1c0305d97 100644
 --- a/.bazelrc
 +++ b/.bazelrc
-@@ -313,7 +313,7 @@ build:ios --noenable_platform_specific_config
+@@ -310,7 +310,7 @@ build:ios --noenable_platform_specific_config
  build:android --copt=-w
  build:ios --copt=-w
  build:linux --host_copt=-w
diff --git a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch
index c4796ac8e..11754e173 100644
--- a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch
+++ b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch
@@ -1,17 +1,17 @@
-From ed916a2d3c5399dbf6c71b1f6f7f07b8b1ddb8fc Mon Sep 17 00:00:00 2001
+From 667b9f768fffa9bee1c05a4a02a56db41898d427 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 12 Jul 2024 12:52:38 +0000
-Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package
+Subject: [PATCH 25/29] Hardcode BUILD_PREFIX in build_pip_package
 
 ---
  tensorflow/tools/pip_package/build_pip_package.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/tensorflow/tools/pip_package/build_pip_package.py b/tensorflow/tools/pip_package/build_pip_package.py
-index 9588fc19..2d0718af 100644
+index d882db09a10..091db3f4691 100644
 --- a/tensorflow/tools/pip_package/build_pip_package.py
 +++ b/tensorflow/tools/pip_package/build_pip_package.py
-@@ -240,12 +240,12 @@ def patch_so(srcs_dir: str) -> None:
+@@ -285,12 +285,12 @@ def patch_so(srcs_dir: str) -> None:
    }
    for file, path in to_patch.items():
      rpath = subprocess.check_output(
diff --git a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch
index 82feb5d33..dc31611a0 100644
--- a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch
+++ b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch
@@ -1,17 +1,17 @@
-From c3205a7e020e1e9ee30581b2b869ed83746136b7 Mon Sep 17 00:00:00 2001
+From 0bbb91fd9c2750876113839b9b74765426ec23c7 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 16 Jul 2024 17:18:23 +0200
-Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers
+Subject: [PATCH 26/29] Only link to sparse_core_layout_proto_cc headers
 
 ---
  tensorflow/core/tpu/kernels/BUILD | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tensorflow/core/tpu/kernels/BUILD b/tensorflow/core/tpu/kernels/BUILD
-index 7d55de7b..c409c1b0 100644
+index 5c1dc5da889..4d467227ba2 100644
 --- a/tensorflow/core/tpu/kernels/BUILD
 +++ b/tensorflow/core/tpu/kernels/BUILD
-@@ -1487,7 +1487,7 @@ cc_library(
+@@ -1483,7 +1483,7 @@ cc_library(
      hdrs = ["sparse_core_layout.h"],
      visibility = ["//tensorflow/python/tpu:__pkg__"],  # ONLY for `_pywrap_sparse_core_layout`.
      deps = [
diff --git a/recipe/patches/0027-Protobuf-5-compatability.patch b/recipe/patches/0027-Protobuf-5-compatability.patch
index 9783d1379..3ae7e9ab3 100644
--- a/recipe/patches/0027-Protobuf-5-compatability.patch
+++ b/recipe/patches/0027-Protobuf-5-compatability.patch
@@ -1,7 +1,7 @@
-From d98ec2c4eb0a0b58f0003d3b9d7ba7aeb413fe78 Mon Sep 17 00:00:00 2001
+From 6b7eab274229f57e295940322452c3d920800c52 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 10 Oct 2024 19:59:31 +0200
-Subject: [PATCH 27/27] Protobuf 5 compatability
+Subject: [PATCH 27/29] Protobuf 5 compatability
 
 ---
  .../mlir/lite/python/jax_to_tfl_flatbuffer.cc |  2 +-
@@ -23,12 +23,12 @@ Subject: [PATCH 27/27] Protobuf 5 compatability
  create mode 100644 third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch
 
 diff --git a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc
-index ed968b54..71e16db6 100644
+index eba1ebc48ce..dc9f7b81af6 100644
 --- a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc
 +++ b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc
 @@ -57,7 +57,7 @@ namespace {
  // Error collector that simply ignores errors reported.
- class NoOpErrorCollector : public protobuf::io::ErrorCollector {
+ class NoOpErrorCollector : public tsl::protobuf::io::ErrorCollector {
   public:
 -  void AddError(int line, int column, const std::string& message) override {}
 +  void RecordError(int line, int column, const absl::string_view message) override {}
@@ -36,7 +36,7 @@ index ed968b54..71e16db6 100644
  
  bool LoadHloProto(const std::string& contents, xla::HloProto* hlo_proto) {
 diff --git a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc
-index 906a058d..0c673310 100644
+index 906a058d04e..0c67331094b 100644
 --- a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc
 +++ b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc
 @@ -30,7 +30,7 @@ namespace {
@@ -49,7 +49,7 @@ index 906a058d..0c673310 100644
  }  // namespace
  
 diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
-index 0e4e11d8..912970b7 100644
+index 0e4e11d81e9..912970b7d82 100644
 --- a/tensorflow/core/debug/debug_io_utils.cc
 +++ b/tensorflow/core/debug/debug_io_utils.cc
 @@ -94,7 +94,11 @@ Event PrepareChunkEventProto(const DebugNodeKey& debug_node_key,
@@ -65,7 +65,7 @@ index 0e4e11d8..912970b7 100644
        metadata, &json_output, json_options);
    if (status.ok()) {
 diff --git a/tensorflow/core/ir/importexport/parse_text_proto.cc b/tensorflow/core/ir/importexport/parse_text_proto.cc
-index c631785c..3ab6e17c 100644
+index c631785cefc..3ab6e17c3aa 100644
 --- a/tensorflow/core/ir/importexport/parse_text_proto.cc
 +++ b/tensorflow/core/ir/importexport/parse_text_proto.cc
 @@ -35,7 +35,7 @@ namespace {
@@ -78,7 +78,7 @@ index c631785c..3ab6e17c 100644
  }  // namespace
  
 diff --git a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc
-index 7fbcd397..d17f3402 100644
+index 7fbcd397906..d17f3402a3f 100644
 --- a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc
 +++ b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc
 @@ -62,7 +62,11 @@ absl::StatusOr<std::string> ConvertHloProtoToMemoryViewer(
@@ -94,7 +94,7 @@ index 7fbcd397..d17f3402 100644
        result_or.value(), &json_output, options);
    if (!encoded_status.ok()) {
 diff --git a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc
-index b289f54b..38e89170 100644
+index b289f54baa6..38e89170f42 100644
 --- a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc
 +++ b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc
 @@ -529,7 +529,11 @@ void ProcessMemoryProfileProto(int64_t max_num_snapshots,
@@ -110,7 +110,7 @@ index b289f54b..38e89170 100644
                                                      json_options);
    if (!status.ok()) {
 diff --git a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc
-index b623c6a9..624f2c04 100644
+index dcc7cea45f7..a995db64d42 100644
 --- a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc
 +++ b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc
 @@ -218,7 +218,11 @@ absl::StatusOr<std::string> ConvertMultiXSpacesToPodViewer(
@@ -138,7 +138,7 @@ index b623c6a9..624f2c04 100644
    auto encode_status =
        protobuf::util::MessageToJsonString(profile, &json_output, opts);
 diff --git a/tensorflow/core/util/proto/proto_utils.cc b/tensorflow/core/util/proto/proto_utils.cc
-index 282be94a..7cfed84d 100644
+index 282be94a774..7cfed84d2a8 100644
 --- a/tensorflow/core/util/proto/proto_utils.cc
 +++ b/tensorflow/core/util/proto/proto_utils.cc
 @@ -101,17 +101,17 @@ StringErrorCollector::StringErrorCollector(string* error_text,
@@ -165,7 +165,7 @@ index 282be94a..7cfed84d 100644
  
  }  // namespace proto_utils
 diff --git a/tensorflow/core/util/proto/proto_utils.h b/tensorflow/core/util/proto/proto_utils.h
-index f0347a84..c8b2a4b9 100644
+index f0347a84cbe..c8b2a4b936a 100644
 --- a/tensorflow/core/util/proto/proto_utils.h
 +++ b/tensorflow/core/util/proto/proto_utils.h
 @@ -53,10 +53,10 @@ class StringErrorCollector : public protobuf::io::ErrorCollector {
@@ -182,7 +182,7 @@ index f0347a84..c8b2a4b9 100644
   private:
    string* const error_text_;
 diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
-index 406e6641..d97eae73 100644
+index 406e6641178..d97eae7346b 100644
 --- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc
 +++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
 @@ -31,8 +31,8 @@ class CrashOnErrorCollector
@@ -197,10 +197,10 @@ index 406e6641..d97eae73 100644
                 << column << " - " << message;
    }
 diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
-index dc78011d..a4faad8f 100644
+index 5320aa187fd..32f0a39c91c 100644
 --- a/tensorflow/workspace2.bzl
 +++ b/tensorflow/workspace2.bzl
-@@ -870,6 +870,10 @@ def _tf_repositories():
+@@ -878,6 +878,10 @@ def _tf_repositories():
          name = "riegeli",
          sha256 = "1d216d5c97fa60632143d209a1bb48c2a83788efdb876902e7bbc06396d5ee1f",
          strip_prefix = "riegeli-5d75119232cd4f6db8dfa69a1503289f050e9643",
@@ -213,7 +213,7 @@ index dc78011d..a4faad8f 100644
  
 diff --git a/third_party/0001-Migrate-from-AddError-to-RecordError.patch b/third_party/0001-Migrate-from-AddError-to-RecordError.patch
 new file mode 100644
-index 00000000..0ed75ee8
+index 00000000000..0ed75ee8019
 --- /dev/null
 +++ b/third_party/0001-Migrate-from-AddError-to-RecordError.patch
 @@ -0,0 +1,33 @@
@@ -252,7 +252,7 @@ index 00000000..0ed75ee8
 +
 diff --git a/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch
 new file mode 100644
-index 00000000..b5af8d2d
+index 00000000000..b5af8d2dff5
 --- /dev/null
 +++ b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch
 @@ -0,0 +1,52 @@
@@ -309,7 +309,7 @@ index 00000000..b5af8d2d
 +2.34.1
 +
 diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc
-index 4f70c155..ae746f33 100644
+index 167cdd2b891..dc1ebdd10e6 100644
 --- a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc
 +++ b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc
 @@ -33,7 +33,11 @@ absl::StatusOr<std::string> ProtoToHumanReadableJson(
diff --git a/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch
new file mode 100644
index 000000000..4ddfe019f
--- /dev/null
+++ b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch
@@ -0,0 +1,38 @@
+From 4664eb999e860294cbe7f333344fc68af1486d0a Mon Sep 17 00:00:00 2001
+From: "A. Unique TensorFlower" <gardener@tensorflow.org>
+Date: Thu, 14 Nov 2024 15:25:44 -0800
+Subject: [PATCH 28/29] Fix ResolvePadding to be consistent in the size of the
+ small vector
+
+PiperOrigin-RevId: 696670235
+---
+ .../transforms/legalize_hlo_conversions/op_util_common.cc       | 2 +-
+ .../transforms/legalize_hlo_conversions/op_util_common.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc
+index 3d67bbfd123..df67b39d3a6 100644
+--- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc
++++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc
+@@ -68,7 +68,7 @@ llvm::SmallVector<int64_t, 4> ResolveStridesOrDilations(
+   return llvm::SmallVector<int64_t, 4>(attr.getValues<int64_t>());
+ }
+ 
+-llvm::SmallVector<DimPadding, 2> ResolvePadding(
++llvm::SmallVector<DimPadding, 4> ResolvePadding(
+     int64_t rank, std::optional<mlir::DenseIntElementsAttr> opt_padding) {
+   llvm::SmallVector<DimPadding, 4> res;
+   if (!opt_padding.has_value()) {
+diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h
+index 3c2c8ae5ced..b522b41c11e 100644
+--- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h
++++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h
+@@ -127,7 +127,7 @@ llvm::SmallVector<int64_t, 4> ResolveStridesOrDilations(
+ 
+ // Resolves optional paddings attributes. If not present, will return
+ // trivial [0, 0] paddings on each dim.
+-llvm::SmallVector<DimPadding, 2> ResolvePadding(
++llvm::SmallVector<DimPadding, 4> ResolvePadding(
+     int64_t rank, std::optional<mlir::DenseIntElementsAttr> opt_padding);
+ 
+ // Does the padding correspond to "SAME" on given dimension configuration.
diff --git a/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch b/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch
new file mode 100644
index 000000000..b6ec15fdd
--- /dev/null
+++ b/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch
@@ -0,0 +1,21 @@
+From 28f4ade46fa0a8fe3e4678d9e41a26be410e0448 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <h.vetinari@gmx.com>
+Date: Sat, 1 Feb 2025 22:36:18 +1100
+Subject: [PATCH 29/29] set the cpu type for macos target
+
+---
+ .bazelrc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/.bazelrc b/.bazelrc
+index 0d1c0305d97..c048c3e3e2f 100644
+--- a/.bazelrc
++++ b/.bazelrc
+@@ -155,6 +155,7 @@ build:android --define=xnn_enable_avxvnniint8=false
+ 
+ # Sets the default Apple platform to macOS.
+ build:macos --apple_platform_type=macos
++build:macos --cpu=darwin_x86_64
+ 
+ # gRPC on MacOS requires this #define
+ build:macos --copt=-DGRPC_BAZEL_BUILD