diff --git a/.bazelrc b/.bazelrc index a1286bf2b58ec3..79be2f7eeeedfa 100644 --- a/.bazelrc +++ b/.bazelrc @@ -324,6 +324,13 @@ build:windows --features=archive_param_file build:windows --copt=/d2ReducedOptimizeHugeFunctions build:windows --host_copt=/d2ReducedOptimizeHugeFunctions +# Enable the runfiles symlink tree on Windows. This makes it possible to build +# the pip package on Windows without an intermediate data-file archive, as the +# build_pip_package script in its current form (as of Aug 2023) uses the +# runfiles symlink tree to decide what to put into the Python wheel. +startup:windows --windows_enable_symlinks +build:windows --enable_runfiles + # Default paths for TF_SYSTEM_LIBS build:linux --define=PREFIX=/usr build:linux --define=LIBDIR=$(PREFIX)/lib diff --git a/RELEASE.md b/RELEASE.md index 0dafd9dec8efe1..97160bb1f50166 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,11 +1,11 @@ # Release 2.14.0 - +## Tensorflow -# Breaking Changes +### Breaking Changes -* -* +* Support for Python 3.8 has been removed starting with TF 2.14. The TensorFlow + 2.13.1 patch release will still have Python 3.8 support. * `tf.Tensor` * The class hierarchy for `tf.Tensor` has changed, and there are now @@ -25,11 +25,8 @@ * `tf.estimator` API will be removed in the next release. TF Estimator Python package will no longer be released. -# Known Caveats +### Known Caveats -* -* -* * `tf.lite` * when converter flag "_experimenal_use_buffer_offset" is enabled, additional metadata is automatically excluded from the generated model. @@ -37,14 +34,14 @@ * If the model is larger than 2GB, then we also require "exclude_conversion_metadata" flag to be set -# Major Features and Improvements +### Major Features and Improvements -* -* -* `tf.keras` - * `Model.compile` now support `steps_per_execution='auto'` as a parameter, - allowing automatic tuning of steps per execution during `Model.fit`, - `Model.predict`, and `Model.evaluate` for a significant performance boost. +* The `tensorflow` pip package has a new, optional installation method for + Linux that installs necessary Nvidia CUDA libraries through pip. As long as + the Nvidia driver is already installed on the system, you may now run `pip + install tensorflow[and-cuda]` to install TensorFlow's Nvidia CUDA library + dependencies in the Python environment. Aside from the Nvidia driver, no + other pre-existing Nvidia CUDA packages are necessary. * Enable JIT-compiled i64-indexed kernels on GPU for large tensors with more than 2**32 elements. @@ -57,7 +54,7 @@ * Add experimental supports conversion of models that may be larger than 2GB before buffer deduplication -# Bug Fixes and Other Changes +### Bug Fixes and Other Changes * `tf.py_function` and `tf.numpy_function` can now be used as function decorators for clearer code: @@ -71,10 +68,6 @@ * `tf.lite` * Strided_Slice now supports `UINT32`. -* -* -* - * `tf.config.experimental.enable_tensor_float_32_execution` * Disabling TensorFloat-32 execution now causes TPUs to use float32 precision for float32 matmuls and other ops. TPUs have always used @@ -112,11 +105,22 @@ nest_util code examples](https://github.com/tensorflow/tensorflow/blob/04869b4e63bfc03cb13627b3e1b879fdd0f69e34/tensorflow/python/util/nest_util.py#L97) for an example. +## Keras + +Keras is a framework built on top of the TensorFlow. See more details on the Keras [website](https://keras.io/). + +### Major Features and Improvements + +* `tf.keras` + * `Model.compile` now support `steps_per_execution='auto'` as a parameter, + allowing automatic tuning of steps per execution during `Model.fit`, + `Model.predict`, and `Model.evaluate` for a significant performance boost. + # Thanks to our Contributors This release contains contributions from many people at Google, as well as: -, , , , , +Aakar Dwivedi, Adrian Popescu, ag.ramesh, Akhil Goel, Albert Zeyer, Alex Rosen, Alexey Vishnyakov, Andrew Goodbody, angerson, Ashiq Imran, Ayan Moitra, Ben Barsdell, Bhavani Subramanian, Boian Petkantchin, BrianWieder, Chris Mc, cloudhan, Connor Flanagan, Daniel Lang, Daniel Yudelevich, Darya Parygina, David Korczynski, David Svantesson, dingyuqing05, Dragan Mladjenovic, dskkato, Eli Kobrin, Erick Ochoa, Erik Schultheis, Frédéric Bastien, gaikwadrahul8, Gauri1 Deshpande, guozhong.zhuang, H. Vetinari, Isaac Cilia Attard, Jake Hall, Jason Furmanek, Jerry Ge, Jinzhe Zeng, JJ, johnnkp, Jonathan Albrecht, jongkweh, justkw, Kanvi Khanna, kikoxia, Koan-Sin Tan, Kun-Lu, ltsai1, Lu Teng, luliyucoordinate, Mahmoud Abuzaina, mdfaijul, Milos Puzovic, Nathan Luehr, Om Thakkar, pateldeev, Peng Sun, Philipp Hack, pjpratik, Poliorcetics, rahulbatra85, rangjiaheng, Renato Arantes, Robert Kalmar, roho, Rylan Justice, Sachin Muradi, samypr100, Saoirse Stewart, Shanbin Ke, Shivam Mishra, shuw, Song Ziming, Stephan Hartmann, Sulav, sushreebarsa, T Coxon, Tai Ly, talyz, Thibaut Goetghebuer-Planchon, Thomas Preud'Homme, tilakrayal, Tirumalesh, Tj Xu, Tom Allsop, Trevor Morris, Varghese, Jojimon, Wen Chen, Yaohui Liu, Yimei Sun, Zhoulong Jiang, Zhoulong, Jiang # Release 2.13.0 diff --git a/ci/devinfra/docker_windows/Dockerfile b/ci/devinfra/docker_windows/Dockerfile new file mode 100644 index 00000000000000..8d70ccf7611d0a --- /dev/null +++ b/ci/devinfra/docker_windows/Dockerfile @@ -0,0 +1,256 @@ +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 + +# Set default powershell policy for this script (ProgressPreference='SilentlyContinue' makes +# downloads with Invoke-WebRequest not show the progress bar and is MUCH faster). +SHELL ["powershell.exe", "-ExecutionPolicy", "Bypass", "-Command", "$ErrorActionPreference='Stop'; $ProgressPreference='SilentlyContinue'; $VerbosePreference = 'Continue';"] + +# Workaround for networking (b/112379377) was closed as won't fix for MTU setting. +# Remaining lines handle making the metadata server on the VM accessible inside docker. +RUN Get-NetAdapter | Where-Object Name -like "*Ethernet*" | ForEach-Object { \ + & netsh interface ipv4 set subinterface $_.InterfaceIndex mtu=1460 store=persistent }; \ + $gateway = (Get-NetRoute | Where { $_.DestinationPrefix -eq \"0.0.0.0/0\" } | Sort-Object RouteMetric \ + | Select NextHop).NextHop; \ + $ifIndex = (Get-NetAdapter -InterfaceDescription \"Hyper-V Virtual Ethernet*\" | Sort-Object \ + | Select ifIndex).ifIndex; \ + New-NetRoute -DestinationPrefix 169.254.169.254/32 -InterfaceIndex $ifIndex -NextHop $gateway + +# Enable Long Paths for Win32 File/Folder APIs. +RUN New-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem \ + -Name LongPathsEnabled -Value 1 -PropertyType DWORD -Force + +# Install Visual C++ Redistributable for Visual Studio 2015-2022. +RUN New-Item -Path "C:/" -Name "TEMP" -ItemType "directory"; \ + Invoke-WebRequest "https://aka.ms/vs/17/release/vc_redist.x64.exe" \ + -OutFile C:/TEMP/vc_redist.x64.exe -UseBasicParsing; \ + Start-Process -filepath C:/TEMP/vc_redist.x64.exe -ArgumentList '/install', '/passive', '/norestart' -Wait; \ + Remove-Item C:/TEMP/vc_redist.x64.exe + +# Install Visual Studio 2022 Build Tools. Install ManagedDesktopBuildTools separately to ensure all Optional workloads are installed too. +RUN Invoke-WebRequest "https://aka.ms/vs/17/release/vs_buildtools.exe" \ + -OutFile C:/TEMP/vs_buildtools.exe -UseBasicParsing; \ + Start-Process -FilePath C:/TEMP/vs_buildtools.exe -ArgumentList "--installPath", "C:/VS", \ + "--quiet", "--wait", "--nocache", \ + "--add", "Microsoft.VisualStudio.Workload.VCTools", \ + "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", \ + "--add", "Microsoft.VisualStudio.Component.Windows10SDK.19041" -Wait; \ + Start-Process -FilePath C:/TEMP/vs_buildtools.exe -ArgumentList "--installPath", "C:/VS", \ + "--quiet", "--wait", "--nocache", "--includeOptional", \ + "--add", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools" -Wait; \ + Remove-Item C:/TEMP/vs_buildtools.exe; \ + [Environment]::SetEnvironmentVariable(\"BAZEL_VC\", \"C:\VS\VC\", \"Machine\"); \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\VS\VC\Tools\MSVC\14.33.31629\bin\Hostx64\x64;C:\VS\Common7\Tools;C:\VS\MSBuild\Current\Bin\", \"Machine\"); + +# Add signtool.exe to the PATH. Note this path may need to be edited if updates +# are made to the Windows 10 SDK. +RUN $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\Program Files (x86)\Windows Kits\10\App Certification Kit\", \"Machine\"); + +# Install WiX toolset (v4) - Necessary for MSI Installer/Signing builds +RUN dotnet tool install --global wix + +# Install msys2, packages and add to path. +RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ + Invoke-WebRequest "https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20220319.sfx.exe" \ + -OutFile msys2_install.exe -UseBasicParsing; \ + .\msys2_install.exe -y -oC:\; \ + Remove-Item msys2_install.exe; \ + function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \ + msys ' '; \ + msys 'pacman --noconfirm -Syy bsdcpio bsdtar bzip2'; \ + msys 'pacman --noconfirm -Syy coreutils curl dash file filesystem findutils'; \ + msys 'pacman --noconfirm -Syy flex gawk gcc-libs grep gzip inetutils info'; \ + msys 'pacman --noconfirm -Syy less lndir mintty ncurses pactoys-git patch'; \ + msys 'pacman --noconfirm -Syy pax-git pkgfile rebase sed tar tftp-hpa time tzcode util-linux which'; \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\msys64;C:\msys64\usr\bin\", \"Machine\"); + +# Install Go 1.19.1 +RUN Invoke-WebRequest "https://go.dev/dl/go1.19.1.windows-amd64.msi" \ + -OutFile C:/TEMP/go_install.msi -UseBasicParsing; \ + Start-Process C:/TEMP/go_install.msi -ArgumentList "/quiet", "/log", "C:/TEMP/go_install_log.txt", \ + "InstallAllUsers=1", "PrependPath=1" -wait; \ + Remove-Item C:/TEMP/go_install.msi; \ + Remove-Item C:/TEMP/go_install_log.txt + +# Install Python 3. +RUN Invoke-WebRequest "https://www.python.org/ftp/python/3.10.4/python-3.10.4-amd64.exe" \ + -OutFile C:/TEMP/python_install.exe -UseBasicParsing; \ + Start-Process C:/TEMP/python_install.exe -ArgumentList "/quiet", "/log", "C:/TEMP/python_install_log.txt", \ + "InstallAllUsers=1", "PrependPath=1" -wait; \ + Remove-Item C:/TEMP/python_install.exe; \ + Remove-Item C:/TEMP/python_install_log.txt + +# Install JDK 17 +RUN Add-Type -AssemblyName "System.IO.Compression.FileSystem"; \ + $zulu_url = \"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip\"; \ + $zulu_zip = \"c:/temp/jdk_install.zip\"; \ + $zulu_extracted_path = \"c:/temp/\" + [IO.Path]::GetFileNameWithoutExtension($zulu_url); \ + $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; \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";${zulu_root}\bin\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"JAVA_HOME\", $zulu_root, \"Machine\") + +# Install gcloud (install.bat installs directly into bin folder of extracted zip contents) +# Install needed gcloud components +RUN Add-Type -AssemblyName "System.IO.Compression.FileSystem"; \ + $pkg_url = \"https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-396.0.0-windows-x86_64.zip\"; \ + $pkg_zip = \"c:/temp/gcloud.zip\"; \ + $pkg_extracted_path = \"c:/google-cloud-sdk\"; \ + (New-Object Net.WebClient).DownloadFile($pkg_url, $pkg_zip); \ + [System.IO.Compression.ZipFile]::ExtractToDirectory($pkg_zip, \"c:/\"); \ + Start-Process cmd.exe -ArgumentList "/c", "/s", "$pkg_extracted_path/install.bat", "-q" -wait; \ + Remove-Item $pkg_zip; \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";${pkg_extracted_path}\bin\", \"Machine\"); \ + $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine'); \ + gcloud components install docker-credential-gcr kubectl gsutil; + +# Install cygwin and packages +# Running a seperate ps1 file since when running inside a Dockerfile, it does +# not work. +COPY install/install_cygwin.ps1 c:/ +RUN c:/install_cygwin.ps1; \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\Cygwin64\bin\", \"Machine\"); +RUN Remove-Item c:/install_cygwin.ps1 + +# Install Chocolatey and packages +RUN Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); \ + $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine'); \ + choco feature enable -n allowGlobalConfirmation; \ + choco install 7zip; \ + choco install 7zip.install; \ + choco install 7zip.portable; \ + choco install anaconda2 --version 5.0.1; \ + choco install anaconda3 --version 5.0.1; \ + choco install android-sdk --version 25.2.3.1; \ + choco install AndroidStudio --version 3.0.1.0; \ + choco install ant --version 1.10.1; \ + choco install ccleaner; \ + choco install chocolatey; \ + choco install chocolatey-core.extension; \ + choco install chocolatey-visualstudio.extension; \ + choco install chocolatey-windowsupdate.extension; \ + choco install cmake.install; \ + choco install dotnetcore-sdk; \ + choco install git; \ + choco install git.install; \ + choco install GoogleChrome; \ + choco install gradle --version 4.4.1; \ + choco install jdk8; \ + choco install KB2533623; \ + choco install KB2919355; \ + choco install KB2919442; \ + choco install KB2999226; \ + choco install KB3033929; \ + choco install KB3035131; \ + choco install maven; \ + choco install ninja; \ + choco install nodejs --version 9.3.0; \ + choco install nodejs.install --version 9.3.0; \ + choco install nuget.commandline; \ + choco install openjdk11; \ + choco install peazip; \ + choco install peazip.install; \ + choco install peazip.portable; \ + choco install php --version 7.2.0; \ + choco install protoc --version 3.2.0; \ + choco install ruby --version 2.5.0.1; \ + choco install swig --version 3.0.9; \ + choco install sysinternals; \ + choco install unrar; \ + choco install unzip; \ + choco install vcredist140; \ + choco install vcredist2015; \ + choco install vim; \ + choco install winrar; \ + choco install zip; \ + choco install Firefox; \ + choco install iisexpress; + +RUN cmd /c 'mklink /J c:\Anaconda c:\tools\anaconda2'; +RUN cmd /c 'mklink c:\programdata\chocolatey\bin\rar.exe \"c:\program files\winrar\rar.exe\"'; + +# Installing pip packages +RUN pip install --upgrade setuptools; \ + pip install altgraph appdirs cachetools certifi cffi chardet colorama \ + cryptography cycler Cython decorator google-api-python-client \ + google-auth google-auth-httplib2 grpcio httplib2 idna ipython-genutils \ + kiwisolver macholib matplotlib nose numpy packaging pandas pickleshare pip \ + prompt-toolkit protobuf psutil pyasn1 pyasn1-modules pycparser Pygments \ + pyparsing pyreadline python-dateutil pytz pywin32 requests rsa setuptools \ + simplegeneric six Tempita traitlets uritemplate urllib3 virtualenv wcwidth \ + wheel win-unicode-console; + +# Hardcoding Android license since I did not find any solution on accepting it +# through the docker build command. If the licensing agreement changes, this +# will need to be updated as well. +RUN New-Item -ItemType Directory -Path C:\Android\android-sdk\licenses; \ + Set-Content -Path .\Android\android-sdk\licenses\android-sdk-license -Value "`n24333f8a63b6825ea9c5514f83c2829b004d1fee" -NoNewLine; + +# Add sdkmanager to PATH +RUN $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\Android\android-sdk\tools\bin\", \"Machine\"); + +# Install android packages +RUN $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine'); \ + New-Item C:\Users\ContainerAdministrator\.android\repositories.cfg; \ + sdkmanager 'ndk-bundle'; \ + sdkmanager 'platforms;android-33'; \ + sdkmanager 'add-ons;addon-google_apis-google-24'; \ + sdkmanager 'cmake;3.10.2.4988404'; \ + sdkmanager 'cmake;3.18.1'; \ + sdkmanager 'cmake;3.22.1'; \ + sdkmanager 'cmake;3.6.4111459'; \ + sdkmanager 'emulator'; \ + sdkmanager 'system-images;android-27;google_apis;x86'; \ + sdkmanager 'sources;android-27'; \ + sdkmanager 'extras;google;Android_Emulator_Hypervisor_Driver'; \ + sdkmanager 'extras;google;auto'; \ + sdkmanager 'extras;google;google_play_services'; \ + sdkmanager 'extras;google;instantapps'; \ + sdkmanager 'extras;google;m2repository'; \ + sdkmanager 'extras;google;market_apk_expansion'; \ + sdkmanager 'extras;google;market_licensing'; \ + sdkmanager 'extras;google;simulators'; \ + sdkmanager 'extras;google;usb_driver'; \ + sdkmanager 'extras;google;webdriver'; \ + sdkmanager 'extras;android;m2repository'; \ + sdkmanager 'extras;intel;Hardware_Accelerated_Execution_Manager'; \ + sdkmanager 'extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0'; \ + sdkmanager 'extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2'; \ + sdkmanager 'patcher;v4'; \ + sdkmanager 'ndk;25.1.8937393'; \ + sdkmanager 'build-tools;27.0.3'; + +# Install Scoop and packages +RUN iex \"& {$(irm get.scoop.sh)} -RunAsAdmin\"; \ + scoop install perl; \ + scoop install bazel; \ + scoop install cuda; \ + scoop install azure-functions-core-tools; \ + scoop install azure-cli; + +# Setting environment variables +RUN [Environment]::SetEnvironmentVariable('CYGWIN', 'winsymlinks:native', 'Machine'); \ + [Environment]::SetEnvironmentVariable('HOME', 'C:\Users\ContainerAdministrator\', 'Machine'); \ + [Environment]::SetEnvironmentVariable('HOMEDRIVE', 'C:', 'Machine'); \ + [Environment]::SetEnvironmentVariable('HOMEPATH', '\Users\ContainerAdministrator\', 'Machine'); \ + [Environment]::SetEnvironmentVariable('GOROOT', 'C:\Program Files\Go\', 'Machine'); \ + [Environment]::SetEnvironmentVariable('KOKORO_POSIX_ROOT', '/tmpfs', 'Machine'); \ + [Environment]::SetEnvironmentVariable('KOKORO_ROOT', 'T:\', 'Machine'); \ + [Environment]::SetEnvironmentVariable('SHELL', '/bin/bash', 'Machine'); \ + $old_path = [Environment]::GetEnvironmentVariable(\"PATH\", \"Machine\"); \ + [Environment]::SetEnvironmentVariable(\"PATH\", $old_path + \";C:\Program Files\CMake\bin\", \"Machine\"); + + +# Restore default shell for Windows containers. +SHELL ["cmd.exe", "/s", "/c"] + +# Default to PowerShell if no other command specified. +CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"] diff --git a/ci/official/requirements_updater/requirements.in b/ci/official/requirements_updater/requirements.in index 61b1506d12e535..2010284db13bc5 100644 --- a/ci/official/requirements_updater/requirements.in +++ b/ci/official/requirements_updater/requirements.in @@ -9,9 +9,9 @@ lit ~= 16.0.5.post0 # Note that here we want the latest version that matches TF major.minor version # Note that we must use nightly here as these are used in nightly jobs # For release jobs, we will pin these on the release branch -keras-nightly ~= 2.14.0.dev -tb-nightly ~= 2.14.0.a -tf-estimator-nightly ~= 2.14.0.dev +keras ~= 2.14.0rc0 +tensorboard ~= 2.14.0 +tensorflow-estimator ~= 2.14.0rc0 # Test dependencies grpcio >= 1.24.3, < 2.0 @@ -20,4 +20,4 @@ scipy == 1.10.1 requests == 2.31.0 packaging==23.1 setuptools==67.6.1 -jax==0.4.7 \ No newline at end of file +jax==0.4.7 diff --git a/requirements_lock_3_10.txt b/requirements_lock_3_10.txt index 94f2bedffe31b8..9181d971e18e71 100644 --- a/requirements_lock_3_10.txt +++ b/requirements_lock_3_10.txt @@ -1,7 +1,7 @@ absl-py==1.4.0 \ --hash=sha256:0d3fe606adfa4f7db64792dd4c7aee4ee0c38ab75dfd353b7a83ed3e957fcb47 \ --hash=sha256:d2c244d01048ba476e7c080bd2c6df5e141d211de80223460d5b3b8a2a58433d - # via tb-nightly + # via tensorboard cachetools==5.3.1 \ --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b @@ -92,60 +92,60 @@ google-auth==2.22.0 \ --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873 # via # google-auth-oauthlib - # tb-nightly + # tensorboard google-auth-oauthlib==1.0.0 \ --hash=sha256:95880ca704928c300f48194d1770cf5b1462835b6e49db61445a520f793fd5fb \ --hash=sha256:e375064964820b47221a7e1b7ee1fd77051b6323c3f9e3e19785f78ab67ecfc5 - # via tb-nightly -grpcio==1.56.2 \ - --hash=sha256:06e84ad9ae7668a109e970c7411e7992751a116494cba7c4fb877656527f9a57 \ - --hash=sha256:0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa \ - --hash=sha256:10954662f77dc36c9a1fb5cc4a537f746580d6b5734803be1e587252682cda8d \ - --hash=sha256:139f66656a762572ae718fa0d1f2dce47c05e9fbf7a16acd704c354405b97df9 \ - --hash=sha256:1c31e52a04e62c8577a7bf772b3e7bed4df9c9e0dd90f92b6ffa07c16cab63c9 \ - --hash=sha256:33971197c47965cc1d97d78d842163c283e998223b151bab0499b951fd2c0b12 \ - --hash=sha256:345356b307cce5d14355e8e055b4ca5f99bc857c33a3dc1ddbc544fca9cd0475 \ - --hash=sha256:373b48f210f43327a41e397391715cd11cfce9ded2fe76a5068f9bacf91cc226 \ - --hash=sha256:3ccb621749a81dc7755243665a70ce45536ec413ef5818e013fe8dfbf5aa497b \ - --hash=sha256:42a3bbb2bc07aef72a7d97e71aabecaf3e4eb616d39e5211e2cfe3689de860ca \ - --hash=sha256:42e63904ee37ae46aa23de50dac8b145b3596f43598fa33fe1098ab2cbda6ff5 \ - --hash=sha256:4eb37dd8dd1aa40d601212afa27ca5be255ba792e2e0b24d67b8af5e012cdb7d \ - --hash=sha256:51173e8fa6d9a2d85c14426bdee5f5c4a0654fd5fddcc21fe9d09ab0f6eb8b35 \ - --hash=sha256:5144feb20fe76e73e60c7d73ec3bf54f320247d1ebe737d10672480371878b48 \ - --hash=sha256:5344be476ac37eb9c9ad09c22f4ea193c1316bf074f1daf85bddb1b31fda5116 \ - --hash=sha256:6108e5933eb8c22cd3646e72d5b54772c29f57482fd4c41a0640aab99eb5071d \ - --hash=sha256:6a007a541dff984264981fbafeb052bfe361db63578948d857907df9488d8774 \ - --hash=sha256:6ee26e9dfb3996aff7c870f09dc7ad44a5f6732b8bdb5a5f9905737ac6fd4ef1 \ - --hash=sha256:750de923b456ca8c0f1354d6befca45d1f3b3a789e76efc16741bd4132752d95 \ - --hash=sha256:7c5ede2e2558f088c49a1ddda19080e4c23fb5d171de80a726b61b567e3766ed \ - --hash=sha256:830215173ad45d670140ff99aac3b461f9be9a6b11bee1a17265aaaa746a641a \ - --hash=sha256:8391cea5ce72f4a12368afd17799474015d5d3dc00c936a907eb7c7eaaea98a5 \ - --hash=sha256:8940d6de7068af018dfa9a959a3510e9b7b543f4c405e88463a1cbaa3b2b379a \ - --hash=sha256:89a49cc5ad08a38b6141af17e00d1dd482dc927c7605bc77af457b5a0fca807c \ - --hash=sha256:900bc0096c2ca2d53f2e5cebf98293a7c32f532c4aeb926345e9747452233950 \ - --hash=sha256:97e0efaebbfd222bcaac2f1735c010c1d3b167112d9d237daebbeedaaccf3d1d \ - --hash=sha256:9e04d4e4cfafa7c5264e535b5d28e786f0571bea609c3f0aaab13e891e933e9c \ - --hash=sha256:a4c60abd950d6de3e4f1ddbc318075654d275c29c846ab6a043d6ed2c52e4c8c \ - --hash=sha256:a6ff459dac39541e6a2763a4439c4ca6bc9ecb4acc05a99b79246751f9894756 \ - --hash=sha256:a72797549935c9e0b9bc1def1768c8b5a709538fa6ab0678e671aec47ebfd55e \ - --hash=sha256:af4063ef2b11b96d949dccbc5a987272f38d55c23c4c01841ea65a517906397f \ - --hash=sha256:b975b85d1d5efc36cf8b237c5f3849b64d1ba33d6282f5e991f28751317504a1 \ - --hash=sha256:bf0b9959e673505ee5869950642428046edb91f99942607c2ecf635f8a4b31c9 \ - --hash=sha256:c0c85c5cbe8b30a32fa6d802588d55ffabf720e985abe9590c7c886919d875d4 \ - --hash=sha256:c3f3237a57e42f79f1e560726576aedb3a7ef931f4e3accb84ebf6acc485d316 \ - --hash=sha256:c3fa3ab0fb200a2c66493828ed06ccd1a94b12eddbfb985e7fd3e5723ff156c6 \ - --hash=sha256:c435f5ce1705de48e08fcbcfaf8aee660d199c90536e3e06f2016af7d6a938dd \ - --hash=sha256:c90da4b124647547a68cf2f197174ada30c7bb9523cb976665dfd26a9963d328 \ - --hash=sha256:cbdf2c498e077282cd427cfd88bdce4668019791deef0be8155385ab2ba7837f \ - --hash=sha256:d1fbad1f9077372b6587ec589c1fc120b417b6c8ad72d3e3cc86bbbd0a3cee93 \ - --hash=sha256:d39f5d4af48c138cb146763eda14eb7d8b3ccbbec9fe86fb724cd16e0e914c64 \ - --hash=sha256:ddb4a6061933bd9332b74eac0da25f17f32afa7145a33a0f9711ad74f924b1b8 \ - --hash=sha256:ded637176addc1d3eef35331c39acc598bac550d213f0a1bedabfceaa2244c87 \ - --hash=sha256:f20fd21f7538f8107451156dd1fe203300b79a9ddceba1ee0ac8132521a008ed \ - --hash=sha256:fda2783c12f553cdca11c08e5af6eecbd717280dc8fbe28a110897af1c15a88c + # via tensorboard +grpcio==1.57.0 \ + --hash=sha256:00258cbe3f5188629828363ae8ff78477ce976a6f63fb2bb5e90088396faa82e \ + --hash=sha256:092fa155b945015754bdf988be47793c377b52b88d546e45c6a9f9579ac7f7b6 \ + --hash=sha256:0f80bf37f09e1caba6a8063e56e2b87fa335add314cf2b78ebf7cb45aa7e3d06 \ + --hash=sha256:20ec6fc4ad47d1b6e12deec5045ec3cd5402d9a1597f738263e98f490fe07056 \ + --hash=sha256:2313b124e475aa9017a9844bdc5eafb2d5abdda9d456af16fc4535408c7d6da6 \ + --hash=sha256:23e7d8849a0e58b806253fd206ac105b328171e01b8f18c7d5922274958cc87e \ + --hash=sha256:2f708a6a17868ad8bf586598bee69abded4996b18adf26fd2d91191383b79019 \ + --hash=sha256:2f7349786da979a94690cc5c2b804cab4e8774a3cf59be40d037c4342c906649 \ + --hash=sha256:34950353539e7d93f61c6796a007c705d663f3be41166358e3d88c45760c7d98 \ + --hash=sha256:40b72effd4c789de94ce1be2b5f88d7b9b5f7379fe9645f198854112a6567d9a \ + --hash=sha256:4b089f7ad1eb00a104078bab8015b0ed0ebcb3b589e527ab009c53893fd4e613 \ + --hash=sha256:4faea2cfdf762a664ab90589b66f416274887641ae17817de510b8178356bf73 \ + --hash=sha256:5371bcd861e679d63b8274f73ac281751d34bd54eccdbfcd6aa00e692a82cd7b \ + --hash=sha256:5613a2fecc82f95d6c51d15b9a72705553aa0d7c932fad7aed7afb51dc982ee5 \ + --hash=sha256:57b183e8b252825c4dd29114d6c13559be95387aafc10a7be645462a0fc98bbb \ + --hash=sha256:5b7a4ce8f862fe32b2a10b57752cf3169f5fe2915acfe7e6a1e155db3da99e79 \ + --hash=sha256:5e5b58e32ae14658085c16986d11e99abd002ddbf51c8daae8a0671fffb3467f \ + --hash=sha256:60fe15288a0a65d5c1cb5b4a62b1850d07336e3ba728257a810317be14f0c527 \ + --hash=sha256:6907b1cf8bb29b058081d2aad677b15757a44ef2d4d8d9130271d2ad5e33efca \ + --hash=sha256:76c44efa4ede1f42a9d5b2fed1fe9377e73a109bef8675fb0728eb80b0b8e8f2 \ + --hash=sha256:7a635589201b18510ff988161b7b573f50c6a48fae9cb567657920ca82022b37 \ + --hash=sha256:7b400807fa749a9eb286e2cd893e501b110b4d356a218426cb9c825a0474ca56 \ + --hash=sha256:82640e57fb86ea1d71ea9ab54f7e942502cf98a429a200b2e743d8672171734f \ + --hash=sha256:871f9999e0211f9551f368612460442a5436d9444606184652117d6a688c9f51 \ + --hash=sha256:9338bacf172e942e62e5889b6364e56657fbf8ac68062e8b25c48843e7b202bb \ + --hash=sha256:a8a8e560e8dbbdf29288872e91efd22af71e88b0e5736b0daf7773c1fecd99f0 \ + --hash=sha256:aed90d93b731929e742967e236f842a4a2174dc5db077c8f9ad2c5996f89f63e \ + --hash=sha256:b363bbb5253e5f9c23d8a0a034dfdf1b7c9e7f12e602fc788c435171e96daccc \ + --hash=sha256:b4098b6b638d9e0ca839a81656a2fd4bc26c9486ea707e8b1437d6f9d61c3941 \ + --hash=sha256:b53333627283e7241fcc217323f225c37783b5f0472316edcaa4479a213abfa6 \ + --hash=sha256:b670c2faa92124b7397b42303e4d8eb64a4cd0b7a77e35a9e865a55d61c57ef9 \ + --hash=sha256:bb396952cfa7ad2f01061fbc7dc1ad91dd9d69243bcb8110cf4e36924785a0fe \ + --hash=sha256:c60b83c43faeb6d0a9831f0351d7787a0753f5087cc6fa218d78fdf38e5acef0 \ + --hash=sha256:c6ebecfb7a31385393203eb04ed8b6a08f5002f53df3d59e5e795edb80999652 \ + --hash=sha256:d78d8b86fcdfa1e4c21f8896614b6cc7ee01a2a758ec0c4382d662f2a62cf766 \ + --hash=sha256:d7f8df114d6b4cf5a916b98389aeaf1e3132035420a88beea4e3d977e5f267a5 \ + --hash=sha256:e1cb52fa2d67d7f7fab310b600f22ce1ff04d562d46e9e0ac3e3403c2bb4cc16 \ + --hash=sha256:e3fdf04e402f12e1de8074458549337febb3b45f21076cc02ef4ff786aff687e \ + --hash=sha256:e503cb45ed12b924b5b988ba9576dc9949b2f5283b8e33b21dcb6be74a7c58d0 \ + --hash=sha256:f19ac6ac0a256cf77d3cc926ef0b4e64a9725cc612f97228cd5dc4bd9dbab03b \ + --hash=sha256:f1fb0fd4a1e9b11ac21c30c169d169ef434c6e9344ee0ab27cfa6f605f6387b2 \ + --hash=sha256:fada6b07ec4f0befe05218181f4b85176f11d531911b64c715d1875c4736d73a \ + --hash=sha256:fd173b4cf02b20f60860dc2ffe30115c18972d7d6d2d69df97ac38dee03be5bf \ + --hash=sha256:fe752639919aad9ffb0dee0d87f29a6467d1ef764f13c4644d212a9a853a078d \ + --hash=sha256:fee387d2fab144e8a34e0e9c5ca0f45c9376b99de45628265cfa9886b1dbe62b # via # -r ./requirements.in - # tb-nightly + # tensorboard h5py==3.9.0 \ --hash=sha256:12aa556d540f11a2cae53ea7cfb94017353bd271fb3962e1296b342f6550d1b8 \ --hash=sha256:23e74b878bbe1653ab34ca49b83cac85529cd0b36b9d625516c5830cc5ca2eac \ @@ -176,17 +176,17 @@ idna==3.4 \ jax==0.4.7 \ --hash=sha256:5e7002d74db25f97c99b979d4ba1233b1ef26e1597e5fc468ad11d1c8a9dc4f8 # via -r ./requirements.in -keras-nightly==2.14.0.dev2023072507 \ - --hash=sha256:78f8f218f78a7ee9af4e740bbd4a3ef1bbe1b34e206ae6b6245b38e0461a9109 \ - --hash=sha256:aae547bca76ae23f07b434e064803aace8999a8b6042121bacd5868c51f11025 +keras==2.14.0rc0 \ + --hash=sha256:56dc53aad890ea6c585150ce69e8e6f263ee1b34ab5c3a1ff10865cfa5150317 \ + --hash=sha256:b53f050ce66351db41cca57cfaa3dec7bee7feb4f45f83a763934701f8b27bda # via -r ./requirements.in lit==16.0.6 \ --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a # via -r ./requirements.in -markdown==3.4.3 \ - --hash=sha256:065fd4df22da73a625f14890dd77eb8040edcbd68794bcd35943be14490608b2 \ - --hash=sha256:8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520 - # via tb-nightly +markdown==3.4.4 \ + --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \ + --hash=sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941 + # via tensorboard markupsafe==2.1.3 \ --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ @@ -294,7 +294,7 @@ numpy==1.23.5 \ # ml-dtypes # opt-einsum # scipy - # tb-nightly + # tensorboard oauthlib==3.2.2 \ --hash=sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca \ --hash=sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 @@ -311,21 +311,21 @@ portpicker==1.5.2 \ --hash=sha256:01113f51c3cc63290a44dd7ae6e3eb9f8fe1b8a1f9d7988a897944230c39cd52 \ --hash=sha256:c55683ad725f5c00a41bc7db0225223e8be024b1fa564d039ed3390e4fd48fb3 # via -r ./requirements.in -protobuf==4.23.4 \ - --hash=sha256:0a5759f5696895de8cc913f084e27fd4125e8fb0914bb729a17816a33819f474 \ - --hash=sha256:351cc90f7d10839c480aeb9b870a211e322bf05f6ab3f55fcb2f51331f80a7d2 \ - --hash=sha256:5fea3c64d41ea5ecf5697b83e41d09b9589e6f20b677ab3c48e5f242d9b7897b \ - --hash=sha256:6dd9b9940e3f17077e820b75851126615ee38643c2c5332aa7a359988820c720 \ - --hash=sha256:7b19b6266d92ca6a2a87effa88ecc4af73ebc5cfde194dc737cf8ef23a9a3b12 \ - --hash=sha256:8547bf44fe8cec3c69e3042f5c4fb3e36eb2a7a013bb0a44c018fc1e427aafbd \ - --hash=sha256:9053df6df8e5a76c84339ee4a9f5a2661ceee4a0dab019e8663c50ba324208b0 \ - --hash=sha256:c3e0939433c40796ca4cfc0fac08af50b00eb66a40bbbc5dee711998fb0bbc1e \ - --hash=sha256:ccd9430c0719dce806b93f89c91de7977304729e55377f872a92465d548329a9 \ - --hash=sha256:e1c915778d8ced71e26fcf43c0866d7499891bca14c4368448a82edc61fdbc70 \ - --hash=sha256:e9d0be5bf34b275b9f87ba7407796556abeeba635455d036c7351f7c183ef8ff \ - --hash=sha256:effeac51ab79332d44fba74660d40ae79985901ac21bca408f8dc335a81aa597 \ - --hash=sha256:fee88269a090ada09ca63551bf2f573eb2424035bcf2cb1b121895b01a46594a - # via tb-nightly +protobuf==4.24.2 \ + --hash=sha256:237b9a50bd3b7307d0d834c1b0eb1a6cd47d3f4c2da840802cd03ea288ae8880 \ + --hash=sha256:25ae91d21e3ce8d874211110c2f7edd6384816fb44e06b2867afe35139e1fd1c \ + --hash=sha256:2b23bd6e06445699b12f525f3e92a916f2dcf45ffba441026357dea7fa46f42b \ + --hash=sha256:3b7b170d3491ceed33f723bbf2d5a260f8a4e23843799a3906f16ef736ef251e \ + --hash=sha256:4e69965e7e54de4db989289a9b971a099e626f6167a9351e9d112221fc691bc1 \ + --hash=sha256:58e12d2c1aa428ece2281cef09bbaa6938b083bcda606db3da4e02e991a0d924 \ + --hash=sha256:6bd26c1fa9038b26c5c044ee77e0ecb18463e957fefbaeb81a3feb419313a54e \ + --hash=sha256:77700b55ba41144fc64828e02afb41901b42497b8217b558e4a001f18a85f2e3 \ + --hash=sha256:7fda70797ddec31ddfa3576cbdcc3ddbb6b3078b737a1a87ab9136af0570cd6e \ + --hash=sha256:839952e759fc40b5d46be319a265cf94920174d88de31657d5622b5d8d6be5cd \ + --hash=sha256:bb7aa97c252279da65584af0456f802bd4b2de429eb945bbc9b3d61a42a8cd16 \ + --hash=sha256:c00c3c7eb9ad3833806e21e86dca448f46035242a680f81c3fe068ff65e79c74 \ + --hash=sha256:c5cdd486af081bf752225b26809d2d0a85e575b80a84cde5172a05bbb1990099 + # via tensorboard psutil==5.9.5 \ --hash=sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d \ --hash=sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217 \ @@ -358,7 +358,7 @@ requests==2.31.0 \ # via # -r ./requirements.in # requests-oauthlib - # tb-nightly + # tensorboard requests-oauthlib==1.3.1 \ --hash=sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5 \ --hash=sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a @@ -397,21 +397,21 @@ setuptools==67.6.1 \ --hash=sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078 # via # -r ./requirements.in - # tb-nightly + # tensorboard six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via google-auth -tb-nightly==2.14.0a20230725 \ - --hash=sha256:a0717250191893ec909066564acbc8c92329041a984cf9e407d301fc3ebf3f3e +tensorboard==2.14.0 \ + --hash=sha256:3667f9745d99280836ad673022362c840f60ed8fefd5a3e30bf071f5a8fd0017 # via -r ./requirements.in tensorboard-data-server==0.7.1 \ --hash=sha256:255c02b7f5b03dd5c0a88c928e563441ff39e1d4b4a234cdbe09f016e53d9594 \ --hash=sha256:9938bd39f5041797b33921066fba0eab03a0dd10d1887a05e62ae58841ad4c3f \ --hash=sha256:be8d016a1aa394e6198280d4a3dc37898f56467310c5f5e617cac10a783e055a - # via tb-nightly -tf-estimator-nightly==2.14.0.dev2023072508 \ - --hash=sha256:6e810e250d6d13732f3dbd28e8649cbc0eab7cbc35d4154d08b19b749e53a275 + # via tensorboard +tensorflow-estimator==2.14.0rc0 \ + --hash=sha256:98d7bcf84e17a0ebc2f3d07c4e2a59a6ac3ad9a6e7ed9270f67b6cc3c11b4eaf # via -r ./requirements.in urllib3==1.26.16 \ --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ @@ -419,13 +419,13 @@ urllib3==1.26.16 \ # via # google-auth # requests -werkzeug==2.3.6 \ - --hash=sha256:935539fa1413afbb9195b24880778422ed620c0fc09670945185cce4d91a8890 \ - --hash=sha256:98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330 - # via tb-nightly +werkzeug==2.3.7 \ + --hash=sha256:2b8c0e447b4b9dbcc85dd97b6eeb4dcbaf6c8b6c3be0bd654e25553e0a2157d8 \ + --hash=sha256:effc12dba7f3bd72e605ce49807bbe692bd729c3bb122a3b91747a6ae77df528 + # via tensorboard wheel==0.38.4 \ --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 # via # -r ./requirements.in - # tb-nightly + # tensorboard diff --git a/requirements_lock_3_11.txt b/requirements_lock_3_11.txt index 94f2bedffe31b8..9181d971e18e71 100644 --- a/requirements_lock_3_11.txt +++ b/requirements_lock_3_11.txt @@ -1,7 +1,7 @@ absl-py==1.4.0 \ --hash=sha256:0d3fe606adfa4f7db64792dd4c7aee4ee0c38ab75dfd353b7a83ed3e957fcb47 \ --hash=sha256:d2c244d01048ba476e7c080bd2c6df5e141d211de80223460d5b3b8a2a58433d - # via tb-nightly + # via tensorboard cachetools==5.3.1 \ --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b @@ -92,60 +92,60 @@ google-auth==2.22.0 \ --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873 # via # google-auth-oauthlib - # tb-nightly + # tensorboard google-auth-oauthlib==1.0.0 \ --hash=sha256:95880ca704928c300f48194d1770cf5b1462835b6e49db61445a520f793fd5fb \ --hash=sha256:e375064964820b47221a7e1b7ee1fd77051b6323c3f9e3e19785f78ab67ecfc5 - # via tb-nightly -grpcio==1.56.2 \ - --hash=sha256:06e84ad9ae7668a109e970c7411e7992751a116494cba7c4fb877656527f9a57 \ - --hash=sha256:0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa \ - --hash=sha256:10954662f77dc36c9a1fb5cc4a537f746580d6b5734803be1e587252682cda8d \ - --hash=sha256:139f66656a762572ae718fa0d1f2dce47c05e9fbf7a16acd704c354405b97df9 \ - --hash=sha256:1c31e52a04e62c8577a7bf772b3e7bed4df9c9e0dd90f92b6ffa07c16cab63c9 \ - --hash=sha256:33971197c47965cc1d97d78d842163c283e998223b151bab0499b951fd2c0b12 \ - --hash=sha256:345356b307cce5d14355e8e055b4ca5f99bc857c33a3dc1ddbc544fca9cd0475 \ - --hash=sha256:373b48f210f43327a41e397391715cd11cfce9ded2fe76a5068f9bacf91cc226 \ - --hash=sha256:3ccb621749a81dc7755243665a70ce45536ec413ef5818e013fe8dfbf5aa497b \ - --hash=sha256:42a3bbb2bc07aef72a7d97e71aabecaf3e4eb616d39e5211e2cfe3689de860ca \ - --hash=sha256:42e63904ee37ae46aa23de50dac8b145b3596f43598fa33fe1098ab2cbda6ff5 \ - --hash=sha256:4eb37dd8dd1aa40d601212afa27ca5be255ba792e2e0b24d67b8af5e012cdb7d \ - --hash=sha256:51173e8fa6d9a2d85c14426bdee5f5c4a0654fd5fddcc21fe9d09ab0f6eb8b35 \ - --hash=sha256:5144feb20fe76e73e60c7d73ec3bf54f320247d1ebe737d10672480371878b48 \ - --hash=sha256:5344be476ac37eb9c9ad09c22f4ea193c1316bf074f1daf85bddb1b31fda5116 \ - --hash=sha256:6108e5933eb8c22cd3646e72d5b54772c29f57482fd4c41a0640aab99eb5071d \ - --hash=sha256:6a007a541dff984264981fbafeb052bfe361db63578948d857907df9488d8774 \ - --hash=sha256:6ee26e9dfb3996aff7c870f09dc7ad44a5f6732b8bdb5a5f9905737ac6fd4ef1 \ - --hash=sha256:750de923b456ca8c0f1354d6befca45d1f3b3a789e76efc16741bd4132752d95 \ - --hash=sha256:7c5ede2e2558f088c49a1ddda19080e4c23fb5d171de80a726b61b567e3766ed \ - --hash=sha256:830215173ad45d670140ff99aac3b461f9be9a6b11bee1a17265aaaa746a641a \ - --hash=sha256:8391cea5ce72f4a12368afd17799474015d5d3dc00c936a907eb7c7eaaea98a5 \ - --hash=sha256:8940d6de7068af018dfa9a959a3510e9b7b543f4c405e88463a1cbaa3b2b379a \ - --hash=sha256:89a49cc5ad08a38b6141af17e00d1dd482dc927c7605bc77af457b5a0fca807c \ - --hash=sha256:900bc0096c2ca2d53f2e5cebf98293a7c32f532c4aeb926345e9747452233950 \ - --hash=sha256:97e0efaebbfd222bcaac2f1735c010c1d3b167112d9d237daebbeedaaccf3d1d \ - --hash=sha256:9e04d4e4cfafa7c5264e535b5d28e786f0571bea609c3f0aaab13e891e933e9c \ - --hash=sha256:a4c60abd950d6de3e4f1ddbc318075654d275c29c846ab6a043d6ed2c52e4c8c \ - --hash=sha256:a6ff459dac39541e6a2763a4439c4ca6bc9ecb4acc05a99b79246751f9894756 \ - --hash=sha256:a72797549935c9e0b9bc1def1768c8b5a709538fa6ab0678e671aec47ebfd55e \ - --hash=sha256:af4063ef2b11b96d949dccbc5a987272f38d55c23c4c01841ea65a517906397f \ - --hash=sha256:b975b85d1d5efc36cf8b237c5f3849b64d1ba33d6282f5e991f28751317504a1 \ - --hash=sha256:bf0b9959e673505ee5869950642428046edb91f99942607c2ecf635f8a4b31c9 \ - --hash=sha256:c0c85c5cbe8b30a32fa6d802588d55ffabf720e985abe9590c7c886919d875d4 \ - --hash=sha256:c3f3237a57e42f79f1e560726576aedb3a7ef931f4e3accb84ebf6acc485d316 \ - --hash=sha256:c3fa3ab0fb200a2c66493828ed06ccd1a94b12eddbfb985e7fd3e5723ff156c6 \ - --hash=sha256:c435f5ce1705de48e08fcbcfaf8aee660d199c90536e3e06f2016af7d6a938dd \ - --hash=sha256:c90da4b124647547a68cf2f197174ada30c7bb9523cb976665dfd26a9963d328 \ - --hash=sha256:cbdf2c498e077282cd427cfd88bdce4668019791deef0be8155385ab2ba7837f \ - --hash=sha256:d1fbad1f9077372b6587ec589c1fc120b417b6c8ad72d3e3cc86bbbd0a3cee93 \ - --hash=sha256:d39f5d4af48c138cb146763eda14eb7d8b3ccbbec9fe86fb724cd16e0e914c64 \ - --hash=sha256:ddb4a6061933bd9332b74eac0da25f17f32afa7145a33a0f9711ad74f924b1b8 \ - --hash=sha256:ded637176addc1d3eef35331c39acc598bac550d213f0a1bedabfceaa2244c87 \ - --hash=sha256:f20fd21f7538f8107451156dd1fe203300b79a9ddceba1ee0ac8132521a008ed \ - --hash=sha256:fda2783c12f553cdca11c08e5af6eecbd717280dc8fbe28a110897af1c15a88c + # via tensorboard +grpcio==1.57.0 \ + --hash=sha256:00258cbe3f5188629828363ae8ff78477ce976a6f63fb2bb5e90088396faa82e \ + --hash=sha256:092fa155b945015754bdf988be47793c377b52b88d546e45c6a9f9579ac7f7b6 \ + --hash=sha256:0f80bf37f09e1caba6a8063e56e2b87fa335add314cf2b78ebf7cb45aa7e3d06 \ + --hash=sha256:20ec6fc4ad47d1b6e12deec5045ec3cd5402d9a1597f738263e98f490fe07056 \ + --hash=sha256:2313b124e475aa9017a9844bdc5eafb2d5abdda9d456af16fc4535408c7d6da6 \ + --hash=sha256:23e7d8849a0e58b806253fd206ac105b328171e01b8f18c7d5922274958cc87e \ + --hash=sha256:2f708a6a17868ad8bf586598bee69abded4996b18adf26fd2d91191383b79019 \ + --hash=sha256:2f7349786da979a94690cc5c2b804cab4e8774a3cf59be40d037c4342c906649 \ + --hash=sha256:34950353539e7d93f61c6796a007c705d663f3be41166358e3d88c45760c7d98 \ + --hash=sha256:40b72effd4c789de94ce1be2b5f88d7b9b5f7379fe9645f198854112a6567d9a \ + --hash=sha256:4b089f7ad1eb00a104078bab8015b0ed0ebcb3b589e527ab009c53893fd4e613 \ + --hash=sha256:4faea2cfdf762a664ab90589b66f416274887641ae17817de510b8178356bf73 \ + --hash=sha256:5371bcd861e679d63b8274f73ac281751d34bd54eccdbfcd6aa00e692a82cd7b \ + --hash=sha256:5613a2fecc82f95d6c51d15b9a72705553aa0d7c932fad7aed7afb51dc982ee5 \ + --hash=sha256:57b183e8b252825c4dd29114d6c13559be95387aafc10a7be645462a0fc98bbb \ + --hash=sha256:5b7a4ce8f862fe32b2a10b57752cf3169f5fe2915acfe7e6a1e155db3da99e79 \ + --hash=sha256:5e5b58e32ae14658085c16986d11e99abd002ddbf51c8daae8a0671fffb3467f \ + --hash=sha256:60fe15288a0a65d5c1cb5b4a62b1850d07336e3ba728257a810317be14f0c527 \ + --hash=sha256:6907b1cf8bb29b058081d2aad677b15757a44ef2d4d8d9130271d2ad5e33efca \ + --hash=sha256:76c44efa4ede1f42a9d5b2fed1fe9377e73a109bef8675fb0728eb80b0b8e8f2 \ + --hash=sha256:7a635589201b18510ff988161b7b573f50c6a48fae9cb567657920ca82022b37 \ + --hash=sha256:7b400807fa749a9eb286e2cd893e501b110b4d356a218426cb9c825a0474ca56 \ + --hash=sha256:82640e57fb86ea1d71ea9ab54f7e942502cf98a429a200b2e743d8672171734f \ + --hash=sha256:871f9999e0211f9551f368612460442a5436d9444606184652117d6a688c9f51 \ + --hash=sha256:9338bacf172e942e62e5889b6364e56657fbf8ac68062e8b25c48843e7b202bb \ + --hash=sha256:a8a8e560e8dbbdf29288872e91efd22af71e88b0e5736b0daf7773c1fecd99f0 \ + --hash=sha256:aed90d93b731929e742967e236f842a4a2174dc5db077c8f9ad2c5996f89f63e \ + --hash=sha256:b363bbb5253e5f9c23d8a0a034dfdf1b7c9e7f12e602fc788c435171e96daccc \ + --hash=sha256:b4098b6b638d9e0ca839a81656a2fd4bc26c9486ea707e8b1437d6f9d61c3941 \ + --hash=sha256:b53333627283e7241fcc217323f225c37783b5f0472316edcaa4479a213abfa6 \ + --hash=sha256:b670c2faa92124b7397b42303e4d8eb64a4cd0b7a77e35a9e865a55d61c57ef9 \ + --hash=sha256:bb396952cfa7ad2f01061fbc7dc1ad91dd9d69243bcb8110cf4e36924785a0fe \ + --hash=sha256:c60b83c43faeb6d0a9831f0351d7787a0753f5087cc6fa218d78fdf38e5acef0 \ + --hash=sha256:c6ebecfb7a31385393203eb04ed8b6a08f5002f53df3d59e5e795edb80999652 \ + --hash=sha256:d78d8b86fcdfa1e4c21f8896614b6cc7ee01a2a758ec0c4382d662f2a62cf766 \ + --hash=sha256:d7f8df114d6b4cf5a916b98389aeaf1e3132035420a88beea4e3d977e5f267a5 \ + --hash=sha256:e1cb52fa2d67d7f7fab310b600f22ce1ff04d562d46e9e0ac3e3403c2bb4cc16 \ + --hash=sha256:e3fdf04e402f12e1de8074458549337febb3b45f21076cc02ef4ff786aff687e \ + --hash=sha256:e503cb45ed12b924b5b988ba9576dc9949b2f5283b8e33b21dcb6be74a7c58d0 \ + --hash=sha256:f19ac6ac0a256cf77d3cc926ef0b4e64a9725cc612f97228cd5dc4bd9dbab03b \ + --hash=sha256:f1fb0fd4a1e9b11ac21c30c169d169ef434c6e9344ee0ab27cfa6f605f6387b2 \ + --hash=sha256:fada6b07ec4f0befe05218181f4b85176f11d531911b64c715d1875c4736d73a \ + --hash=sha256:fd173b4cf02b20f60860dc2ffe30115c18972d7d6d2d69df97ac38dee03be5bf \ + --hash=sha256:fe752639919aad9ffb0dee0d87f29a6467d1ef764f13c4644d212a9a853a078d \ + --hash=sha256:fee387d2fab144e8a34e0e9c5ca0f45c9376b99de45628265cfa9886b1dbe62b # via # -r ./requirements.in - # tb-nightly + # tensorboard h5py==3.9.0 \ --hash=sha256:12aa556d540f11a2cae53ea7cfb94017353bd271fb3962e1296b342f6550d1b8 \ --hash=sha256:23e74b878bbe1653ab34ca49b83cac85529cd0b36b9d625516c5830cc5ca2eac \ @@ -176,17 +176,17 @@ idna==3.4 \ jax==0.4.7 \ --hash=sha256:5e7002d74db25f97c99b979d4ba1233b1ef26e1597e5fc468ad11d1c8a9dc4f8 # via -r ./requirements.in -keras-nightly==2.14.0.dev2023072507 \ - --hash=sha256:78f8f218f78a7ee9af4e740bbd4a3ef1bbe1b34e206ae6b6245b38e0461a9109 \ - --hash=sha256:aae547bca76ae23f07b434e064803aace8999a8b6042121bacd5868c51f11025 +keras==2.14.0rc0 \ + --hash=sha256:56dc53aad890ea6c585150ce69e8e6f263ee1b34ab5c3a1ff10865cfa5150317 \ + --hash=sha256:b53f050ce66351db41cca57cfaa3dec7bee7feb4f45f83a763934701f8b27bda # via -r ./requirements.in lit==16.0.6 \ --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a # via -r ./requirements.in -markdown==3.4.3 \ - --hash=sha256:065fd4df22da73a625f14890dd77eb8040edcbd68794bcd35943be14490608b2 \ - --hash=sha256:8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520 - # via tb-nightly +markdown==3.4.4 \ + --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \ + --hash=sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941 + # via tensorboard markupsafe==2.1.3 \ --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ @@ -294,7 +294,7 @@ numpy==1.23.5 \ # ml-dtypes # opt-einsum # scipy - # tb-nightly + # tensorboard oauthlib==3.2.2 \ --hash=sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca \ --hash=sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 @@ -311,21 +311,21 @@ portpicker==1.5.2 \ --hash=sha256:01113f51c3cc63290a44dd7ae6e3eb9f8fe1b8a1f9d7988a897944230c39cd52 \ --hash=sha256:c55683ad725f5c00a41bc7db0225223e8be024b1fa564d039ed3390e4fd48fb3 # via -r ./requirements.in -protobuf==4.23.4 \ - --hash=sha256:0a5759f5696895de8cc913f084e27fd4125e8fb0914bb729a17816a33819f474 \ - --hash=sha256:351cc90f7d10839c480aeb9b870a211e322bf05f6ab3f55fcb2f51331f80a7d2 \ - --hash=sha256:5fea3c64d41ea5ecf5697b83e41d09b9589e6f20b677ab3c48e5f242d9b7897b \ - --hash=sha256:6dd9b9940e3f17077e820b75851126615ee38643c2c5332aa7a359988820c720 \ - --hash=sha256:7b19b6266d92ca6a2a87effa88ecc4af73ebc5cfde194dc737cf8ef23a9a3b12 \ - --hash=sha256:8547bf44fe8cec3c69e3042f5c4fb3e36eb2a7a013bb0a44c018fc1e427aafbd \ - --hash=sha256:9053df6df8e5a76c84339ee4a9f5a2661ceee4a0dab019e8663c50ba324208b0 \ - --hash=sha256:c3e0939433c40796ca4cfc0fac08af50b00eb66a40bbbc5dee711998fb0bbc1e \ - --hash=sha256:ccd9430c0719dce806b93f89c91de7977304729e55377f872a92465d548329a9 \ - --hash=sha256:e1c915778d8ced71e26fcf43c0866d7499891bca14c4368448a82edc61fdbc70 \ - --hash=sha256:e9d0be5bf34b275b9f87ba7407796556abeeba635455d036c7351f7c183ef8ff \ - --hash=sha256:effeac51ab79332d44fba74660d40ae79985901ac21bca408f8dc335a81aa597 \ - --hash=sha256:fee88269a090ada09ca63551bf2f573eb2424035bcf2cb1b121895b01a46594a - # via tb-nightly +protobuf==4.24.2 \ + --hash=sha256:237b9a50bd3b7307d0d834c1b0eb1a6cd47d3f4c2da840802cd03ea288ae8880 \ + --hash=sha256:25ae91d21e3ce8d874211110c2f7edd6384816fb44e06b2867afe35139e1fd1c \ + --hash=sha256:2b23bd6e06445699b12f525f3e92a916f2dcf45ffba441026357dea7fa46f42b \ + --hash=sha256:3b7b170d3491ceed33f723bbf2d5a260f8a4e23843799a3906f16ef736ef251e \ + --hash=sha256:4e69965e7e54de4db989289a9b971a099e626f6167a9351e9d112221fc691bc1 \ + --hash=sha256:58e12d2c1aa428ece2281cef09bbaa6938b083bcda606db3da4e02e991a0d924 \ + --hash=sha256:6bd26c1fa9038b26c5c044ee77e0ecb18463e957fefbaeb81a3feb419313a54e \ + --hash=sha256:77700b55ba41144fc64828e02afb41901b42497b8217b558e4a001f18a85f2e3 \ + --hash=sha256:7fda70797ddec31ddfa3576cbdcc3ddbb6b3078b737a1a87ab9136af0570cd6e \ + --hash=sha256:839952e759fc40b5d46be319a265cf94920174d88de31657d5622b5d8d6be5cd \ + --hash=sha256:bb7aa97c252279da65584af0456f802bd4b2de429eb945bbc9b3d61a42a8cd16 \ + --hash=sha256:c00c3c7eb9ad3833806e21e86dca448f46035242a680f81c3fe068ff65e79c74 \ + --hash=sha256:c5cdd486af081bf752225b26809d2d0a85e575b80a84cde5172a05bbb1990099 + # via tensorboard psutil==5.9.5 \ --hash=sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d \ --hash=sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217 \ @@ -358,7 +358,7 @@ requests==2.31.0 \ # via # -r ./requirements.in # requests-oauthlib - # tb-nightly + # tensorboard requests-oauthlib==1.3.1 \ --hash=sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5 \ --hash=sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a @@ -397,21 +397,21 @@ setuptools==67.6.1 \ --hash=sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078 # via # -r ./requirements.in - # tb-nightly + # tensorboard six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via google-auth -tb-nightly==2.14.0a20230725 \ - --hash=sha256:a0717250191893ec909066564acbc8c92329041a984cf9e407d301fc3ebf3f3e +tensorboard==2.14.0 \ + --hash=sha256:3667f9745d99280836ad673022362c840f60ed8fefd5a3e30bf071f5a8fd0017 # via -r ./requirements.in tensorboard-data-server==0.7.1 \ --hash=sha256:255c02b7f5b03dd5c0a88c928e563441ff39e1d4b4a234cdbe09f016e53d9594 \ --hash=sha256:9938bd39f5041797b33921066fba0eab03a0dd10d1887a05e62ae58841ad4c3f \ --hash=sha256:be8d016a1aa394e6198280d4a3dc37898f56467310c5f5e617cac10a783e055a - # via tb-nightly -tf-estimator-nightly==2.14.0.dev2023072508 \ - --hash=sha256:6e810e250d6d13732f3dbd28e8649cbc0eab7cbc35d4154d08b19b749e53a275 + # via tensorboard +tensorflow-estimator==2.14.0rc0 \ + --hash=sha256:98d7bcf84e17a0ebc2f3d07c4e2a59a6ac3ad9a6e7ed9270f67b6cc3c11b4eaf # via -r ./requirements.in urllib3==1.26.16 \ --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ @@ -419,13 +419,13 @@ urllib3==1.26.16 \ # via # google-auth # requests -werkzeug==2.3.6 \ - --hash=sha256:935539fa1413afbb9195b24880778422ed620c0fc09670945185cce4d91a8890 \ - --hash=sha256:98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330 - # via tb-nightly +werkzeug==2.3.7 \ + --hash=sha256:2b8c0e447b4b9dbcc85dd97b6eeb4dcbaf6c8b6c3be0bd654e25553e0a2157d8 \ + --hash=sha256:effc12dba7f3bd72e605ce49807bbe692bd729c3bb122a3b91747a6ae77df528 + # via tensorboard wheel==0.38.4 \ --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 # via # -r ./requirements.in - # tb-nightly + # tensorboard diff --git a/requirements_lock_3_9.txt b/requirements_lock_3_9.txt index c0aa9293971d9f..086201246d3980 100644 --- a/requirements_lock_3_9.txt +++ b/requirements_lock_3_9.txt @@ -1,7 +1,7 @@ absl-py==1.4.0 \ --hash=sha256:0d3fe606adfa4f7db64792dd4c7aee4ee0c38ab75dfd353b7a83ed3e957fcb47 \ --hash=sha256:d2c244d01048ba476e7c080bd2c6df5e141d211de80223460d5b3b8a2a58433d - # via tb-nightly + # via tensorboard cachetools==5.3.1 \ --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b @@ -92,60 +92,60 @@ google-auth==2.22.0 \ --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873 # via # google-auth-oauthlib - # tb-nightly + # tensorboard google-auth-oauthlib==1.0.0 \ --hash=sha256:95880ca704928c300f48194d1770cf5b1462835b6e49db61445a520f793fd5fb \ --hash=sha256:e375064964820b47221a7e1b7ee1fd77051b6323c3f9e3e19785f78ab67ecfc5 - # via tb-nightly -grpcio==1.56.2 \ - --hash=sha256:06e84ad9ae7668a109e970c7411e7992751a116494cba7c4fb877656527f9a57 \ - --hash=sha256:0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa \ - --hash=sha256:10954662f77dc36c9a1fb5cc4a537f746580d6b5734803be1e587252682cda8d \ - --hash=sha256:139f66656a762572ae718fa0d1f2dce47c05e9fbf7a16acd704c354405b97df9 \ - --hash=sha256:1c31e52a04e62c8577a7bf772b3e7bed4df9c9e0dd90f92b6ffa07c16cab63c9 \ - --hash=sha256:33971197c47965cc1d97d78d842163c283e998223b151bab0499b951fd2c0b12 \ - --hash=sha256:345356b307cce5d14355e8e055b4ca5f99bc857c33a3dc1ddbc544fca9cd0475 \ - --hash=sha256:373b48f210f43327a41e397391715cd11cfce9ded2fe76a5068f9bacf91cc226 \ - --hash=sha256:3ccb621749a81dc7755243665a70ce45536ec413ef5818e013fe8dfbf5aa497b \ - --hash=sha256:42a3bbb2bc07aef72a7d97e71aabecaf3e4eb616d39e5211e2cfe3689de860ca \ - --hash=sha256:42e63904ee37ae46aa23de50dac8b145b3596f43598fa33fe1098ab2cbda6ff5 \ - --hash=sha256:4eb37dd8dd1aa40d601212afa27ca5be255ba792e2e0b24d67b8af5e012cdb7d \ - --hash=sha256:51173e8fa6d9a2d85c14426bdee5f5c4a0654fd5fddcc21fe9d09ab0f6eb8b35 \ - --hash=sha256:5144feb20fe76e73e60c7d73ec3bf54f320247d1ebe737d10672480371878b48 \ - --hash=sha256:5344be476ac37eb9c9ad09c22f4ea193c1316bf074f1daf85bddb1b31fda5116 \ - --hash=sha256:6108e5933eb8c22cd3646e72d5b54772c29f57482fd4c41a0640aab99eb5071d \ - --hash=sha256:6a007a541dff984264981fbafeb052bfe361db63578948d857907df9488d8774 \ - --hash=sha256:6ee26e9dfb3996aff7c870f09dc7ad44a5f6732b8bdb5a5f9905737ac6fd4ef1 \ - --hash=sha256:750de923b456ca8c0f1354d6befca45d1f3b3a789e76efc16741bd4132752d95 \ - --hash=sha256:7c5ede2e2558f088c49a1ddda19080e4c23fb5d171de80a726b61b567e3766ed \ - --hash=sha256:830215173ad45d670140ff99aac3b461f9be9a6b11bee1a17265aaaa746a641a \ - --hash=sha256:8391cea5ce72f4a12368afd17799474015d5d3dc00c936a907eb7c7eaaea98a5 \ - --hash=sha256:8940d6de7068af018dfa9a959a3510e9b7b543f4c405e88463a1cbaa3b2b379a \ - --hash=sha256:89a49cc5ad08a38b6141af17e00d1dd482dc927c7605bc77af457b5a0fca807c \ - --hash=sha256:900bc0096c2ca2d53f2e5cebf98293a7c32f532c4aeb926345e9747452233950 \ - --hash=sha256:97e0efaebbfd222bcaac2f1735c010c1d3b167112d9d237daebbeedaaccf3d1d \ - --hash=sha256:9e04d4e4cfafa7c5264e535b5d28e786f0571bea609c3f0aaab13e891e933e9c \ - --hash=sha256:a4c60abd950d6de3e4f1ddbc318075654d275c29c846ab6a043d6ed2c52e4c8c \ - --hash=sha256:a6ff459dac39541e6a2763a4439c4ca6bc9ecb4acc05a99b79246751f9894756 \ - --hash=sha256:a72797549935c9e0b9bc1def1768c8b5a709538fa6ab0678e671aec47ebfd55e \ - --hash=sha256:af4063ef2b11b96d949dccbc5a987272f38d55c23c4c01841ea65a517906397f \ - --hash=sha256:b975b85d1d5efc36cf8b237c5f3849b64d1ba33d6282f5e991f28751317504a1 \ - --hash=sha256:bf0b9959e673505ee5869950642428046edb91f99942607c2ecf635f8a4b31c9 \ - --hash=sha256:c0c85c5cbe8b30a32fa6d802588d55ffabf720e985abe9590c7c886919d875d4 \ - --hash=sha256:c3f3237a57e42f79f1e560726576aedb3a7ef931f4e3accb84ebf6acc485d316 \ - --hash=sha256:c3fa3ab0fb200a2c66493828ed06ccd1a94b12eddbfb985e7fd3e5723ff156c6 \ - --hash=sha256:c435f5ce1705de48e08fcbcfaf8aee660d199c90536e3e06f2016af7d6a938dd \ - --hash=sha256:c90da4b124647547a68cf2f197174ada30c7bb9523cb976665dfd26a9963d328 \ - --hash=sha256:cbdf2c498e077282cd427cfd88bdce4668019791deef0be8155385ab2ba7837f \ - --hash=sha256:d1fbad1f9077372b6587ec589c1fc120b417b6c8ad72d3e3cc86bbbd0a3cee93 \ - --hash=sha256:d39f5d4af48c138cb146763eda14eb7d8b3ccbbec9fe86fb724cd16e0e914c64 \ - --hash=sha256:ddb4a6061933bd9332b74eac0da25f17f32afa7145a33a0f9711ad74f924b1b8 \ - --hash=sha256:ded637176addc1d3eef35331c39acc598bac550d213f0a1bedabfceaa2244c87 \ - --hash=sha256:f20fd21f7538f8107451156dd1fe203300b79a9ddceba1ee0ac8132521a008ed \ - --hash=sha256:fda2783c12f553cdca11c08e5af6eecbd717280dc8fbe28a110897af1c15a88c + # via tensorboard +grpcio==1.57.0 \ + --hash=sha256:00258cbe3f5188629828363ae8ff78477ce976a6f63fb2bb5e90088396faa82e \ + --hash=sha256:092fa155b945015754bdf988be47793c377b52b88d546e45c6a9f9579ac7f7b6 \ + --hash=sha256:0f80bf37f09e1caba6a8063e56e2b87fa335add314cf2b78ebf7cb45aa7e3d06 \ + --hash=sha256:20ec6fc4ad47d1b6e12deec5045ec3cd5402d9a1597f738263e98f490fe07056 \ + --hash=sha256:2313b124e475aa9017a9844bdc5eafb2d5abdda9d456af16fc4535408c7d6da6 \ + --hash=sha256:23e7d8849a0e58b806253fd206ac105b328171e01b8f18c7d5922274958cc87e \ + --hash=sha256:2f708a6a17868ad8bf586598bee69abded4996b18adf26fd2d91191383b79019 \ + --hash=sha256:2f7349786da979a94690cc5c2b804cab4e8774a3cf59be40d037c4342c906649 \ + --hash=sha256:34950353539e7d93f61c6796a007c705d663f3be41166358e3d88c45760c7d98 \ + --hash=sha256:40b72effd4c789de94ce1be2b5f88d7b9b5f7379fe9645f198854112a6567d9a \ + --hash=sha256:4b089f7ad1eb00a104078bab8015b0ed0ebcb3b589e527ab009c53893fd4e613 \ + --hash=sha256:4faea2cfdf762a664ab90589b66f416274887641ae17817de510b8178356bf73 \ + --hash=sha256:5371bcd861e679d63b8274f73ac281751d34bd54eccdbfcd6aa00e692a82cd7b \ + --hash=sha256:5613a2fecc82f95d6c51d15b9a72705553aa0d7c932fad7aed7afb51dc982ee5 \ + --hash=sha256:57b183e8b252825c4dd29114d6c13559be95387aafc10a7be645462a0fc98bbb \ + --hash=sha256:5b7a4ce8f862fe32b2a10b57752cf3169f5fe2915acfe7e6a1e155db3da99e79 \ + --hash=sha256:5e5b58e32ae14658085c16986d11e99abd002ddbf51c8daae8a0671fffb3467f \ + --hash=sha256:60fe15288a0a65d5c1cb5b4a62b1850d07336e3ba728257a810317be14f0c527 \ + --hash=sha256:6907b1cf8bb29b058081d2aad677b15757a44ef2d4d8d9130271d2ad5e33efca \ + --hash=sha256:76c44efa4ede1f42a9d5b2fed1fe9377e73a109bef8675fb0728eb80b0b8e8f2 \ + --hash=sha256:7a635589201b18510ff988161b7b573f50c6a48fae9cb567657920ca82022b37 \ + --hash=sha256:7b400807fa749a9eb286e2cd893e501b110b4d356a218426cb9c825a0474ca56 \ + --hash=sha256:82640e57fb86ea1d71ea9ab54f7e942502cf98a429a200b2e743d8672171734f \ + --hash=sha256:871f9999e0211f9551f368612460442a5436d9444606184652117d6a688c9f51 \ + --hash=sha256:9338bacf172e942e62e5889b6364e56657fbf8ac68062e8b25c48843e7b202bb \ + --hash=sha256:a8a8e560e8dbbdf29288872e91efd22af71e88b0e5736b0daf7773c1fecd99f0 \ + --hash=sha256:aed90d93b731929e742967e236f842a4a2174dc5db077c8f9ad2c5996f89f63e \ + --hash=sha256:b363bbb5253e5f9c23d8a0a034dfdf1b7c9e7f12e602fc788c435171e96daccc \ + --hash=sha256:b4098b6b638d9e0ca839a81656a2fd4bc26c9486ea707e8b1437d6f9d61c3941 \ + --hash=sha256:b53333627283e7241fcc217323f225c37783b5f0472316edcaa4479a213abfa6 \ + --hash=sha256:b670c2faa92124b7397b42303e4d8eb64a4cd0b7a77e35a9e865a55d61c57ef9 \ + --hash=sha256:bb396952cfa7ad2f01061fbc7dc1ad91dd9d69243bcb8110cf4e36924785a0fe \ + --hash=sha256:c60b83c43faeb6d0a9831f0351d7787a0753f5087cc6fa218d78fdf38e5acef0 \ + --hash=sha256:c6ebecfb7a31385393203eb04ed8b6a08f5002f53df3d59e5e795edb80999652 \ + --hash=sha256:d78d8b86fcdfa1e4c21f8896614b6cc7ee01a2a758ec0c4382d662f2a62cf766 \ + --hash=sha256:d7f8df114d6b4cf5a916b98389aeaf1e3132035420a88beea4e3d977e5f267a5 \ + --hash=sha256:e1cb52fa2d67d7f7fab310b600f22ce1ff04d562d46e9e0ac3e3403c2bb4cc16 \ + --hash=sha256:e3fdf04e402f12e1de8074458549337febb3b45f21076cc02ef4ff786aff687e \ + --hash=sha256:e503cb45ed12b924b5b988ba9576dc9949b2f5283b8e33b21dcb6be74a7c58d0 \ + --hash=sha256:f19ac6ac0a256cf77d3cc926ef0b4e64a9725cc612f97228cd5dc4bd9dbab03b \ + --hash=sha256:f1fb0fd4a1e9b11ac21c30c169d169ef434c6e9344ee0ab27cfa6f605f6387b2 \ + --hash=sha256:fada6b07ec4f0befe05218181f4b85176f11d531911b64c715d1875c4736d73a \ + --hash=sha256:fd173b4cf02b20f60860dc2ffe30115c18972d7d6d2d69df97ac38dee03be5bf \ + --hash=sha256:fe752639919aad9ffb0dee0d87f29a6467d1ef764f13c4644d212a9a853a078d \ + --hash=sha256:fee387d2fab144e8a34e0e9c5ca0f45c9376b99de45628265cfa9886b1dbe62b # via # -r ./requirements.in - # tb-nightly + # tensorboard h5py==3.9.0 \ --hash=sha256:12aa556d540f11a2cae53ea7cfb94017353bd271fb3962e1296b342f6550d1b8 \ --hash=sha256:23e74b878bbe1653ab34ca49b83cac85529cd0b36b9d625516c5830cc5ca2eac \ @@ -180,17 +180,17 @@ importlib-metadata==6.8.0 \ jax==0.4.7 \ --hash=sha256:5e7002d74db25f97c99b979d4ba1233b1ef26e1597e5fc468ad11d1c8a9dc4f8 # via -r ./requirements.in -keras-nightly==2.14.0.dev2023072507 \ - --hash=sha256:78f8f218f78a7ee9af4e740bbd4a3ef1bbe1b34e206ae6b6245b38e0461a9109 \ - --hash=sha256:aae547bca76ae23f07b434e064803aace8999a8b6042121bacd5868c51f11025 +keras==2.14.0rc0 \ + --hash=sha256:56dc53aad890ea6c585150ce69e8e6f263ee1b34ab5c3a1ff10865cfa5150317 \ + --hash=sha256:b53f050ce66351db41cca57cfaa3dec7bee7feb4f45f83a763934701f8b27bda # via -r ./requirements.in lit==16.0.6 \ --hash=sha256:84623c9c23b6b14763d637f4e63e6b721b3446ada40bf7001d8fee70b8e77a9a # via -r ./requirements.in -markdown==3.4.3 \ - --hash=sha256:065fd4df22da73a625f14890dd77eb8040edcbd68794bcd35943be14490608b2 \ - --hash=sha256:8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520 - # via tb-nightly +markdown==3.4.4 \ + --hash=sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 \ + --hash=sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941 + # via tensorboard markupsafe==2.1.3 \ --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ @@ -298,7 +298,7 @@ numpy==1.23.5 \ # ml-dtypes # opt-einsum # scipy - # tb-nightly + # tensorboard oauthlib==3.2.2 \ --hash=sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca \ --hash=sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 @@ -315,21 +315,21 @@ portpicker==1.5.2 \ --hash=sha256:01113f51c3cc63290a44dd7ae6e3eb9f8fe1b8a1f9d7988a897944230c39cd52 \ --hash=sha256:c55683ad725f5c00a41bc7db0225223e8be024b1fa564d039ed3390e4fd48fb3 # via -r ./requirements.in -protobuf==4.23.4 \ - --hash=sha256:0a5759f5696895de8cc913f084e27fd4125e8fb0914bb729a17816a33819f474 \ - --hash=sha256:351cc90f7d10839c480aeb9b870a211e322bf05f6ab3f55fcb2f51331f80a7d2 \ - --hash=sha256:5fea3c64d41ea5ecf5697b83e41d09b9589e6f20b677ab3c48e5f242d9b7897b \ - --hash=sha256:6dd9b9940e3f17077e820b75851126615ee38643c2c5332aa7a359988820c720 \ - --hash=sha256:7b19b6266d92ca6a2a87effa88ecc4af73ebc5cfde194dc737cf8ef23a9a3b12 \ - --hash=sha256:8547bf44fe8cec3c69e3042f5c4fb3e36eb2a7a013bb0a44c018fc1e427aafbd \ - --hash=sha256:9053df6df8e5a76c84339ee4a9f5a2661ceee4a0dab019e8663c50ba324208b0 \ - --hash=sha256:c3e0939433c40796ca4cfc0fac08af50b00eb66a40bbbc5dee711998fb0bbc1e \ - --hash=sha256:ccd9430c0719dce806b93f89c91de7977304729e55377f872a92465d548329a9 \ - --hash=sha256:e1c915778d8ced71e26fcf43c0866d7499891bca14c4368448a82edc61fdbc70 \ - --hash=sha256:e9d0be5bf34b275b9f87ba7407796556abeeba635455d036c7351f7c183ef8ff \ - --hash=sha256:effeac51ab79332d44fba74660d40ae79985901ac21bca408f8dc335a81aa597 \ - --hash=sha256:fee88269a090ada09ca63551bf2f573eb2424035bcf2cb1b121895b01a46594a - # via tb-nightly +protobuf==4.24.2 \ + --hash=sha256:237b9a50bd3b7307d0d834c1b0eb1a6cd47d3f4c2da840802cd03ea288ae8880 \ + --hash=sha256:25ae91d21e3ce8d874211110c2f7edd6384816fb44e06b2867afe35139e1fd1c \ + --hash=sha256:2b23bd6e06445699b12f525f3e92a916f2dcf45ffba441026357dea7fa46f42b \ + --hash=sha256:3b7b170d3491ceed33f723bbf2d5a260f8a4e23843799a3906f16ef736ef251e \ + --hash=sha256:4e69965e7e54de4db989289a9b971a099e626f6167a9351e9d112221fc691bc1 \ + --hash=sha256:58e12d2c1aa428ece2281cef09bbaa6938b083bcda606db3da4e02e991a0d924 \ + --hash=sha256:6bd26c1fa9038b26c5c044ee77e0ecb18463e957fefbaeb81a3feb419313a54e \ + --hash=sha256:77700b55ba41144fc64828e02afb41901b42497b8217b558e4a001f18a85f2e3 \ + --hash=sha256:7fda70797ddec31ddfa3576cbdcc3ddbb6b3078b737a1a87ab9136af0570cd6e \ + --hash=sha256:839952e759fc40b5d46be319a265cf94920174d88de31657d5622b5d8d6be5cd \ + --hash=sha256:bb7aa97c252279da65584af0456f802bd4b2de429eb945bbc9b3d61a42a8cd16 \ + --hash=sha256:c00c3c7eb9ad3833806e21e86dca448f46035242a680f81c3fe068ff65e79c74 \ + --hash=sha256:c5cdd486af081bf752225b26809d2d0a85e575b80a84cde5172a05bbb1990099 + # via tensorboard psutil==5.9.5 \ --hash=sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d \ --hash=sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217 \ @@ -362,7 +362,7 @@ requests==2.31.0 \ # via # -r ./requirements.in # requests-oauthlib - # tb-nightly + # tensorboard requests-oauthlib==1.3.1 \ --hash=sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5 \ --hash=sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a @@ -401,21 +401,21 @@ setuptools==67.6.1 \ --hash=sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078 # via # -r ./requirements.in - # tb-nightly + # tensorboard six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via google-auth -tb-nightly==2.14.0a20230725 \ - --hash=sha256:a0717250191893ec909066564acbc8c92329041a984cf9e407d301fc3ebf3f3e +tensorboard==2.14.0 \ + --hash=sha256:3667f9745d99280836ad673022362c840f60ed8fefd5a3e30bf071f5a8fd0017 # via -r ./requirements.in tensorboard-data-server==0.7.1 \ --hash=sha256:255c02b7f5b03dd5c0a88c928e563441ff39e1d4b4a234cdbe09f016e53d9594 \ --hash=sha256:9938bd39f5041797b33921066fba0eab03a0dd10d1887a05e62ae58841ad4c3f \ --hash=sha256:be8d016a1aa394e6198280d4a3dc37898f56467310c5f5e617cac10a783e055a - # via tb-nightly -tf-estimator-nightly==2.14.0.dev2023072508 \ - --hash=sha256:6e810e250d6d13732f3dbd28e8649cbc0eab7cbc35d4154d08b19b749e53a275 + # via tensorboard +tensorflow-estimator==2.14.0rc0 \ + --hash=sha256:98d7bcf84e17a0ebc2f3d07c4e2a59a6ac3ad9a6e7ed9270f67b6cc3c11b4eaf # via -r ./requirements.in urllib3==1.26.16 \ --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ @@ -423,16 +423,16 @@ urllib3==1.26.16 \ # via # google-auth # requests -werkzeug==2.3.6 \ - --hash=sha256:935539fa1413afbb9195b24880778422ed620c0fc09670945185cce4d91a8890 \ - --hash=sha256:98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330 - # via tb-nightly +werkzeug==2.3.7 \ + --hash=sha256:2b8c0e447b4b9dbcc85dd97b6eeb4dcbaf6c8b6c3be0bd654e25553e0a2157d8 \ + --hash=sha256:effc12dba7f3bd72e605ce49807bbe692bd729c3bb122a3b91747a6ae77df528 + # via tensorboard wheel==0.38.4 \ --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 # via # -r ./requirements.in - # tb-nightly + # tensorboard zipp==3.16.2 \ --hash=sha256:679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0 \ --hash=sha256:ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147 diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD index 72737837397332..55e4e99a492507 100644 --- a/tensorflow/compiler/xla/service/cpu/BUILD +++ b/tensorflow/compiler/xla/service/cpu/BUILD @@ -397,6 +397,7 @@ cc_library( "//tensorflow/compiler/xla/service:executable", "//tensorflow/compiler/xla/service:llvm_compiler", "//tensorflow/compiler/xla/stream_executor", + "//tensorflow/compiler/xla/stream_executor:stream_executor_pimpl", # fixdeps: keep "//tensorflow/compiler/xla/stream_executor/host:host_platform_id", "@llvm-project//llvm:Target", ], diff --git a/tensorflow/core/common_runtime/mkl_layout_pass.cc b/tensorflow/core/common_runtime/mkl_layout_pass.cc index 050d98176e121e..b02e487756c937 100644 --- a/tensorflow/core/common_runtime/mkl_layout_pass.cc +++ b/tensorflow/core/common_runtime/mkl_layout_pass.cc @@ -1672,24 +1672,23 @@ class MklLayoutRewritePass : public GraphOptimizationPass { DCHECK(n); Node* filter_node = nullptr; TF_CHECK_OK(n->input_node(0, &filter_node)); - bool narrow_range = false; - int axis = -1; string mode_string; string round_mode_string; DataType type; - TryGetNodeAttr(n->def(), "narrow_range", &narrow_range); - TryGetNodeAttr(n->def(), "axis", &axis); TF_CHECK_OK(GetNodeAttr(n->def(), "mode", &mode_string)); TF_CHECK_OK(GetNodeAttr(n->def(), "round_mode", &round_mode_string)); TF_CHECK_OK(GetNodeAttr(n->def(), "T", &type)); - if (narrow_range) { + bool narrow_range; + if (TryGetNodeAttr(n->def(), "narrow_range", &narrow_range) && + narrow_range) { VLOG(1) << "QuantizeOpRewrite: narrow range is enabled for quantization." << "This case is not optimized by Intel MKL, " << "thus using Eigen op for Quantize op "; return false; } - if (axis != -1) { + int axis; + if (TryGetNodeAttr(n->def(), "axis", &axis) && axis != -1) { VLOG(1) << "QuantizeOpRewrite: dimension is specified for " << "per slice quantization." << "This case is not optimized by Intel MKL, " diff --git a/tensorflow/core/kernels/mkl/mkl_batch_matmul_helper.h b/tensorflow/core/kernels/mkl/mkl_batch_matmul_helper.h index 4cd59d1d70df07..86dc72b02446fb 100644 --- a/tensorflow/core/kernels/mkl/mkl_batch_matmul_helper.h +++ b/tensorflow/core/kernels/mkl/mkl_batch_matmul_helper.h @@ -70,10 +70,6 @@ struct MklBatchMatMulHelper { if (ndims_rhs < ndims_out) { ExpandInputDimsToOutputShape(rhs_shape, out_shape, &rhs_dims); } - using dim = dnnl::memory::dim; - dim m; // Number of rows in x - dim k; // Number of columns in x - dim n; // Number of columns in y auto lhs_strides = CalculateTFStrides(lhs_dims); auto rhs_strides = CalculateTFStrides(rhs_dims); auto out_strides = CalculateTFStrides(out_dims); @@ -81,8 +77,7 @@ struct MklBatchMatMulHelper { if (adj_x) { int m_idx = ndims_out - 1; int k_idx = ndims_out - 2; - m = lhs_dims[m_idx]; - k = lhs_dims[k_idx]; + memory::dim m = lhs_dims[m_idx]; // number of rows in x std::swap(lhs_dims[m_idx], lhs_dims[k_idx]); lhs_strides[m_idx] = m; lhs_strides[k_idx] = 1; @@ -91,8 +86,7 @@ struct MklBatchMatMulHelper { if (adj_y) { int k_idx = ndims_out - 1; int n_idx = ndims_out - 2; - k = rhs_dims[k_idx]; - n = rhs_dims[n_idx]; + memory::dim k = rhs_dims[k_idx]; // number of columns in x std::swap(rhs_dims[k_idx], rhs_dims[n_idx]); rhs_strides[k_idx] = k; rhs_strides[n_idx] = 1; diff --git a/tensorflow/core/kernels/mkl/mkl_batch_matmul_op.cc b/tensorflow/core/kernels/mkl/mkl_batch_matmul_op.cc index 8e1e7a0008e078..e65a1011edf02a 100644 --- a/tensorflow/core/kernels/mkl/mkl_batch_matmul_op.cc +++ b/tensorflow/core/kernels/mkl/mkl_batch_matmul_op.cc @@ -49,7 +49,9 @@ template HasAttr("transpose_a")) { + if (!context) return; + + if (context->HasAttr("transpose_a")) { // This is needed for using BatchMatMulMkl as the super class of // MklMatMulOp (below) whose context has a transpose_a attribute which is // effectively the same as adj_x_ @@ -58,7 +60,7 @@ class BatchMatMulMkl : public OpKernel { OP_REQUIRES_OK(context, context->GetAttr("adj_x", &adj_x_)); } - if (context && context->HasAttr("transpose_b")) { + if (context->HasAttr("transpose_b")) { // This is needed for using BatchMatMulMkl as the super class of // MklMatMulOp (below) whose context has a transpose_b attribute which is // effectively the same as adj_y_ @@ -294,6 +296,10 @@ class FusedBatchMatMulMkl } if (this->fused_ops_.size() > 1 && this->fused_ops_.at(1) == "Add") { auto add_shape = ctx->input(3).shape(); + OP_REQUIRES(ctx, add_shape.dims() == 4, + absl::InvalidArgumentError(absl::StrCat( + "Add fusion expects add shape to have 4 dims, but got ", + add_shape.dims()))); memory::dims add_dims = {add_shape.dim_size(0), add_shape.dim_size(1), add_shape.dim_size(2), add_shape.dim_size(3)}; params.post_op_params.push_back( diff --git a/tensorflow/core/kernels/mkl/mkl_concat_op.cc b/tensorflow/core/kernels/mkl/mkl_concat_op.cc index 804567b7e79b25..b801c3cd210895 100644 --- a/tensorflow/core/kernels/mkl/mkl_concat_op.cc +++ b/tensorflow/core/kernels/mkl/mkl_concat_op.cc @@ -481,7 +481,7 @@ class MklConcatOp : public OpKernel { void Compute(OpKernelContext* context) override { try { auto cpu_engine = engine(engine::kind::cpu, 0); - OpInputList input_tensors; + OpInputList input_tensors(context, 0, 0); GetMklInputList(context, "values", &input_tensors); const int N = input_tensors.size(); // Get Tensor shapes. @@ -563,7 +563,8 @@ class MklConcatOp : public OpKernel { // That is due to an incorrect output results in DNNL 1.2 path. if (expected_dims == 2) invoke_eigen = true; - OpInputList input_mins, input_maxes; + OpInputList input_mins(context, 0, 0); + OpInputList input_maxes(context, 0, 0); bool quantized_input = std::is_same::value || std::is_same::value; if (quantized_input) { diff --git a/tensorflow/core/kernels/mkl/mkl_conv_ops.h b/tensorflow/core/kernels/mkl/mkl_conv_ops.h index 0384df4b309285..eac82beadfdd09 100644 --- a/tensorflow/core/kernels/mkl/mkl_conv_ops.h +++ b/tensorflow/core/kernels/mkl/mkl_conv_ops.h @@ -568,11 +568,17 @@ class MklDnnConvUtil { OP_REQUIRES(context_, input_tf_shape.dims() == 4, errors::InvalidArgument("input must be 4-dimensional", input_tf_shape.DebugString())); + OP_REQUIRES(context_, filter_tf_shape.dims() == 4, + errors::InvalidArgument("filter must be 4-dimensional", + filter_tf_shape.DebugString())); } else { // Conv3D OP_REQUIRES(context_, input_tf_shape.dims() == 5, errors::InvalidArgument("input must be 5-dimensional", input_tf_shape.DebugString())); + OP_REQUIRES(context_, filter_tf_shape.dims() == 5, + errors::InvalidArgument("filter must be 5-dimensional", + filter_tf_shape.DebugString())); } GetOutputAndPadSizeInMklOrder(input_tf_shape, filter_tf_shape, strides, diff --git a/tensorflow/core/kernels/mkl/mkl_einsum_op.cc b/tensorflow/core/kernels/mkl/mkl_einsum_op.cc index 698dcdb12ec530..05cb2f11392799 100644 --- a/tensorflow/core/kernels/mkl/mkl_einsum_op.cc +++ b/tensorflow/core/kernels/mkl/mkl_einsum_op.cc @@ -200,7 +200,7 @@ class MklEinsum : public OpKernel { virtual ~MklEinsum() {} void Compute(OpKernelContext* ctx) override { - OpInputList inputs; + OpInputList inputs(ctx, 0, 0); OP_REQUIRES_OK(ctx, ctx->input_list("inputs", &inputs)); if (std::is_same::value) { diff --git a/tensorflow/core/kernels/mkl/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl/mkl_fused_batch_norm_op.cc index e8f0d26915ecd3..62aeaed33e0b92 100644 --- a/tensorflow/core/kernels/mkl/mkl_fused_batch_norm_op.cc +++ b/tensorflow/core/kernels/mkl/mkl_fused_batch_norm_op.cc @@ -651,7 +651,8 @@ class MklFusedBatchNormBwdPrimitive : public MklPrimitive { std::vector> net_args; BatchNormBwdContext() - : src_mem(nullptr), + : flags(0), + src_mem(nullptr), mean_mem(nullptr), variance_mem(nullptr), diff_dst_mem(nullptr), diff --git a/tensorflow/core/kernels/mkl/mkl_pooling_ops_common.h b/tensorflow/core/kernels/mkl/mkl_pooling_ops_common.h index fe5e7f032855a6..d709f0f1d546fd 100644 --- a/tensorflow/core/kernels/mkl/mkl_pooling_ops_common.h +++ b/tensorflow/core/kernels/mkl/mkl_pooling_ops_common.h @@ -131,7 +131,6 @@ class MklPoolingFwdPrimitive : public MklPrimitive { memory::format_tag ws_fmt; // Workspace shape. - memory::dims ws_dims; memory::data_type ws_dt; size_t ws_size; @@ -161,6 +160,8 @@ class MklPoolingFwdPrimitive : public MklPrimitive { : src_fmt(memory::format_tag::any), dst_fmt(memory::format_tag::any), ws_fmt(memory::format_tag::any), + ws_dt(memory::data_type::u8), + ws_size(0), ws_mem(nullptr), src_mem(nullptr), dst_mem(nullptr), @@ -284,7 +285,6 @@ class MklPoolingBwdPrimitive : public MklPrimitive { memory::format_tag ws_fmt; // Workspace attribute. - dnnl::memory::dims ws_dims; dnnl::memory::data_type ws_dt; // oneDNN memory. @@ -315,6 +315,7 @@ class MklPoolingBwdPrimitive : public MklPrimitive { : diff_src_fmt(memory::format_tag::any), diff_dst_fmt(memory::format_tag::any), ws_fmt(memory::format_tag::any), + ws_dt(memory::data_type::u8), ws_mem(nullptr), diff_src_mem(nullptr), diff_dst_mem(nullptr), diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h index 73cdfae4ede226..55f5fe6cc38b00 100644 --- a/tensorflow/core/public/version.h +++ b/tensorflow/core/public/version.h @@ -26,7 +26,7 @@ limitations under the License. // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1", // "-beta", "-rc", "-rc.1") -#define TF_VERSION_SUFFIX "" +#define TF_VERSION_SUFFIX "-rc1" #define TF_STR_HELPER(x) #x #define TF_STR(x) TF_STR_HELPER(x) diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py index 3be26300a713d3..b435df02b0c813 100644 --- a/tensorflow/python/__init__.py +++ b/tensorflow/python/__init__.py @@ -59,3 +59,7 @@ # Expose symbols minus dunders, unless they are allowlisted above. # This is necessary to export our dunders. __all__ = [s for s in dir() if s in _exported_dunders or not s.startswith('_')] + +# TODO(b/296442875): remove this when we remove the tf.distribution package. +# This import is needed for tf.compat.v1.distributions. +from tensorflow.python.ops.distributions import distributions diff --git a/tensorflow/python/modules_with_exports.py b/tensorflow/python/modules_with_exports.py index bf043db170b887..cdb7055cd89d9c 100644 --- a/tensorflow/python/modules_with_exports.py +++ b/tensorflow/python/modules_with_exports.py @@ -107,7 +107,6 @@ from tensorflow.python.ops import sets from tensorflow.python.ops import stateful_random_ops from tensorflow.python.ops import while_v2 -from tensorflow.python.ops.distributions import distributions from tensorflow.python.ops.linalg import linalg from tensorflow.python.ops.linalg.sparse import sparse from tensorflow.python.ops.losses import losses diff --git a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_nightly.Jenkinsfile b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_nightly.Jenkinsfile index d565f227684f75..6bb1fbf0129505 100644 --- a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_nightly.Jenkinsfile +++ b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_nightly.Jenkinsfile @@ -26,7 +26,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.9 + TF_PYTHON_VERSION=3.9 } steps { dir('tensorflow') { @@ -84,7 +84,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.10 + TF_PYTHON_VERSION=3.10 } steps { dir('tensorflow') { @@ -140,7 +140,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.11 + TF_PYTHON_VERSION=3.11 } steps { diff --git a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_release.Jenkinsfile b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_release.Jenkinsfile index 0cd2cfeb295ff5..53dc52511ca4df 100644 --- a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_release.Jenkinsfile +++ b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_build_release.Jenkinsfile @@ -17,7 +17,7 @@ limitations under the License. pipeline { agent none environment { - RELEASE_BRANCH = 'r2.13' + RELEASE_BRANCH = 'r2.14' } stages { stage("Build Tensorflow") { @@ -29,7 +29,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.9 + TF_PYTHON_VERSION=3.9 } steps { dir('tensorflow') { @@ -78,7 +78,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.10 + TF_PYTHON_VERSION=3.10 } steps { dir('tensorflow') { @@ -127,7 +127,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.11 + TF_PYTHON_VERSION=3.11 } steps { dir('tensorflow') { diff --git a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_ci.Jenkinsfile b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_ci.Jenkinsfile index 04b254dff6ccb6..bd3d72402551e0 100644 --- a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_ci.Jenkinsfile +++ b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_ci.Jenkinsfile @@ -26,7 +26,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.11 + TF_PYTHON_VERSION=3.11 } steps { sh ''' diff --git a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_nightly.Jenkinsfile b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_nightly.Jenkinsfile index 749eaf58475823..4e8c9e8ee5ce6a 100644 --- a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_nightly.Jenkinsfile +++ b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_nightly.Jenkinsfile @@ -26,7 +26,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.9 + TF_PYTHON_VERSION=3.9 } steps { @@ -59,7 +59,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.10 + TF_PYTHON_VERSION=3.10 } steps { sh ''' @@ -93,7 +93,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.11 + TF_PYTHON_VERSION=3.11 } steps { sh ''' diff --git a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_release.Jenkinsfile b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_release.Jenkinsfile index 565630bd2443c7..10c341f1c6ca39 100644 --- a/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_release.Jenkinsfile +++ b/tensorflow/tools/ci_build/osx/arm64/tensorflow_as_test_release.Jenkinsfile @@ -17,7 +17,7 @@ limitations under the License. pipeline { agent none environment { - RELEASE_BRANCH = 'r2.13' + RELEASE_BRANCH = 'r2.14' } stages { stage("Build Tensorflow") { @@ -29,7 +29,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.9 + TF_PYTHON_VERSION=3.9 } steps { @@ -62,7 +62,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.10 + TF_PYTHON_VERSION=3.10 } steps { sh ''' @@ -95,7 +95,7 @@ pipeline { environment { PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/shims:/opt/homebrew/bin/:$PATH" - TF_PYTHON_VERSION=3.11 + TF_PYTHON_VERSION=3.11 } steps { sh ''' diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index d9d87af17935c1..154c2dead99319 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -197,19 +197,6 @@ COMMON_PIP_DEPS = [ "//tensorflow:tensorflow_py", ] -# On Windows, python binary is a zip file of runfiles tree. -# Add everything to its data dependency for generating a runfiles tree -# for building the pip package on Windows. -py_binary( - name = "simple_console_for_windows", - srcs = ["simple_console_for_windows.py"], - data = COMMON_PIP_DEPS + [ - "//tensorflow/python:pywrap_tensorflow_import_lib_file", - ], - srcs_version = "PY3", - deps = ["//tensorflow:tensorflow_py"], -) - filegroup( name = "licenses", data = [ @@ -271,11 +258,9 @@ sh_binary( data = COMMON_PIP_DEPS + select({ "//tensorflow:windows": [ - ":simple_console_for_windows", - ], - "//conditions:default": [ - ":simple_console", + "//tensorflow/python:pywrap_tensorflow_import_lib_file", ], + "//conditions:default": [], }) + select({ "//tensorflow:dynamic_loaded_kernels": DYNAMIC_LOADED_KERNELS, @@ -283,23 +268,3 @@ sh_binary( }) + if_mkl_ml(["//third_party/mkl:intel_binary_blob"]), visibility = ["//visibility:public"], ) - -# A genrule for generating a marker file for the pip package on Windows -# -# This only works on Windows, because :simple_console_for_windows is a -# python zip file containing everything we need for building the pip package. -# However, on other platforms, due to https://github.com/bazelbuild/bazel/issues/4223, -# when C++ extensions change, this generule doesn't rebuild. -genrule( - name = "win_pip_package_marker", - srcs = if_windows([ - ":build_pip_package", - ":simple_console_for_windows", - ]), - outs = ["win_pip_package_marker_file"], - cmd = select({ - "//conditions:default": "touch $@", - "//tensorflow:windows": "sha1sum $(locations :build_pip_package) $(locations :simple_console_for_windows) > $@", - }), - visibility = ["//visibility:public"], -) diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh index 7cf9bc4b31352a..4d9853c78714fc 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh @@ -159,28 +159,28 @@ function prepare_src() { fi if is_windows; then - rm -rf ./bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip - mkdir -p ./bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip - echo "Unzipping simple_console_for_windows.zip to create runfiles tree..." - unzip -o -q ./bazel-bin/tensorflow/tools/pip_package/simple_console_for_windows.zip -d ./bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip - echo "Unzip finished." - # runfiles structure after unzip the python binary cp -L \ - bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/org_tensorflow/LICENSE \ - "${TMPDIR}" - cp -LR \ - bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/org_tensorflow/tensorflow \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles/org_tensorflow/LICENSE \ "${TMPDIR}" + + # Change the format of file path (TMPDIR-->TMPDIR_rsync) which is input to the rsync from + # Windows-compatible to Linux-compatible to resolve the error below + # error: ssh: Could not resolve hostname c: No such host is known. + + TMPDIR_rsync=`cygpath $TMPDIR` + rsync -a \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles/org_tensorflow/tensorflow \ + "${TMPDIR_rsync}" cp_external \ - bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles \ "${EXTERNAL_INCLUDES}/" cp_local_config_python \ - bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles \ "${EXTERNAL_INCLUDES}/" copy_xla_aot_runtime_sources \ - bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/org_tensorflow \ + bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles/org_tensorflow \ "${XLA_AOT_RUNTIME_SOURCES}/" - RUNFILES=bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/org_tensorflow + RUNFILES=bazel-bin/tensorflow/tools/pip_package/build_pip_package.exe.runfiles/org_tensorflow # If oneDNN was built with openMP then copy the omp libs over if [ -f "bazel-bin/external/llvm_openmp/libiomp5md.dll" ]; then cp bazel-bin/external/llvm_openmp/libiomp5md.dll ${TMPDIR}/tensorflow/python @@ -316,13 +316,13 @@ function build_wheel() { source tools/python_bin_path.sh fi if is_windows; then - PY_DIR=$(find ./bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/ -maxdepth 1 -type d -name "python_*") - FULL_DIR="$(real_path "$PY_DIR")/python" - export PYTHONPATH="$PYTHONPATH:$PWD/bazel-bin/tensorflow/tools/pip_package/simple_console_for_window_unzip/runfiles/pypi_wheel/site-packages/" + PY_DIR=$(find -L ./bazel-tensorflow/external -maxdepth 1 -type d -name "python_*") + FULL_DIR="$(real_path "$PY_DIR")/python" + export PYTHONPATH="$PYTHONPATH:$PWD/bazel-tensorflow/external/pypi_wheel/site-packages/" else - PY_DIR=$(find ./bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/ -maxdepth 1 -type d -name "python_*") - FULL_DIR="$(real_path "$PY_DIR")/bin/python3" - export PYTHONPATH="$PYTHONPATH:$PWD/bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/pypi_wheel/site-packages/" + PY_DIR=$(find ./bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/ -maxdepth 1 -type d -name "python_*") + FULL_DIR="$(real_path "$PY_DIR")/bin/python3" + export PYTHONPATH="$PYTHONPATH:$PWD/bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/pypi_wheel/site-packages/" fi pushd ${TMPDIR} > /dev/null diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 6d3e9383ec0205..6eae3a814ea068 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -47,7 +47,7 @@ # result for pip. # Also update tensorflow/tensorflow.bzl and # tensorflow/core/public/version.h -_VERSION = '2.14.0' +_VERSION = '2.14.0-rc1' # We use the same setup.py for all tensorflow_* packages and for the nightly @@ -119,14 +119,14 @@ def standard_or_nightly(standard, nightly): # version name. # These are all updated during the TF release process. standard_or_nightly( - 'tensorboard >= 2.13, < 2.14', 'tb-nightly ~= 2.14.0.a' + 'tensorboard >= 2.14, < 2.15', 'tb-nightly ~= 2.14.0.a' ), standard_or_nightly( - 'tensorflow_estimator >= 2.13.0rc0, < 2.14', - 'tf-estimator-nightly ~= 2.14.0.dev', + 'tensorflow_estimator >= 2.14.0rc0, < 2.15', + 'tf-estimator-nightly ~= 2.15.0.dev', ), standard_or_nightly( - 'keras >= 2.13.1rc0, < 2.14', 'keras-nightly ~= 2.14.0.dev' + 'keras >= 2.14.0rc0, < 2.15', 'keras-nightly ~= 2.15.0.dev' ), ] REQUIRED_PACKAGES = [p for p in REQUIRED_PACKAGES if p is not None] diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile index 1b683990096353..d72ad941137a23 100644 --- a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile +++ b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile @@ -34,12 +34,18 @@ RUN /setup.sources.sh && /setup.packages.sh /devel.packages.txt && /setup.cuda.s # - buildifier: clean bazel build deps # - buildozer: clean bazel build deps # - gcloud SDK: communicate with Google Cloud Platform (GCP) for RBE, CI +# - patchelf: Utility tool to modify existing ELF executables and libraries RUN git clone --branch v1.7.0 https://github.com/bats-core/bats-core.git && bats-core/install.sh /usr/local && rm -rf bats-core RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-linux-amd64 -O /usr/local/bin/bazel && chmod +x /usr/local/bin/bazel RUN wget https://github.com/bazelbuild/buildtools/releases/download/3.5.0/buildifier -O /usr/local/bin/buildifier && chmod +x /usr/local/bin/buildifier RUN wget https://github.com/bazelbuild/buildtools/releases/download/3.5.0/buildozer -O /usr/local/bin/buildozer && chmod +x /usr/local/bin/buildozer RUN curl -sSL https://sdk.cloud.google.com > /tmp/gcloud && bash /tmp/gcloud --install-dir=~/usr/local/bin --disable-prompts - +# Download and install patchelf v0.18.0 from GitHub. The default Ubuntu focal +# packages only provide the "0.10-2build1" version. We use patchelf to manipulate +# certain shared libraries during the wheel building process (https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/pip_package/build_pip_package.sh#L255-L262). +# When we use Patchelf versions <0.12, those shared libraries end up with a +# corrupted PT_NOTE program header. This was fixed in v0.12, see https://github.com/NixOS/patchelf/commit/43a33482b501b0f5ee9da312aabfca3806570cc9. +RUN wget https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-x86_64.tar.gz && tar -zxvf patchelf-0.18.0-x86_64.tar.gz -C /usr && rm -rf patchelf-0.18.0-x86_64.tar.gz # All lines past this point are reset when $CACHEBUSTER is set. We need this # for Python specifically because we install some nightly packages which are diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt b/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt index 914b60547238e8..7eba2ed10101b9 100644 --- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt +++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.txt @@ -47,7 +47,6 @@ mlocate moreutils openjdk-11-jdk openjdk-11-jre-headless -patchelf pkg-config python3-dev python3-setuptools diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl index 953e1d1bea620e..8ef3e1e1da09f4 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -194,9 +194,9 @@ def _tf_repositories(): tf_http_archive( name = "onednn", build_file = "//third_party/mkl_dnn:mkldnn_v1.BUILD", - sha256 = "8b1db9cc5799ae39c2a567eb836962de0346d79fbc3d8e6f7090a3d9f8729129", - strip_prefix = "oneDNN-3.2", - urls = tf_mirror_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/v3.2.tar.gz"), + sha256 = "2f76b407ef8893cca71340f88cd800019a1f14f8ac1bbdbb89a84be1370b52e3", + strip_prefix = "oneDNN-3.2.1", + urls = tf_mirror_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/v3.2.1.tar.gz"), ) tf_http_archive( diff --git a/third_party/mkl_dnn/mkldnn_v1.BUILD b/third_party/mkl_dnn/mkldnn_v1.BUILD index e648e76cb3e0d9..263c64eb68180f 100644 --- a/third_party/mkl_dnn/mkldnn_v1.BUILD +++ b/third_party/mkl_dnn/mkldnn_v1.BUILD @@ -89,7 +89,7 @@ expand_template( substitutions = { "@DNNL_VERSION_MAJOR@": "3", "@DNNL_VERSION_MINOR@": "2", - "@DNNL_VERSION_PATCH@": "0", + "@DNNL_VERSION_PATCH@": "1", "@DNNL_VERSION_HASH@": "N/A", }, template = "include/oneapi/dnnl/dnnl_version.h.in",