Build against TF2.5

.github/workflows/release.yml

@@ -16,15 +16,15 @@ on:
 
 env:
   MIN_PY_VERSION: '3.6'
-  MAX_PY_VERSION: '3.8'
+  MAX_PY_VERSION: '3.9'
 
 jobs:
   test-with-bazel:
     name: Test with bazel
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ env.MIN_PY_VERSION }}
       - name: Build wheels
@@ -39,8 +39,8 @@ jobs:
     strategy:
       matrix:
         os: ['macos-latest', 'windows-latest', 'ubuntu-18.04']
-        py-version: ['3.6', '3.7', '3.8']
-        tf-version: ['2.3.0', '2.4.1']
+        py-version: ['3.6', '3.7', '3.8', '3.9']
+        tf-version: ['2.3.0', '2.5.0']
       fail-fast: false
     steps:
       - uses: actions/github-script@0.3.0
@@ -54,22 +54,24 @@ jobs:
         shell: bash
         run: echo "NIGHTLY_FLAG=--nightly" >> $GITHUB_ENV
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.py-version }}
-      - name: Setup Bazel
+      - if: matrix.os != 'ubuntu-18.04'
+        name: Setup Bazel
         # Ubuntu bazel is run inside of the docker image
-        if: matrix.os != 'ubuntu-18.04'
         run: bash tools/install_deps/install_bazelisk.sh ./
-      - name: Build wheels
+      - if: matrix.py-version != '3.9' || matrix.tf-version != '2.3.0'
+        name: Build wheels
         env:
           OS: ${{ runner.os }}
           PY_VERSION: ${{ matrix.py-version }}
           TF_VERSION: ${{ matrix.tf-version }}
           NIGHTLY_TIME: ${{ steps.author-date.outputs.result }}
         shell: bash
         run: bash .github/workflows/make_wheel_${OS}.sh
-      - uses: actions/upload-artifact@v1
+      - if: matrix.py-version != '3.9' || matrix.tf-version != '2.3.0'
+        uses: actions/upload-artifact@v1
         with:
           name: ${{ runner.os }}-${{ matrix.py-version }}-tf${{ matrix.tf-version }}-wheel
           path: wheelhouse
@@ -80,8 +82,8 @@ jobs:
     strategy:
       matrix:
         os: ['macOS', 'Windows', 'Linux']
-        py-version: ['3.6', '3.7', '3.8']
-        tf-version: ['2.4.1']
+        py-version: ['3.6', '3.7', '3.8', '3.9']
+        tf-version: ['2.5.0']
       fail-fast: false
     if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release'
     steps:

CONTRIBUTING.md

@@ -173,8 +173,8 @@ conda activate my_dev_environement
 Just run from the root:
 
 ```bash
-pip install tensorflow==2.4.1
-# you can use "pip install tensorflow-cpu==2.4.1" too if you're not testing on gpu.
+pip install tensorflow==2.5.0
+# you can use "pip install tensorflow-cpu==2.5.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.4.1 -e ./ -r tools/install_deps/pytest.txt
+pip install tensorflow==2.5.0 -e ./ -r tools/install_deps/pytest.txt
 bash tools/install_so_files.sh  # Linux/macos/WSL2
 sh tools/install_so_files.sh    # PowerShell
 ```
