Build against TF 2.9 (#2696)

* Build with TF 2.9
* Update cuda toolchain for manylinux2014

Author: seanpmorgan

.devcontainer/Dockerfile

@@ -1,34 +1,2 @@
 ARG IMAGE_TYPE=latest-cpu
 FROM tfaddons/dev_container:$IMAGE_TYPE
-
-ARG USERNAME=vscode
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-# Options for common package install script - SHA updated on release
-ARG INSTALL_ZSH="false"
-ARG UPGRADE_PACKAGES="false"
-ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/common-debian.sh"
-ARG COMMON_SCRIPT_SHA="dev-mode"
-
-# Configure apt and install packages
-RUN apt-get update \
-    && export DEBIAN_FRONTEND=noninteractive \
-    #
-    # Verify git, common tools / libs installed, add/modify non-root user, optionally install zsh
-    && apt-get -y install --no-install-recommends curl ca-certificates 2>&1 \
-    && curl -sSL  ${COMMON_SCRIPT_SOURCE} -o /tmp/common-setup.sh \
-    && ([ "${COMMON_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/common-setup.sh" | sha256sum -c -)) \
-    && /bin/bash /tmp/common-setup.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
-    && rm /tmp/common-setup.sh \
-    #
-    # *********************************************************************
-    # * Uncomment this section to use RUN to install other dependencies.  *
-    # * See https://aka.ms/vscode-remote/containers/dockerfile-run        *
-    # *********************************************************************
-    # && apt-get -y install --no-install-recommends <your-package-list-here>
-    #
-    # Clean up
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*

.devcontainer/devcontainer.json

@@ -55,5 +55,5 @@
 		"seccomp=unconfined" ],
 
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/pytest ./tensorflow_addons/layerscontainers/non-root.
-	"remoteUser": "vscode"
+	//"remoteUser": "vscode"
 }

.github/workflows/make_wheel_Windows_x86.sh

@@ -1,6 +1,7 @@
 set -e -x
 
 export TF_NEED_CUDA=0
+export PYTHON_BIN_PATH=$(which python)
 export BAZEL_VC="C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/"
 
 # Install Deps

.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.2', '2.8.1', '2.9.0']
         cpu: ['x86']
         exclude:
           - py-version: '3.10'
-            tf-version: '2.6.3'
+            tf-version: '2.7.2'
         include:
           - os: 'macos-11'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0'
             py-version: '3.8'
           - os: 'macos-11'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0'
             py-version: '3.9'
       fail-fast: false
     steps:
@@ -76,8 +76,7 @@ jobs:
         name: Setup Bazel
         # Ubuntu bazel is run inside of the docker image
         run: bash tools/install_deps/install_bazelisk.sh ./
-      - if: matrix.py-version != '3.9' || matrix.tf-version != '2.4.2'
-        name: Build wheels
+      - name: Build wheels
         env:
           OS: ${{ runner.os }}
           PY_VERSION: ${{ matrix.py-version }}
@@ -86,8 +85,7 @@ jobs:
           CPU: ${{ matrix.cpu }}
         shell: bash
         run: bash .github/workflows/make_wheel_${OS}_${CPU}.sh
-      - if: matrix.py-version != '3.9' || matrix.tf-version != '2.4.2'
-        uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v1
         with:
           name: ${{ runner.os }}-${{ matrix.py-version }}-tf${{ matrix.tf-version }}-${{ matrix.cpu }}-wheel
           path: wheelhouse
@@ -99,16 +97,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.0']
         cpu: ['x86']
         include:
           - os: 'macOS'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0'
             py-version: '3.8'
           - os: 'macOS'
             cpu: 'arm64'
-            tf-version: '2.8.0'
+            tf-version: '2.9.0'
             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.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.8 -e ./ -r tools/install_deps/pytest.txt
+pip install tensorflow==2.9 -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.8
+python3 -m pip install tensorflow==2.9
 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.8
+python3 -m pip install tensorflow==2.9
 python3 configure.py
 python3 -m pip install -r tools/install_deps/pytest.txt
 bazel test -c opt -k \

README.md

@@ -80,7 +80,7 @@ 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.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,28 @@ tf_configure(
 )
 
 cuda_configure(name = "local_config_cuda")
