Skip to content

Commit

Permalink
Build against 2.14.0 (#2850)
Browse files Browse the repository at this point in the history
* Build against 2.14.0

---------

Co-authored-by: bhack <[email protected]>
Co-authored-by: fsx950223 <[email protected]>
  • Loading branch information
3 people authored Oct 17, 2023
1 parent 664ac01 commit 52427df
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USE_BAZEL_VERSION=5.3.0
USE_BAZEL_VERSION=6.1.0
6 changes: 5 additions & 1 deletion .github/workflows/make_wheel_Linux_x86.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ set -e -x

df -h
docker info

# to get more disk space
rm -rf /usr/share/dotnet &
rm -rf "$AGENT_TOOLSDIRECTORY" &
rm -rf /opt/ghc &
rm -rf "/usr/local/share/boost" &
rm -rf /usr/share/dotnet

# Tests are ran as part of make_wheel target
DOCKER_BUILDKIT=1 docker build \
Expand Down
36 changes: 13 additions & 23 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,21 @@ jobs:
# To switch on windows-2022/latest, please verify the bazel version:
# https://github.com/bazelbuild/bazel/issues/14232#issuecomment-1011247429
os: ['macos-12', 'windows-2019', 'ubuntu-20.04']
py-version: ['3.8', '3.9', '3.10', '3.11']
tf-version: ['2.11.1', '2.12.0', '2.13.0']
py-version: ['3.9', '3.10', '3.11']
tf-version: ['2.12.1', '2.13.0', '2.14.0']
cpu: ['x86']
include:
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
py-version: '3.8'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.9'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.10'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.11'
fail-fast: false
steps:
Expand All @@ -73,7 +69,7 @@ jobs:
script: |
const commit_details = await github.git.getCommit({owner: context.repo.owner, repo: context.repo.repo, commit_sha: context.sha});
return commit_details.data.author.date
- if: matrix.tf-version != '2.13.0'
- if: matrix.tf-version != '2.14.0'
shell: bash
run: echo "SKIP_CUSTOM_OP_TESTS=--skip-custom-ops" >> $GITHUB_ENV
- if: github.event_name == 'push'
Expand All @@ -87,8 +83,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.11' || matrix.tf-version == '2.12.0' || matrix.tf-version == '2.13.0'
name: Build wheels
- name: Build wheels
env:
OS: ${{ runner.os }}
PY_VERSION: ${{ matrix.py-version }}
Expand All @@ -97,8 +92,7 @@ jobs:
CPU: ${{ matrix.cpu }}
shell: bash
run: bash .github/workflows/make_wheel_${OS}_${CPU}.sh
- if: matrix.py-version != '3.11' || matrix.tf-version == '2.12.0' || matrix.tf-version == '2.13.0'
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
Expand All @@ -109,25 +103,21 @@ jobs:
strategy:
matrix:
os: ['macOS', 'Windows', 'Linux']
py-version: ['3.8', '3.9', '3.10', '3.11']
tf-version: ['2.13.0']
py-version: ['3.9', '3.10', '3.11']
tf-version: ['2.14.0']
cpu: ['x86']
include:
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
py-version: '3.8'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.9'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.10'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0'
py-version: '3.11'
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.13.0
# you can use "pip install tensorflow-cpu==2.13.0" too if you're not testing on gpu.
pip install tensorflow==2.14.0
# you can use "pip install tensorflow-cpu==2.14.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.13.0 -e ./ -r tools/install_deps/pytest.txt
pip install tensorflow==2.14.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.13.0
python3 -m pip install tensorflow==2.14.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.13.0
python3 -m pip install tensorflow==2.14.0
python3 configure.py
python3 -m pip install -r tools/install_deps/pytest.txt
bazel test -c opt -k \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
typeguard>=2.7,<3.0.0
packaging
packaging
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def has_ext_modules(self):
"Intended Audience :: Science/Research",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down
6 changes: 3 additions & 3 deletions tensorflow_addons/activations/gelu.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ def gelu(x: TensorLike, approximate: bool = True) -> tf.Tensor:
Usage:
>>> x = tf.constant([-1.0, 0.0, 1.0])
>>> x = tf.constant([0.0, 0.0, 1.0])
>>> tfa.activations.gelu(x, approximate=False)
<tf.Tensor: shape=(3,), dtype=float32, numpy=array([-0.15865529, 0. , 0.8413447 ], dtype=float32)>
<tf.Tensor: shape=(3,), dtype=float32, numpy=array([0. , 0. , 0.8413447], dtype=float32)>
>>> tfa.activations.gelu(x, approximate=True)
<tf.Tensor: shape=(3,), dtype=float32, numpy=array([-0.15880796, 0. , 0.841192 ], dtype=float32)>
<tf.Tensor: shape=(3,), dtype=float32, numpy=array([0. , 0. , 0.841192], dtype=float32)>
Args:
x: A `Tensor`. Must be one of the following types:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_keras_binary_classification_model(self, correlation_type):
metric.reset_state()
# we decorate with tf.function to ensure the metric is also checked against graph mode.
# keras automatically decorates the metrics compiled within keras.Model.
tf.function(metric.update_state)(y, preds)
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=6)
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.13.0"
EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.14.0"
INCLUSIVE_MIN_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.14.0"
EXCLUSIVE_MAX_TF_VERSION_FOR_ABI_COMPATIBILITY = "2.15.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.11.0"
EXCLUSIVE_MAX_TF_VERSION = "2.14.0"
INCLUSIVE_MIN_TF_VERSION = "2.12.0"
EXCLUSIVE_MAX_TF_VERSION = "2.15.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.13.0 \
--build-arg TF_VERSION=2.14.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.13-python$PY_VERSION as base_install
FROM tensorflow/build:2.14-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.9 as build_wheel

ARG TF_VERSION=2.13.0
ARG TF_VERSION=2.14.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/install_bazelisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ case "$(uname -s)" in
esac

mkdir -p "${output_dir}"
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.3.0/${name}"
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.18.0/${name}"

mv "${name}" "${output_dir}/bazel"
chmod u+x "${output_dir}/bazel"
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.13.0
tensorflow-cpu~=2.14.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.13.0
tensorflow~=2.14.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.13.0 \
--build-arg TF_VERSION=2.14.0 \
--build-arg PY_VERSION=3.9 \
-t tfa_gpu_tests ./
docker run --rm -t --gpus=all --shm-size=512m tfa_gpu_tests

0 comments on commit 52427df

Please sign in to comment.