Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/make_wheel_macOS_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x
export TF_NEED_CUDA=0

python --version
python -m pip install --default-timeout=1000 delocate==0.10.2 wheel setuptools tensorflow==$TF_VERSION
python -m pip install --default-timeout=1000 delocate==0.10.3 wheel setuptools tensorflow==$TF_VERSION

python configure.py
# Setting DYLD_LIBRARY_PATH to help delocate finding tensorflow after the rpath invalidation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make_wheel_macOS_x86.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export TF_NEED_CUDA=0

# Install Deps
python --version
python -m pip install --default-timeout=1000 delocate==0.10.2 wheel setuptools tensorflow==$TF_VERSION
python -m pip install --default-timeout=1000 delocate==0.10.3 wheel setuptools tensorflow==$TF_VERSION

# Test
bash ./tools/testing/build_and_run_tests.sh $SKIP_CUSTOM_OP_TESTS
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ jobs:
# https://github.com/bazelbuild/bazel/issues/14232#issuecomment-1011247429
os: ['macos-12', 'windows-2019', 'ubuntu-18.04']
py-version: ['3.7', '3.8', '3.9', '3.10']
tf-version: ['2.8.2', '2.9.1', '2.10.0']
tf-version: ['2.9.3', '2.10.1', '2.11.0']
cpu: ['x86']
include:
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.8'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.9'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.10'
fail-fast: false
steps:
Expand Down Expand Up @@ -101,20 +101,20 @@ jobs:
matrix:
os: ['macOS', 'Windows', 'Linux']
py-version: ['3.7', '3.8', '3.9', '3.10']
tf-version: ['2.10.0']
tf-version: ['2.11.0']
cpu: ['x86']
include:
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.8'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.9'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.10.0'
tf-version: '2.11.0'
py-version: '3.10'
fail-fast: false
if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release'
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ conda activate my_dev_environement
Just run from the root:

```bash
pip install tensorflow==2.8
# you can use "pip install tensorflow-cpu==2.10.0" too if you're not testing on gpu.
pip install tensorflow==2.11.0
# you can use "pip install tensorflow-cpu==2.11.0" too if you're not testing on gpu.
pip install -e ./
```

Expand Down Expand Up @@ -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.10.0 -e ./ -r tools/install_deps/pytest.txt
pip install tensorflow==2.11.0 -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 @@ -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.10.0
python3 -m pip install tensorflow==2.11.0
python3 ./configure.py # Links project with TensorFlow dependency
```

Expand Down Expand Up @@ -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.10.0
python3 -m pip install tensorflow==2.11.0
python3 configure.py
python3 -m pip install -r tools/install_deps/pytest.txt
bazel test -c opt -k \
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ cuda_configure(name = "local_config_cuda")

http_archive(
name = "org_tensorflow",
sha256 = "b5a1bb04c84b6fe1538377e5a1f649bb5d5f0b2e3625a3c526ff3a8af88633e8",
strip_prefix = "tensorflow-2.10.0",
sha256 = "99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48",
strip_prefix = "tensorflow-2.11.0",
urls = [
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0.tar.gz",
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.tar.gz",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_keras_binary_classification_model(self, correlation_type):
tf.function(metric.update_state)(y, preds)
metric_value = tf.function(metric.result)()
scipy_value = self.scipy_corr[correlation_type](preds[:, 0], y[:, 0])[0]
np.testing.assert_almost_equal(metric_value, metric_history[-1], decimal=5)
np.testing.assert_almost_equal(metric_value, metric_history[-1], decimal=6)
np.testing.assert_almost_equal(metric_value, scipy_value, decimal=2)

@pytest.mark.parametrize("correlation_type", testing_types)
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

INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.10.0"
EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.11.0"
INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.11.0"
EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.12.0"
abi_warning_already_raised = False
SKIP_CUSTOM_OPS = False

Expand Down
4 changes: 2 additions & 2 deletions tensorflow_addons/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"""Define TensorFlow Addons version information."""

# Required TensorFlow version [min, max)
INCLUSIVE_MIN_TF_VERSION = "2.8.0"
EXCLUSIVE_MAX_TF_VERSION = "2.11.0"
INCLUSIVE_MIN_TF_VERSION = "2.9.0"
EXCLUSIVE_MAX_TF_VERSION = "2.12.0"

# We follow Semantic Versioning (https://semver.org/)
_MAJOR_VERSION = "0"
Expand Down
2 changes: 1 addition & 1 deletion tools/build_dev_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -x -e

docker build \
-f tools/docker/dev_container.Dockerfile \
--build-arg TF_VERSION=2.10.0 \
--build-arg TF_VERSION=2.11.0 \
--build-arg TF_PACKAGE=tensorflow \
--build-arg PY_VERSION=$PY_VERSION \
--no-cache \
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/build_wheel.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1.1.5-experimental
ARG PY_VERSION
FROM tensorflow/build:2.10-python$PY_VERSION as base_install
FROM tensorflow/build:2.11-python$PY_VERSION as base_install

ENV TF_NEED_CUDA="1"
ARG PY_VERSION
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.7 as build_wheel

ARG TF_VERSION=2.10.0
ARG TF_VERSION=2.11.0
RUN pip install --default-timeout=1000 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.10.0
tensorflow-cpu~=2.11.0
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.10.0
tensorflow~=2.11.0
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.10.0 \
--build-arg TF_VERSION=2.11.0 \
--build-arg PY_VERSION=3.7 \
-t tfa_gpu_tests ./
docker run --rm -t --gpus=all tfa_gpu_tests