Skip to content
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

Build against 2.14.0 #2850

Merged
merged 37 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
16000ef
Build against 2.14.0rc1
seanpmorgan Sep 19, 2023
37cbac2
Switch to 2.14.0 final
bhack Oct 10, 2023
8872bbc
Sync bazel version
bhack Oct 11, 2023
d6f5874
Test new bazel elements
bhack Oct 11, 2023
86779b1
Remove some line from bazel
bhack Oct 11, 2023
581ab54
Try to fix bazel
bhack Oct 11, 2023
0f67a5b
Another fix
bhack Oct 11, 2023
237a825
Another try
bhack Oct 11, 2023
86ebf1e
test
bhack Oct 11, 2023
ebf6b0e
Try
bhack Oct 11, 2023
5985e7b
Fxi typo
bhack Oct 11, 2023
f52e5b0
Test
bhack Oct 11, 2023
757da5c
fix
bhack Oct 11, 2023
7fccdd0
Typo
bhack Oct 11, 2023
d445275
Add rules python archive
bhack Oct 11, 2023
90b1f78
Add skylib
bhack Oct 11, 2023
594f9db
Add numpy dtype
bhack Oct 11, 2023
ba1000f
Add another line
bhack Oct 11, 2023
ab100b9
Add another line
bhack Oct 11, 2023
27b994f
Add requirements lock
bhack Oct 11, 2023
4714351
Test
bhack Oct 11, 2023
d2b99f2
Test
bhack Oct 11, 2023
944bc26
Upgrade python rules
bhack Oct 11, 2023
dae63a6
fix typo
bhack Oct 11, 2023
a7eb150
Revert
bhack Oct 11, 2023
ef98515
fix build
fsx950223 Oct 13, 2023
60dffdf
change 2.14.0rc1 to 2.14.0
fsx950223 Oct 13, 2023
fd0ae4d
fix test cases
fsx950223 Oct 13, 2023
9297f60
update bazelisk
fsx950223 Oct 14, 2023
2fbf3f4
Install deps to hermetic python
seanpmorgan Oct 14, 2023
554c26f
Update ubuntu
seanpmorgan Oct 14, 2023
637d55a
fix doc test
fsx950223 Oct 15, 2023
7a6c78f
Build with 2.12 bazel strategy
seanpmorgan Oct 15, 2023
a28d21f
Build with 2.12 docker image
seanpmorgan Oct 16, 2023
f67a50a
Debug GH action skip
seanpmorgan Oct 16, 2023
3f28249
Clear more disk-space
seanpmorgan Oct 16, 2023
aa412a2
Use tf2.14 docker image
seanpmorgan Oct 16, 2023
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
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.0rc1']
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.0rc1'
py-version: '3.9'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0rc1'
py-version: '3.10'
- os: 'macos-12'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0rc1'
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.0rc1'
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.0rc1']
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.0rc1'
py-version: '3.9'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0rc1'
py-version: '3.10'
- os: 'macOS'
cpu: 'arm64'
tf-version: '2.13.0'
tf-version: '2.14.0rc1'
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.0rc1
# you can use "pip install tensorflow-cpu==2.14.0rc1" 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.0rc1 -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.0rc1
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.0rc1
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 @@ -8,10 +8,10 @@ tf_configure(

http_archive(
name = "org_tensorflow",
sha256 = "c030cb1905bff1d2446615992aad8d8d85cbe90c4fb625cee458c63bf466bc8e",
strip_prefix = "tensorflow-2.12.0",
sha256 = "f0500371f6a1e3dfad2135b5cab75b25e71812160a2bde1dcd2ed32e4b8f6361",
strip_prefix = "tensorflow-2.14.0-rc1",
urls = [
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.12.0.tar.gz",
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.14.0-rc1.tar.gz",
],
)

Expand Down
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
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.0rc1"
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.0rc0 \
--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.0rc0
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.13.0
tensorflow-cpu~=2.14.0rc0
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.0rc1
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.0rc0 \
--build-arg PY_VERSION=3.9 \
-t tfa_gpu_tests ./
docker run --rm -t --gpus=all --shm-size=512m tfa_gpu_tests
Loading