diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c2a118518..618486d232 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,22 +43,24 @@ jobs: matrix: # To switch on windows-2022/latest, please verify the bazel version: # https://github.com/bazelbuild/bazel/issues/14232#issuecomment-1011247429 - os: ['macos-12', 'windows-2019', 'ubuntu-20.04'] + os: ['macos-12', 'ubuntu-20.04'] + # Removing windows builds due to broken upstream package https://github.com/tensorflow/tensorflow/issues/61830 + # os: ['macos-12', 'windows-2019', 'ubuntu-20.04'] py-version: ['3.9', '3.10', '3.11'] - tf-version: ['2.12.1', '2.13.0', '2.14.0'] + tf-version: ['2.13.1', '2.14.0', '2.15.0'] cpu: ['x86'] include: - os: 'macos-12' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.9' - os: 'macos-12' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.10' - os: 'macos-12' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.11' fail-fast: false steps: @@ -69,7 +71,7 @@ jobs: script: | const commit_details = await github.git.getCommit({owner: context.repo.owner, repo: context.repo.repo, commit_sha: context.sha}); return commit_details.data.author.date - - if: matrix.tf-version != '2.14.0' + - if: matrix.tf-version != '2.15.0' shell: bash run: echo "SKIP_CUSTOM_OP_TESTS=--skip-custom-ops" >> $GITHUB_ENV - if: github.event_name == 'push' @@ -102,22 +104,24 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - os: ['macOS', 'Windows', 'Linux'] + os: ['macOS', 'Linux'] + # Removing windows builds due to broken upstream package https://github.com/tensorflow/tensorflow/issues/61830 + # os: ['macOS', 'Windows', 'Linux'] py-version: ['3.9', '3.10', '3.11'] - tf-version: ['2.14.0'] + tf-version: ['2.15.0'] cpu: ['x86'] include: - os: 'macOS' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.9' - os: 'macOS' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.10' - os: 'macOS' cpu: 'arm64' - tf-version: '2.14.0' + tf-version: '2.15.0' py-version: '3.11' fail-fast: false if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81e0f3a548..5f7c746a9d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,8 +173,8 @@ conda activate my_dev_environement Just run from the root: ```bash -pip install tensorflow==2.14.0 -# you can use "pip install tensorflow-cpu==2.14.0" too if you're not testing on gpu. +pip install tensorflow==2.15.0 +# you can use "pip install tensorflow-cpu==2.15.0" too if you're not testing on gpu. pip install -e ./ ``` @@ -262,7 +262,7 @@ If you need a custom C++/Cuda op for your test, compile your ops with ```bash python configure.py -pip install tensorflow==2.14.0 -e ./ -r tools/install_deps/pytest.txt +pip install tensorflow==2.15.0 -e ./ -r tools/install_deps/pytest.txt bash tools/install_so_files.sh # Linux/macos/WSL2 sh tools/install_so_files.sh # PowerShell ``` @@ -290,7 +290,7 @@ docker run --gpus all --rm -it -v ${PWD}:/addons -w /addons gcr.io/tensorflow-te Configure: ```bash -python3 -m pip install tensorflow==2.14.0 +python3 -m pip install tensorflow==2.15.0 python3 ./configure.py # Links project with TensorFlow dependency ``` @@ -329,7 +329,7 @@ quickly, as Bazel has great support for caching and distributed testing. To test with Bazel: ```bash -python3 -m pip install tensorflow==2.14.0 +python3 -m pip install tensorflow==2.15.0 python3 configure.py python3 -m pip install -r tools/install_deps/pytest.txt bazel test -c opt -k \ diff --git a/README.md b/README.md index 873f0948f0..8df9540d79 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For more information see: [https://github.com/tensorflow/addons/issues/2807](htt | Build | Status | | --- | --- | -| **Ubuntu/macOS/Windows** | [![Status](https://github.com/tensorflow/addons/actions/workflows/release.yml/badge.svg)](https://github.com/tensorflow/addons/actions?query=workflow%3Aaddons-release) | +| **Ubuntu/macOS** | [![Status](https://github.com/tensorflow/addons/actions/workflows/release.yml/badge.svg)](https://github.com/tensorflow/addons/actions?query=workflow%3Aaddons-release) | | **Ubuntu GPU custom ops** | [![Status](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-gpu-py3.svg)](https://storage.googleapis.com/tensorflow-kokoro-build-badges/addons/ubuntu-gpu-py3.html) | **TensorFlow Addons** is a repository of contributions that conform to @@ -64,7 +64,8 @@ owners for all submodules. ## Installation #### Stable Builds -TensorFlow Addons is available on PyPI for Linux, macOS, and Windows. To install the latest version, +TensorFlow Addons is available on PyPI for Linux & macOS (Windows support was dropped +due to [inconsistent TF2.15 whl packaging](https://github.com/tensorflow/tensorflow/issues/61830)). To install the latest version, run the following: ``` pip install tensorflow-addons @@ -192,7 +193,7 @@ cd addons export TF_NEED_CUDA="1" # Set these if the below defaults are different on your system -export TF_CUDA_VERSION="11" +export TF_CUDA_VERSION="12" export TF_CUDNN_VERSION="8" export CUDA_TOOLKIT_PATH="/usr/local/cuda" export CUDNN_INSTALL_PATH="/usr/lib/x86_64-linux-gnu" diff --git a/WORKSPACE b/WORKSPACE index 0ab857c072..fb378c5b98 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,10 +11,10 @@ http_archive( patches = [ "//build_deps/tf_dependency:tf.patch", ], - sha256 = "ce357fd0728f0d1b0831d1653f475591662ec5bca736a94ff789e6b1944df19f", - strip_prefix = "tensorflow-2.14.0", + sha256 = "9cec5acb0ecf2d47b16891f8bc5bc6fbfdffe1700bdadc0d9ebe27ea34f0c220", + strip_prefix = "tensorflow-2.15.0", urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.14.0.tar.gz", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.15.0.tar.gz", ], ) diff --git a/configure.py b/configure.py index f1ea5c544a..d30b9f808b 100644 --- a/configure.py +++ b/configure.py @@ -185,7 +185,7 @@ def configure_cuda(): "CUDNN_INSTALL_PATH", os.getenv("CUDNN_INSTALL_PATH", "/usr/lib/x86_64-linux-gnu"), ) - write_action_env("TF_CUDA_VERSION", os.getenv("TF_CUDA_VERSION", "11.8")) + write_action_env("TF_CUDA_VERSION", os.getenv("TF_CUDA_VERSION", "12.2")) write_action_env("TF_CUDNN_VERSION", os.getenv("TF_CUDNN_VERSION", "8")) write("test --config=cuda") diff --git a/tensorflow_addons/utils/resource_loader.py b/tensorflow_addons/utils/resource_loader.py index e4c737247a..862ce7d824 100644 --- a/tensorflow_addons/utils/resource_loader.py +++ b/tensorflow_addons/utils/resource_loader.py @@ -20,8 +20,8 @@ import tensorflow as tf -INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.14.0" -EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.15.0" +INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.15.0" +EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.16.0" abi_warning_already_raised = False SKIP_CUSTOM_OPS = False diff --git a/tensorflow_addons/version.py b/tensorflow_addons/version.py index 5eecdd65a5..7825d9d72b 100644 --- a/tensorflow_addons/version.py +++ b/tensorflow_addons/version.py @@ -15,8 +15,8 @@ """Define TensorFlow Addons version information.""" # Required TensorFlow version [min, max) -INCLUSIVE_MIN_TF_VERSION = "2.12.0" -EXCLUSIVE_MAX_TF_VERSION = "2.15.0" +INCLUSIVE_MIN_TF_VERSION = "2.13.0" +EXCLUSIVE_MAX_TF_VERSION = "2.16.0" # We follow Semantic Versioning (https://semver.org/) _MAJOR_VERSION = "0" diff --git a/tools/build_dev_container.sh b/tools/build_dev_container.sh index c2c5574162..000a121fbe 100755 --- a/tools/build_dev_container.sh +++ b/tools/build_dev_container.sh @@ -4,7 +4,7 @@ set -x -e docker build \ -f tools/docker/dev_container.Dockerfile \ - --build-arg TF_VERSION=2.14.0 \ + --build-arg TF_VERSION=2.15.0 \ --build-arg TF_PACKAGE=tensorflow \ --build-arg PY_VERSION=$PY_VERSION \ --no-cache \ diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 73c03e05fb..9542e1365a 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.1.5-experimental ARG PY_VERSION -FROM tensorflow/build:2.14-python$PY_VERSION as base_install +FROM tensorflow/build:2.15-python$PY_VERSION as base_install ENV TF_NEED_CUDA="1" ARG PY_VERSION diff --git a/tools/docker/cpu_tests.Dockerfile b/tools/docker/cpu_tests.Dockerfile index 82783514b1..788e91d492 100644 --- a/tools/docker/cpu_tests.Dockerfile +++ b/tools/docker/cpu_tests.Dockerfile @@ -1,7 +1,7 @@ #syntax=docker/dockerfile:1.1.5-experimental FROM python:3.9 as build_wheel -ARG TF_VERSION=2.14.0 +ARG TF_VERSION=2.15.0 RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION RUN apt-get update && apt-get install -y sudo rsync diff --git a/tools/install_deps/tensorflow-cpu.txt b/tools/install_deps/tensorflow-cpu.txt index 181c612983..ec368a0140 100644 --- a/tools/install_deps/tensorflow-cpu.txt +++ b/tools/install_deps/tensorflow-cpu.txt @@ -1 +1 @@ -tensorflow-cpu~=2.14.0 +tensorflow-cpu~=2.15.0 diff --git a/tools/install_deps/tensorflow.txt b/tools/install_deps/tensorflow.txt index c85301a95c..ed722745f5 100644 --- a/tools/install_deps/tensorflow.txt +++ b/tools/install_deps/tensorflow.txt @@ -1 +1 @@ -tensorflow~=2.14.0 \ No newline at end of file +tensorflow~=2.15.0 \ No newline at end of file diff --git a/tools/run_gpu_tests.sh b/tools/run_gpu_tests.sh index 2651c5bfbc..214afe0e3f 100644 --- a/tools/run_gpu_tests.sh +++ b/tools/run_gpu_tests.sh @@ -6,7 +6,7 @@ export DOCKER_BUILDKIT=1 docker build \ -f tools/docker/build_wheel.Dockerfile \ --target tfa_gpu_tests \ - --build-arg TF_VERSION=2.14.0 \ + --build-arg TF_VERSION=2.15.0 \ --build-arg PY_VERSION=3.9 \ -t tfa_gpu_tests ./ docker run --rm -t --gpus=all --shm-size=512m tfa_gpu_tests