Skip to content

Drop support for TF 2.1 #1738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
matrix:
os: ['macos-latest', 'windows-latest', 'ubuntu-18.04']
py-version: ['3.5', '3.6', '3.7', '3.8']
tf-version: ['2.1.0', '2.2.0rc3']
tf-version: ['2.2.0rc3']
fail-fast: false
steps:
- uses: actions/[email protected]
Expand All @@ -58,9 +58,7 @@ jobs:
with:
python-version: ${{ matrix.py-version }}
- name: Build wheels
if: |
(matrix.py-version != '3.8' || matrix.tf-version != '2.1.0')
&& (github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION)
if: github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION
env:
OS: ${{ runner.os }}
PY_VERSION: ${{ matrix.py-version }}
Expand All @@ -69,9 +67,7 @@ jobs:
shell: bash
run: bash .github/workflows/make_wheel_${OS}.sh
- uses: actions/upload-artifact@v1
if: |
(matrix.py-version != '3.8' || matrix.tf-version != '2.1.0')
&& (github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION)
if: github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION
with:
name: ${{ runner.os }}-${{ matrix.py-version }}-tf${{ matrix.tf-version }}-wheel
path: wheelhouse
Expand All @@ -88,7 +84,7 @@ jobs:
- uses: actions/download-artifact@v1
if: github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION
with:
name: ${{ matrix.os }}-${{ matrix.py-version }}-tf2.1.0-wheel
name: ${{ matrix.os }}-${{ matrix.py-version }}-tf2.2.0rc3-wheel
path: ./dist
- if: github.event_name != 'pull_request' || matrix.py-version == env.MIN_PY_VERSION || matrix.py-version == env.MAX_PY_VERSION
run: |
Expand Down
12 changes: 7 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ conda activate my_dev_environement
Just run from the root:

```
pip install tensorflow==2.2.0rc3
# you can use "pip install tensorflow-cpu==2.2.0rc3" too if you're not testing on gpu.
pip install -e ./
```

Expand Down Expand Up @@ -247,7 +249,7 @@ If you need a custom C++/Cuda op for your test, compile your ops with

```bash
python configure.py
pip install tensorflow==2.1.0 -e ./ -r tools/install_deps/pytest.txt
pip install tensorflow==2.2.0rc3 -e ./ -r tools/install_deps/pytest.txt
bash tools/install_so_files.sh # Linux/macos/WSL2
sh tools/install_so_files.sh # PowerShell
```
Expand Down Expand Up @@ -275,14 +277,14 @@ docker run --runtime=nvidia --rm -it -v ${PWD}:/addons -w /addons tensorflow/ten

Configure:
```
python3 -m pip install tensorflow==2.1.0
python3 -m pip install tensorflow==2.2.0rc3
python3 ./configure.py # Links project with TensorFlow dependency
```

Install in editable mode
```
python3 -m pip install -e .
python3 -m pip install pytest pytest-xdist
python3 -m pip install -r tools/install_deps/pytest.txt
```

Compile the custom ops
Expand All @@ -309,9 +311,9 @@ quickly, as Bazel has great support for caching and distributed testing.
To test with Bazel:

```
python3 -m pip install tensorflow==2.1.0
python3 -m pip install tensorflow==2.2.0rc3
python3 configure.py
python3 -m pip install pytest
python3 -m pip install -r tools/install_deps/pytest.txt
bazel test -c opt -k \
--test_timeout 300,450,1200,3600 \
--test_output=all \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ what it was tested against.
#### Python-Op Compatibility Matrix
| TFA Version | TensorFlow | Python |
|:----------------------- |:---|:---------- |
| tfa-nightly | 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 |
| tensorflow-addons-0.9.1 | 2.1 |3.5, 3.6, 3.7, 3.8 |
| tfa-nightly | 2.2 | 3.5, 3.6, 3.7, 3.8 |
| tensorflow-addons-0.9.1 | 2.1,2.2 |3.5, 3.6, 3.7, 3.8 |
| tensorflow-addons-0.8.3 | 2.1 |3.5, 3.6, 3.7 |
| tensorflow-addons-0.7.1 | 2.1 | 2.7, 3.5, 3.6, 3.7 |
| tensorflow-addons-0.6.0 | 2.0 | 2.7, 3.5, 3.6, 3.7 |
Expand Down Expand Up @@ -102,7 +102,7 @@ compiled differently. A typical reason for this would be conda installed TensorF
#### Custom-Op Compatibility Matrix
| TFA Version | TensorFlow | Compiler | cuDNN | CUDA |
|:----------------------- |:---- |:---------|:---------|:---------|
| tfa-nightly | 2.1 | GCC 7.3.1 | 7.6 | 10.1 |
| tfa-nightly | 2.2 | GCC 7.3.1 | 7.6 | 10.1 |
| tensorflow-addons-0.9.1 | 2.1 | GCC 7.3.1 | 7.6 | 10.1 |
| tensorflow-addons-0.8.3 | 2.1 | GCC 7.3.1 | 7.6 | 10.1 |
| tensorflow-addons-0.7.1 | 2.1 | GCC 7.3.1 | 7.6 | 10.1 |
Expand Down
2 changes: 1 addition & 1 deletion tensorflow_addons/utils/ensure_tf_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import tensorflow as tf

MIN_TF_VERSION = "2.1.0"
MIN_TF_VERSION = "2.2.0"
MAX_TF_VERSION = "2.3.0"


Expand Down
4 changes: 2 additions & 2 deletions tensorflow_addons/utils/resource_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import tensorflow as tf

MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.1.0"
MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.2.0"
MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.2.0"
MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.3.0"
abi_warning_already_raised = False
SKIP_CUSTOM_OPS = False

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/cpu_tests.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#syntax=docker/dockerfile:1.1.5-experimental
FROM python:3.5 as build_wheel

ARG TF_VERSION=2.1.0
ARG TF_VERSION=2.2.0rc3
RUN pip install tensorflow-cpu==$TF_VERSION

RUN apt-get update && apt-get install -y sudo rsync
Expand Down
2 changes: 1 addition & 1 deletion tools/install_deps/tensorflow-cpu.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tensorflow-cpu~=2.1.0
tensorflow-cpu~=2.2.0rc3
2 changes: 1 addition & 1 deletion tools/install_deps/tensorflow.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tensorflow~=2.1.0
tensorflow~=2.2.0rc3
2 changes: 1 addition & 1 deletion tools/run_gpu_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0 \
--build-arg TF_VERSION=2.2.0rc3 \
--build-arg PY_VERSION=3.5 \
-t tfa_gpu_tests ./
docker run --rm -t -v cache_bazel:/root/.cache/bazel --gpus=all tfa_gpu_tests