+
+http_archive(
+    name = "org_tensorflow",
+    sha256 = "8087cb0c529f04a4bfe480e49925cd64a904ad16d8ec66b98e2aacdfd53c80ff",
+    strip_prefix = "tensorflow-2.9.0",
+    urls = [
+        "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.9.0.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()

build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11/BUILD

@@ -23,6 +23,11 @@
 
 import tensorflow as tf
 
+try:
+    from packaging.version import Version
+except ImportError:
+    from distutils.version import LooseVersion as Version
+
 _TFA_BAZELRC = ".bazelrc"
 
 
@@ -127,9 +132,16 @@ def create_build_configuration():
     write_action_env("TF_SHARED_LIBRARY_NAME", get_shared_lib_name())
     write_action_env("TF_CXX11_ABI_FLAG", tf.sysconfig.CXX11_ABI_FLAG)
 
+    if Version(tf.__version__) >= Version("2.9.0"):
+        glibcxx = '"-D_GLIBCXX_USE_CXX11_ABI=1"'
+    else:
+        glibcxx = '"-D_GLIBCXX_USE_CXX11_ABI=0"'
+
     write("build --spawn_strategy=standalone")
     write("build --strategy=Genrule=standalone")
+    write("build  --experimental_repo_remote_exec")
     write("build -c opt")
+    write("build --cxxopt=" + glibcxx)
 
     if is_windows():
         write("build --config=windows")
@@ -172,7 +184,9 @@ def configure_cuda():
     write("test --config=cuda")
     write("build --config=cuda")
     write("build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true")
-    write("build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain")
+    write(
+        "build:cuda --crosstool_top=@ubuntu20.04-gcc9_manylinux2014-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain"
+    )
 
 
 if __name__ == "__main__":

build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11/cc_toolchain_config.bzl

@@ -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.0"
+EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.10.0"
 abi_warning_already_raised = False
 SKIP_CUSTOM_OPS = False
 

build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11/clang/bin/crosstool_wrapper_driver_is_not_gcc

@@ -25,11 +25,10 @@
 from tensorflow_addons import options
 from tensorflow_addons.utils import resource_loader
 
-# TODO: copy the layer_test implementation in Addons.
-if tf.__version__[:3] > "2.5":
-    from keras.testing_utils import layer_test  # noqa: F401
+if tf.__version__[:3] > "2.8":
+    from keras.testing_infra.test_utils import layer_test  # noqa: F401
 else:
-    from tensorflow.python.keras.testing_utils import layer_test  # noqa: F401
+    from keras.testing_utils import layer_test  # noqa: F401
 
 NUMBER_OF_WORKERS = int(os.environ.get("PYTEST_XDIST_WORKER_COUNT", "1"))
 WORKER_ID = int(os.environ.get("PYTEST_XDIST_WORKER", "gw0")[2])

configure.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"

tensorflow_addons/utils/resource_loader.py

@@ -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.0 \
     --build-arg TF_PACKAGE=tensorflow \
     --build-arg PY_VERSION=$PY_VERSION \
     --no-cache \

tensorflow_addons/utils/test_utils.py

@@ -7,6 +7,7 @@ ARG PY_VERSION
 ARG TF_VERSION
 
 # TODO: Remove this if tensorflow/build container removes their keras-nightly install
+# https://github.com/tensorflow/build/issues/78
 RUN python -m pip uninstall -y keras-nightly
 
 RUN python -m pip install --default-timeout=1000 tensorflow==$TF_VERSION
@@ -40,13 +41,13 @@ RUN bazel build \
         --noshow_loading_progress \
         --verbose_failures \
         --test_output=errors \
-        --crosstool_top=//build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11:toolchain \
+        --crosstool_top=@ubuntu20.04-gcc9_manylinux2014-cuda11.2-cudnn8.1-tensorrt7.2_config_cuda//crosstool:toolchain \
         build_pip_pkg && \
     # Package Whl
     bazel-bin/build_pip_pkg artifacts $NIGHTLY_FLAG
 
 RUN bash tools/releases/tf_auditwheel_patch.sh
-RUN python -m auditwheel repair --plat manylinux2010_x86_64 artifacts/*.whl
+RUN python -m auditwheel repair --plat manylinux2014_x86_64 artifacts/*.whl
 RUN ls -al wheelhouse/
 
 # -------------------------------------------------------------------

tensorflow_addons/version.py

@@ -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.0
 RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION
 
 RUN apt-get update && apt-get install -y sudo rsync

tools/build_dev_container.sh

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

tools/docker/build_wheel.Dockerfile

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

tools/docker/cpu_tests.Dockerfile

@@ -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/install_deps/tensorflow-cpu.txt

@@ -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.0 \
        --build-arg PY_VERSION=3.7 \
        -t tfa_gpu_tests ./
 docker run --rm -t --gpus=all tfa_gpu_tests