[pull] master from tensorflow:master

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,16 @@
+# Copyright 2025 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============================================================================
+
+blank_issues_enabled: false

CONTRIBUTING.md

@@ -250,7 +250,7 @@ There are two ways to run TensorFlow unit tests.
     bazel by doing as follows:
 
     ```bash
-    export flags="--config=opt -k"
+    export flags="--config=linux -k"
     ```
 
     If the tests are to be run on the GPU:
@@ -259,15 +259,15 @@ There are two ways to run TensorFlow unit tests.
         flag.
 
         ```bash
-        export flags="--config=opt --config=cuda -k"
+        export flags="--config=linux --config=cuda -k"
         ```
 
     *   For TensorFlow versions prior v.2.18.0: Add CUDA paths to
         LD_LIBRARY_PATH and add the `cuda` option flag.
 
         ```bash
         export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH"
-        export flags="--config=opt --config=cuda -k"
+        export flags="--config=linux --config=cuda -k"
         ```
 
     For example, to run all tests under tensorflow/python, do:

RELEASE.md

@@ -17,7 +17,7 @@
       while preserving the implementation flexibility to change the values of
       these constants in the future.)
     * Interpreter:
-      * `tf.lite.Interpreter` gives warning of future deletion and a redirection notice to its new location at `ai_edge_litert.interpreter`. See the [migration guide](https://ai.google.dev/edge/litert/migration) for details.
+      * `tf.lite.Interpreter` gives deprecation warning redirecting to its new location at `ai_edge_litert.interpreter`, as the API `tf.lite.Interpreter` will be deleted in TF 2.20. See the [migration guide](https://ai.google.dev/edge/litert/migration) for details.
 
 ### Known Caveats
 

ci/devinfra/docker/windows/Dockerfile

@@ -1,3 +1,7 @@
+# NOTE: This Dockerfile is no longer in use.
+# It is kept just in case, but it's recommended to use the 2022 version,
+# and that is what internal CI uses as well.
+
 # This Dockerfile creates an image that has:
 # - the correct MTU setting for networking from inside the container to work.
 # - Visual Studio 2022 Build Tools
@@ -42,6 +46,7 @@ RUN C:\TEMP\vs_community.exe \
         --add Microsoft.VisualStudio.Workload.NativeDesktop \
         --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.64 \
         --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
+        --add Microsoft.VisualStudio.Component.VC.ATL \
  || IF "%ERRORLEVEL%"=="3010" EXIT 0
 
 SHELL ["powershell.exe", "-ExecutionPolicy", "Bypass", "-Command", \
@@ -152,4 +157,18 @@ RUN (New-Object Net.WebClient).DownloadFile( \
     $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';C:\tools\bazel'; \
     [Environment]::SetEnvironmentVariable('PATH', $env:PATH, 'Machine');
 
+ENV CLOUDSDK_CORE_DISABLE_PROMPTS 1
+RUN (New-Object Net.WebClient).DownloadFile('https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.zip', 'C:\Temp\google-cloud-sdk.zip'); \
+    Expand-Archive -Path 'C:\Temp\google-cloud-sdk.zip' -DestinationPath $env:ProgramFiles -Verbose:$false
+RUN & \"$env:ProgramFiles\\google-cloud-sdk\\install.bat\" --path-update false
+RUN $env:Path += \";$env:ProgramFiles\\google-cloud-sdk\\bin\"; \
+    [Environment]::SetEnvironmentVariable('Path', $env:Path, [EnvironmentVariableTarget]::Machine);
+# Re-enable prompts for interactive use.
+ENV CLOUDSDK_CORE_DISABLE_PROMPTS=""
+
+# MSYS attempts to use non-cmd versions, which aren't meant for Windows
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias gcloud=gcloud.cmd'
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias gsutil=gsutil.cmd'
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias bq=bq.cmd'
+
 SHELL ["cmd.exe", "/s", "/c"]

ci/devinfra/docker/windows2022/Dockerfile

@@ -0,0 +1,207 @@
+# This Dockerfile creates an image that has:
+# - the correct MTU setting for networking from inside the container to work.
+# - Visual Studio 2022 Build Tools
+# - MSVC 14.39
+# - LLVM/Clang 18.1.4
+# - MSYS2 + curl, git, patch, vim, unzip, zip
+# - Python 3.9 - 3.13
+# - Bazelisk 1.22.1
+# - JDK 21 (Azul Zulu)
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
+
+SHELL ["powershell.exe", "-ExecutionPolicy", "Bypass", "-Command", \
+       "$ErrorActionPreference='Stop'; $ProgressPreference='SilentlyContinue';$VerbosePreference = 'Continue';"]
+
+# Enable long paths
+RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
+
+RUN md C:\TEMP
+RUN md C:\TMP
+ENV TMP "C:/TMP"
+ENV TEMP "C:/TEMP"
+
+# Install 7-Zip.
+RUN (New-Object Net.WebClient).DownloadFile('https://www.7-zip.org/a/7z2201-x64.msi', '7z.msi'); \
+    Start-Process msiexec.exe -ArgumentList \"/i 7z.msi /qn /norestart /log C:\\TEMP\\7z_install_log.txt\" -wait; \
+    Remove-Item .\7z.msi;
+
+# Download the Visual Studio 2022 Installer.
+RUN (New-Object Net.WebClient).DownloadFile('https://aka.ms/vs/17/release/vs_community.exe', 'C:\TEMP\vs_community.exe');
+# Install Visual Studio 2022 Build Tools + Compiler
+SHELL ["cmd", "/S", "/C"]
+# Packages, and component versions, can be found here:
+# https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools
+RUN C:\TEMP\vs_community.exe \
+        --quiet --wait --norestart --nocache \
+        --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
+        --add Microsoft.VisualStudio.Workload.NativeDesktop \
+        --add Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.64 \
+        --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
+ || IF "%ERRORLEVEL%"=="3010" EXIT 0
+
+SHELL ["powershell.exe", "-ExecutionPolicy", "Bypass", "-Command", \
+       "$ErrorActionPreference='Stop'; $ProgressPreference='SilentlyContinue'; $VerbosePreference = 'Continue';"]
+
+# Install Clang.
+RUN (New-Object Net.WebClient).DownloadFile( \
+         'https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/LLVM-18.1.4-win64.exe', \
+         'LLVM.exe'); \
+    Start-Process -FilePath \"C:\Program Files\7-Zip\7z.exe\" -ArgumentList 'x LLVM.exe -oC:\tools\LLVM' -Wait; \
+    $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';C:\tools\LLVM\bin'; \
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, 'Machine');
+
+# Install MSYS2.
+RUN (New-Object Net.WebClient).DownloadFile( \
+         'https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20240727.tar.xz', \
+         'msys2.tar.xz'); \
+    Start-Process -FilePath \"C:\Program Files\7-Zip\7z.exe\" -ArgumentList 'x msys2.tar.xz -oC:\TEMP\msys2.tar' -Wait; \
+    Start-Process -FilePath \"C:\Program Files\7-Zip\7z.exe\" -ArgumentList 'x C:\TEMP\msys2.tar -oC:\tools' -Wait; \
+    $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';C:\tools\msys64;C:\tools\msys64\usr\bin\'; \
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, 'Machine');
+
+# Disable signature checking on pacman because we cannot initialize the keyring.
+RUN Add-Content -Path C:\tools\msys64\etc\pacman.d\mirrorlist.mingw32 -Value 'SigLevel = Never'
+RUN Add-Content -Path C:\tools\msys64\etc\pacman.d\mirrorlist.mingw64 -Value 'SigLevel = Never'
+RUN Add-Content -Path C:\tools\msys64\etc\pacman.d\mirrorlist.msys -Value 'SigLevel = Never'
+
+# Install pacman packages.
+RUN C:\tools\msys64\usr\bin\bash.exe -lc \
+  'pacman --noconfirm -Syy curl git patch vim unzip zip'
+
+# Install multiple Pythons, but only add one of them to PATH.
+RUN function Install-Python { \
+        param( \
+            [string]$version, \
+            [int]$prependPath \
+        ) \
+        $url = ('https://www.python.org/ftp/python/{0}/python-{0}-amd64.exe' -f $version); \
+        Write-Host ('Downloading {0}...' -f $url); \
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+        (New-Object Net.WebClient).DownloadFile($url, 'C:\tmp\pyinstall.exe'); \
+        \
+        # Without the patch version \
+        $truncatedVersion = $($version -replace '\.\d+$', ''); \
+        $installDir = 'C:\Python' + $truncatedVersion; \
+        Write-Host ('Installing into {0} (PrependPath: {1})...' -f $installDir, $($prependPath -eq 1)); \
+        $argumentList = ('/quiet InstallAllUsers=1 PrependPath={0} TargetDir={1}' -f $prependPath, $installDir); \
+        Start-Process -FilePath 'C:\tmp\pyinstall.exe' -ArgumentList $argumentList -Wait; \
+        \
+        Write-Host 'Verifying install...'; \
+        Write-Host \"  python --version $version\"; & $installDir\python.exe --version; \
+        \
+        Write-Host 'Verifying pip install...'; \
+        & $installDir\python.exe -m pip --version; \
+        \
+        Write-Host 'Updating pip...'; \
+        & $installDir\python.exe -m pip install --upgrade pip; \
+        \
+        Write-Host 'Installing/updating packages...'; \
+        & $installDir\python.exe -m pip install --upgrade setuptools packaging; \
+        \
+        Write-Host 'Removing installation binary...'; \
+        Remove-Item C:\tmp\pyinstall.exe -Force; \
+    }; \
+    Write-Host 'Installing multiple Python versions...'; \
+    $versions = @( \
+        @{ version = '3.9.13'; prependPath = 0 }, \
+        @{ version = '3.10.11'; prependPath = 0 }, \
+        @{ version = '3.11.9'; prependPath = 0 }, \
+        @{ version = '3.12.8'; prependPath = 0 }, \
+        @{ version = '3.13.1'; prependPath = 1 } \
+    ); \
+    foreach ($v in $versions) { \
+        Install-Python -version $v.version -prependPath $v.prependPath; \
+    }; \
+    Write-Host 'Python installations complete.';
+
+# Add a python3 symlink for the Python in PATH.
+# It's not feasible to add one for each version, as on Windows,
+# Python uses PATH and the binary's (symlink's) location, to launch itself.
+RUN C:\tools\msys64\usr\bin\bash.exe -lc 'ln -s /c/Python3.13/python.exe /usr/bin/python3';
+
+# Install JDK 21.
+RUN \
+  Add-Type -AssemblyName \"System.IO.Compression.FileSystem\"; \
+  $zulu_pkg = \"zulu21.34.19-ca-jdk21.0.3-win_x64.zip\"; \
+  $zulu_url = \"https://cdn.azul.com/zulu/bin/${zulu_pkg}\"; \
+  $zulu_zip = \"c:\\temp\\${zulu_pkg}\"; \
+  $zulu_extracted_path = \"c:\\temp\\\" + [IO.Path]::GetFileNameWithoutExtension($zulu_zip); \
+  $zulu_root = \"c:\\openjdk\"; \
+  (New-Object Net.WebClient).DownloadFile($zulu_url, $zulu_zip); \
+  [System.IO.Compression.ZipFile]::ExtractToDirectory($zulu_zip, \"c:\\temp\"); \
+  Move-Item $zulu_extracted_path -Destination $zulu_root; \
+  Remove-Item $zulu_zip; \
+  $env:PATH = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\") + \";${zulu_root}\\bin\"; \
+  [Environment]::SetEnvironmentVariable(\"PATH\", $env:PATH, \"Machine\"); \
+  $env:JAVA_HOME = $zulu_root; \
+  [Environment]::SetEnvironmentVariable(\"JAVA_HOME\", $env:JAVA_HOME, \"Machine\")
+
+# Point to the LLVM installation.
+# The Bazel Windows guide claims it can find LLVM automatically,
+# but it likely only works if it's installed somewhere inside C:\Program Files.
+ENV BAZEL_LLVM "C:\tools\LLVM"
+
+# These variables may be useful, but so far haven't been. Keeping for posterity.
+# ENV CLANG_COMPILER_PATH "C:\tools\llvm\bin\clang.exe"
+# ENV CC "C:\tools\llvm\bin\clang.exe"
+# ENV BAZEL_COMPILER "C:\tools\llvm\bin\clang.exe"
+
+ENV BAZEL_SH "C:\tools\msys64\usr\bin\bash.exe"
+ENV BAZEL_VS "C:\Program Files\Microsoft Visual Studio\2022\BuildTools"
+ENV BAZEL_VC "C:\Program Files\Microsoft Visual Studio\2022\Community\VC"
+
+# Environment variables to prevent auto-conversion of Linux-like paths to Windows paths.
+# This is necessary as some paths end up invalid/mangled.
+ENV MSYS_NO_PATHCONV 1
+ENV MSYS2_ARG_CONV_EXCL *
+
+# This should only be necessary if there are multiple, differently-versioned
+# MSVC compilers installed, and a particular one should be used.
+# To find exact versions available:
+# - Navigate to the relevant folder, e.g.
+#     C:\Program Files\Microsoft Visual Studio\2022
+# - Search for the `cl.exe` file: `gci -r -fi cl.exe`
+# - The version will be part of the found path, e.g.
+#     2022\Community\VC\Tools\MSVC\14.39.33519\bin\Hostx64\x64
+# ENV BAZEL_VC_FULL_VERSION 14.39.33519
+
+# Install Bazelisk.
+RUN md C:\tools\bazel
+RUN (New-Object Net.WebClient).DownloadFile( \
+         'https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-windows-amd64.exe', \
+         'C:\tools\bazel\bazel.exe'); \
+    $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';C:\tools\bazel'; \
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, 'Machine');
+
+# Install gcloud, and add it to PATH
+ENV CLOUDSDK_CORE_DISABLE_PROMPTS 1
+RUN (New-Object Net.WebClient).DownloadFile('https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.zip', 'C:\Temp\google-cloud-sdk.zip'); \
+    Expand-Archive -Path 'C:\Temp\google-cloud-sdk.zip' -DestinationPath $env:ProgramFiles -Verbose:$false
+RUN & \"$env:ProgramFiles\\google-cloud-sdk\\install.bat\" --path-update false
+RUN $env:Path += \";$env:ProgramFiles\\google-cloud-sdk\\bin\"; \
+    [Environment]::SetEnvironmentVariable('Path', $env:Path, [EnvironmentVariableTarget]::Machine);
+# Re-enable prompts for interactive use.
+ENV CLOUDSDK_CORE_DISABLE_PROMPTS=""
+
+# MSYS attempts to use non-cmd versions, which aren't meant for Windows
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias gcloud=gcloud.cmd'
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias gsutil=gsutil.cmd'
+RUN Add-Content -Path C:\tools\msys64\.bashrc -Value 'alias bq=bq.cmd'
+
+# Symlink a directory, to have it pretend be the T:\ drive.
+# This drive letter is used by internal CI,
+# and part of it is mounted to the container during the container's creation.
+#
+# While the mount argument (`-v host_path:container_path`) still requires
+# `container_path` to be a legitimate C:\ path, in this case, 'C:\drive_t',
+# this symlink does allow for the convenience of passing unedited paths
+# to `docker exec` commands, e.g., 'T:\path', instead of 'C:\path',
+# without having to replace the drive letter with C:\ every time.
+# Such a workaround is not required on Linux, since it
+# can create arbitrary paths within the container, e.g., '/t'.
+# Note: This does not affect/work for `docker cp` commands.
+RUN New-Item -ItemType directory -Path C:\drive_t; \
+    New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices' -Name 'T:'  -Value '\??\C:\drive_t' -PropertyType String;
+
+CMD ["bash", "-i"]

ci/official/any.sh

@@ -36,7 +36,7 @@
 #       export TF_ANY_EXTRA_ENV=ci/official/envs/local_rbe
 #       ./any.sh
 #       ...
-set -euxo pipefail
+set -exo pipefail
 cd "$(dirname "$0")/../../"  # tensorflow/
 # Any request that includes "nightly_upload" should just use the
 # local multi-cache (public read-only cache + disk cache) instead.

ci/official/bisect.sh

@@ -32,7 +32,7 @@
 #   export TF_BISECT_BAD=a_failing_commit_sha
 #   export TF_ANY_TARGETS="quoted list of targets, like on the command line"
 #   export TF_ANY_MODE=test
-set -euxo pipefail
+set -exo pipefail
 cd "$(dirname "$0")/../../"  # tensorflow/
 export TFCI="$(echo $TFCI | sed 's/,nightly_upload/,public_cache,disk_cache/')"
 git bisect start "$TF_BISECT_BAD" "$TF_BISECT_GOOD"

ci/official/containers/linux_arm64/Dockerfile

@@ -75,6 +75,8 @@ RUN /setup.python.sh python3.10 devel.requirements.txt
 RUN /setup.python.sh python3.11 devel.requirements.txt
 RUN /setup.python.sh python3.12 devel.requirements.txt
 RUN /setup.python.sh python3.13 devel.requirements.txt
+# python3.13-nogil is a free-threaded build of python3.13
+RUN /setup.python.sh python3.13-nogil devel.requirements.txt
 
 FROM devel as tf
 # Setup TF Python environment.

ci/official/containers/linux_arm64/devel.usertools/rename_and_verify_wheels.sh

@@ -17,7 +17,7 @@
 
 # Check and rename wheels with auditwheel. Inserts the platform tags like
 # "manylinux_xyz" into the wheel filename.
-set -euxo pipefail
+set -exo pipefail
 
 for wheel in /tf/pkg/*.whl; do
   echo "Checking and renaming $wheel..."

ci/official/containers/linux_arm64/devel.usertools/setup_venv_test.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-set -euxo pipefail
+set -exo pipefail
 
 # Run this from inside the tensorflow github directory.
 # Usage: setup_venv_test.sh venv_and_symlink_name "glob pattern for one wheel file"

ci/official/containers/linux_arm64/setup.python.sh

@@ -25,11 +25,9 @@ REQUIREMENTS=$2
 
 add-apt-repository ppa:deadsnakes/ppa
 # Install Python packages for this container's version
-if [[ ${VERSION} == "python3.13" ]]; then
+if [[ ${VERSION} == "python3.13-nogil" ]]; then
   cat >pythons.txt <<EOF
 $VERSION
-$VERSION-dev
-$VERSION-venv
 EOF
 else
   cat >pythons.txt <<EOF

ci/official/containers/ml_build/Dockerfile

@@ -1,5 +1,8 @@
 ################################################################################
-FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe AS devel
+ARG BASE_IMAGE=ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe
+FROM $BASE_IMAGE AS devel
+# See https://docs.docker.com/reference/dockerfile/#understand-how-arg-and-from-interact
+# on why we cannot reference BASE_IMAGE again unless we declare it again.
 ################################################################################
 
 # Install devtoolset build dependencies
@@ -20,15 +23,15 @@ RUN /build_devtoolset.sh devtoolset-9 /dt9
 # Setup Python
 COPY setup.python.sh /setup.python.sh
 COPY builder.requirements.txt /builder.requirements.txt
-RUN /setup.python.sh python3.9 builder.requirements.txt
-RUN /setup.python.sh python3.10 builder.requirements.txt
-RUN /setup.python.sh python3.11 builder.requirements.txt
-RUN /setup.python.sh python3.13 builder.requirements.txt
+RUN /setup.python.sh python3.9 /builder.requirements.txt
+RUN /setup.python.sh python3.10 /builder.requirements.txt
+RUN /setup.python.sh python3.11 /builder.requirements.txt
+RUN /setup.python.sh python3.13 /builder.requirements.txt
 
 # Since we are using python3.12 as the default python version, we need to
 # install python3.12 last for now.
 # TODO(b/376338367): switch to pyenv.
-RUN /setup.python.sh python3.12 builder.requirements.txt
+RUN /setup.python.sh python3.12 /builder.requirements.txt
 
 # Setup links for TensorFlow to compile.
 # Referenced in devel.usertools/*.bazelrc.
@@ -41,6 +44,9 @@ RUN ln -sf /usr/lib/python3.12 /usr/lib/tf_python
 # Make sure clang is on the path
 RUN ln -s /usr/lib/llvm-18/bin/clang /usr/bin/clang
 
+# Link the compat driver to the location if available.
+RUN if [ -e "/usr/local/cuda/compat/libcuda.so.1" ]; then ln -s /usr/local/cuda/compat/libcuda.so.1 /usr/lib/x86_64-linux-gnu/libcuda.so.1; fi
+
 # Install various tools.
 # - bats: bash unit testing framework
 # - bazelisk: always use the correct bazel version