Build against TF 2.9

.github/workflows/release.yml

@@ -42,19 +42,19 @@ jobs:
         # https://github.com/bazelbuild/bazel/issues/14232#issuecomment-1011247429
         os: ['macos-10.15', 'windows-2019', 'ubuntu-18.04']
         py-version: ['3.7', '3.8', '3.9', '3.10']
-        tf-version: ['2.6.3', '2.8.0']
+        tf-version: ['2.7.1', '2.9.0rc0']
         cpu: ['x86']
         exclude:
           - py-version: '3.10'
-            tf-version: '2.6.3'
+            tf-version: '2.7.1'
         include:
           - os: 'macos-11'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0rc0'
             py-version: '3.8'
           - os: 'macos-11'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0rc0'
             py-version: '3.9'
       fail-fast: false
     steps:
@@ -99,16 +99,16 @@ jobs:
       matrix:
         os: ['macOS', 'Windows', 'Linux']
         py-version: ['3.7', '3.8', '3.9', '3.10']
-        tf-version: ['2.8.0']
+        tf-version: ['2.9.0rc0']
         cpu: ['x86']
         include:
           - os: 'macOS'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0rc0'
             py-version: '3.8'
           - os: 'macOS'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0rc0'
             py-version: '3.9'
       fail-fast: false
     if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release'

CONTRIBUTING.md

@@ -174,7 +174,7 @@ Just run from the root:
 
 ```bash
 pip install tensorflow==2.8
-# you can use "pip install tensorflow-cpu==2.8.0" too if you're not testing on gpu.
+# you can use "pip install tensorflow-cpu==2.9.0rc0" too if you're not testing on gpu.
 pip install -e ./
 ```
 

README.md

@@ -80,7 +80,8 @@ what it was tested against.
 #### Python Op Compatibility Matrix
 | TensorFlow Addons | TensorFlow | Python  |
 |:----------------------- |:---|:---------- |
-| tfa-nightly | 2.6, 2.7, 2.8 | 3.7, 3.8, 3.9, 3.10 | 
+| tfa-nightly | 2.7, 2.8, 2.9 | 3.7, 3.8, 3.9, 3.10 | 
+| tensorflow-addons-0.16.1 | 2.7, 2.8, 2.9 |3.7, 3.8, 3.9, 3.10 |
 | tensorflow-addons-0.16.1 | 2.6, 2.7, 2.8 |3.7, 3.8, 3.9, 3.10 |
 | tensorflow-addons-0.15.0 | 2.5, 2.6, 2.7 |3.7, 3.8, 3.9 |
 | tensorflow-addons-0.14.0 | 2.4, 2.5, 2.6 |3.6, 3.7, 3.8, 3.9 |

WORKSPACE

@@ -18,3 +18,34 @@ tf_configure(
 )
 
 cuda_configure(name = "local_config_cuda")
+
+http_archive(
+    name = "org_tensorflow",
+    sha256 = "7d736fa5ff3868516359d8370e7b57251b8080243fc38e8089ee0ceb8ee90264",
+    strip_prefix = "tensorflow-2.9.0-rc0",
+    urls = [
+        "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.9.0-rc0.tar.gz",
+    ],
+)
+
+load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
+
+tf_workspace3()
+
+load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2")
+
+tf_workspace2()
+
+load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1")
+
+tf_workspace1()
+
+load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
+
+tf_workspace0()
+
+load("//third_party/toolchains/tf:tf_configure.bzl", "tf_configure")
+
+tf_configure(name = "local_config_tf")
+
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")

tensorflow_addons/utils/resource_loader.py

@@ -20,8 +20,8 @@
 
 import tensorflow as tf
 
-INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.8.0"
-EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.9.0"
+INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.9.0rc0"
+EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.10.0"
 abi_warning_already_raised = False
 SKIP_CUSTOM_OPS = False
 

tensorflow_addons/utils/test_utils.py

@@ -26,7 +26,9 @@
 from tensorflow_addons.utils import resource_loader
 
 # TODO: copy the layer_test implementation in Addons.
-if tf.__version__[:3] > "2.5":
+if tf.__version__[:3] > "2.8":
+    from keras.testing_infra.test_utils import layer_test  # noqa: F401
+elif tf.__version__[:3] > "2.5":
     from keras.testing_utils import layer_test  # noqa: F401
 else:
     from tensorflow.python.keras.testing_utils import layer_test  # noqa: F401

tensorflow_addons/version.py

@@ -15,8 +15,8 @@
 """Define TensorFlow Addons version information."""
 
 # Required TensorFlow version [min, max)
-INCLUSIVE_MIN_TF_VERSION = "2.6.0"
-EXCLUSIVE_MAX_TF_VERSION = "2.9.0"
+INCLUSIVE_MIN_TF_VERSION = "2.7.0"
+EXCLUSIVE_MAX_TF_VERSION = "2.10.0"
 
 # We follow Semantic Versioning (https://semver.org/)
 _MAJOR_VERSION = "0"

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.8.0 \
+    --build-arg TF_VERSION=2.9.0rc0 \
     --build-arg TF_PACKAGE=tensorflow \
     --build-arg PY_VERSION=$PY_VERSION \
     --no-cache \

tools/docker/cpu_tests.Dockerfile

@@ -1,7 +1,7 @@
 #syntax=docker/dockerfile:1.1.5-experimental
 FROM python:3.7 as build_wheel
 
-ARG TF_VERSION=2.8.0
+ARG TF_VERSION=2.9.0rc0
 RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION
 
 RUN apt-get update && apt-get install -y sudo rsync

tools/install_deps/tensorflow-cpu.txt

@@ -1 +1 @@
-tensorflow-cpu~=2.8.0
+tensorflow-cpu~=2.9.0rc0

tools/install_deps/tensorflow.txt

@@ -1 +1 @@
-tensorflow~=2.8.0
+tensorflow~=2.9.0rc0

tools/install_so_files.sh

@@ -1,7 +1,7 @@
 set -e -x
 
 if [ "$TF_NEED_CUDA" == "1" ]; then
-  CUDA_FLAG="--crosstool_top=//build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11:toolchain"
+  CUDA_FLAG="--crosstool_top=@ubuntu20.04-gcc9_manylinux2014-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain"
 fi
 
 bazel build $CUDA_FLAG //tensorflow_addons/...

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.8.0 \
+       --build-arg TF_VERSION=2.9.0rc0 \
        --build-arg PY_VERSION=3.7 \
        -t tfa_gpu_tests ./
 docker run --rm -t --gpus=all tfa_gpu_tests