@@ -285,12 +285,12 @@ docker run --rm -it -v ${PWD}:/addons -w /addons tfaddons/dev_container:latest-c
 
 GPU Docker: 
 ```bash
-docker run --gpus all --rm -it -v ${PWD}:/addons -w /addons gcr.io/tensorflow-testing/nosla-cuda11.0-cudnn8-ubuntu18.04-manylinux2010-multipython
+docker run --gpus all --rm -it -v ${PWD}:/addons -w /addons gcr.io/tensorflow-testing/nosla-cuda11.2-cudnn8.1-ubuntu18.04-manylinux2010-multipython
 ```
 
 Configure:
 ```bash
-python3 -m pip install tensorflow==2.4.1
+python3 -m pip install tensorflow==2.5.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.4.1
+python3 -m pip install tensorflow==2.5.0
 python3 configure.py
 python3 -m pip install -r tools/install_deps/pytest.txt
 bazel test -c opt -k \

build_deps/toolchains/gcc7_manylinux2010-nvcc-cuda11/BUILD

@@ -57,9 +57,9 @@ cc_toolchain_config(
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include",
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include-fixed",
         "/dt7/usr/include",
-        "/usr/local/cuda-11.0/targets/x86_64-linux/include",
-        "/usr/local/cuda-11.0/include",
-        "/usr/local/cuda-11.0/extras/CUPTI/include",
+        "/usr/local/cuda-11.2/targets/x86_64-linux/include",
+        "/usr/local/cuda-11.2/include",
+        "/usr/local/cuda-11.2/extras/CUPTI/include",
         "/usr/include",
     ],
     cpu = "local",
@@ -93,9 +93,9 @@ cc_toolchain_config(
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include",
         "/dt7/usr/lib/gcc/x86_64-pc-linux-gnu/7/include-fixed",
         "/dt7/usr/include",
-        "/usr/local/cuda-11.0/targets/x86_64-linux/include",
-        "/usr/local/cuda-11.0/include",
-        "/usr/local/cuda-11.0/extras/CUPTI/include",
+        "/usr/local/cuda-11.2/targets/x86_64-linux/include",
+        "/usr/local/cuda-11.2/include",
+        "/usr/local/cuda-11.2/extras/CUPTI/include",
         "/usr/include",
     ],
     cpu = "darwin",

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

@@ -41,9 +41,9 @@ import pipes
 CPU_COMPILER = ('/dt7/usr/bin/gcc')
 GCC_HOST_COMPILER_PATH = ('/dt7/usr/bin/gcc')
 
-NVCC_PATH = '/usr/local/cuda-11.0/bin/nvcc'
+NVCC_PATH = '/usr/local/cuda-11.2/bin/nvcc'
 PREFIX_DIR = os.path.dirname(GCC_HOST_COMPILER_PATH)
-NVCC_VERSION = '11.0'
+NVCC_VERSION = '11.2'
 
 def Log(s):
     print('gpus/crosstool: {0}'.format(s))

configure.py

@@ -166,7 +166,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"))
+    write_action_env("TF_CUDA_VERSION", os.getenv("TF_CUDA_VERSION", "11.2"))
     write_action_env("TF_CUDNN_VERSION", os.getenv("TF_CUDNN_VERSION", "8"))
 
     write("test --config=cuda")

tensorflow_addons/text/crf.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 import warnings
+from distutils.version import LooseVersion
 
 import numpy as np
 import tensorflow as tf
@@ -539,6 +540,11 @@ def crf_decode(
         warnings.warn(
             "CRF Decoding does not work with KerasTensors in TF2.4. The bug has since been fixed in tensorflow/tensorflow##45534"
         )
+
+    if LooseVersion(tf.__version__) >= LooseVersion("2.5.0"):
+        warnings.warn(
+            "CRF decoding models have serialization issues in TF >=2.5 . Please see isse #2476"
+        )
     sequence_length = tf.cast(sequence_length, dtype=tf.int32)
 
     # If max_seq_len is 1, we skip the algorithm and simply return the

tensorflow_addons/text/tests/crf_test.py

@@ -15,6 +15,7 @@
 """Tests for CRF."""
 
 import itertools
+from distutils.version import LooseVersion
 
 import pytest
 import numpy as np
@@ -501,6 +502,10 @@ def test_tf_function():
     tf.__version__[:3] == "2.4",
     reason="CRF Decode doesn't work in TF2.4, the issue was fixed in TF core, but didn't make the release",
 )
+@pytest.mark.skipif(
+    tf.__version__[:3] == "2.5",
+    reason="CRF decoding models have serialization issues in TF >=2.5 . Please see isse #2476",
+)
 def test_crf_decode_save_load(tmpdir):
     tf.keras.backend.clear_session()
     input_tensor = tf.keras.Input(shape=(10, 3), dtype=tf.float32, name="input_tensor")
@@ -519,7 +524,13 @@ def test_crf_decode_save_load(tmpdir):
         "input_tensor": np.random.random_sample((5, 10, 3)).astype(dtype=np.float32),
         "seq_len": np.array([10] * 5, dtype=np.int32),
     }
-    y_data = {"tf_op_layer_Mul": np.random.randint(0, 3, (5, 10))}
+
+    tensor_name = (
+        "tf.math.multiply"
+        if LooseVersion(tf.__version__) >= "2.5.0"
+        else "tf_op_layer_Mul"
+    )
+    y_data = {tensor_name: np.random.randint(0, 3, (5, 10))}
 
     model.fit(x_data, y_data)
     model.predict(

tensorflow_addons/utils/resource_loader.py

@@ -20,8 +20,8 @@
 
 import tensorflow as tf
 
-INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.4.0"
-EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.5.0"
+INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.5.0"
+EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.6.0"
 abi_warning_already_raised = False
 SKIP_CUSTOM_OPS = False
 

tensorflow_addons/version.py

@@ -16,7 +16,7 @@
 
 # Required TensorFlow version [min, max)
 INCLUSIVE_MIN_TF_VERSION = "2.3.0"
-EXCLUSIVE_MAX_TF_VERSION = "2.5.0"
+EXCLUSIVE_MAX_TF_VERSION = "2.6.0"
 
 # We follow Semantic Versioning (https://semver.org/)
 _MAJOR_VERSION = "0"

tools/build_dev_container.sh

@@ -4,7 +4,7 @@ set -x -e
 
 DOCKER_BUILDKIT=1 docker build \
     -f tools/docker/dev_container.Dockerfile \
-    --build-arg TF_VERSION=2.4.1 \
+    --build-arg TF_VERSION=2.5.0 \
     --build-arg TF_PACKAGE=tensorflow-cpu \
     --target dev_container_cpu \
     -t tfaddons/dev_container:latest-cpu ./

tools/docker/build_wheel.Dockerfile

@@ -1,7 +1,7 @@
 #syntax=docker/dockerfile:1.1.5-experimental
 ARG TF_VERSION
 ARG PY_VERSION
-FROM gcr.io/tensorflow-testing/nosla-cuda11.0-cudnn8-ubuntu18.04-manylinux2010-multipython as base_install
+FROM gcr.io/tensorflow-testing/nosla-cuda11.2-cudnn8.1-ubuntu18.04-manylinux2010-multipython as base_install
 ENV TF_NEED_CUDA="1"
 
 # Required for setuptools v50.0.0

tools/docker/cpu_tests.Dockerfile

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

tools/install_deps/pytest.txt

@@ -3,5 +3,5 @@ pytest-xdist~=1.31
 pytest-extra-durations~=0.1.3
 scikit-learn~=0.22
 scikit-image~=0.17.0
-Pillow~=7.0.0
+Pillow~=8.0.0
 tqdm>=4.36.1

tools/install_deps/tensorflow-cpu.txt

@@ -1 +1 @@
-tensorflow-cpu~=2.4.1
+tensorflow-cpu~=2.5.0

tools/install_deps/tensorflow.txt

@@ -1 +1 @@
-tensorflow~=2.4.1
+tensorflow~=2.5.0

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.4.1 \
+       --build-arg TF_VERSION=2.5.0 \
        --build-arg PY_VERSION=3.6 \
        -t tfa_gpu_tests ./
 docker run --rm -t --gpus=all tfa_gpu_tests