Skip to content

Commit

Permalink
Upgrade to TF 2.1 (#61)
Browse files Browse the repository at this point in the history 
* upgrade to TF 2.1

* update Circle CI to only build for TF 2.1

* update tests to not (directly) use TF sessions

* [should fix] disable CC tests

* parameterize tests

* remove outdated CC test

* copy test util from TFE to avoid dependency

* ship without testing util

* bring back skipped tests
  • Loading branch information
@mortendahl
mortendahl authored Apr 17, 2020
1 parent 4bcd9f1 commit 0df074c
Show file tree
Hide file tree
Showing 14 changed files with 474 additions and 518 deletions.
178 changes: 23 additions & 155 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,9 @@ workflows:
quicktest:
jobs:
- build-linux:
name: build-linux-py3.6-tf1.14.0
name: build-linux-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
filters:
branches:
ignore: master
Expand All @@ -316,17 +316,17 @@ workflows:
name: bundle-linux-py3.6
python-version: "3.6"
requires:
- build-linux-py3.6-tf1.14.0
- build-linux-py3.6-tf2.1.0
filters:
branches:
ignore: master
tags:
ignore: /.*/

- whltest-linux:
name: whltest-linux-py3.6-tf1.14.0
name: whltest-linux-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
requires:
- bundle-linux-py3.6
filters:
Expand All @@ -338,27 +338,9 @@ workflows:
linux-py3.5:
jobs:
- build-linux:
name: build-linux-py3.5-tf1.13.1
name: build-linux-py3.5-tf2.1.0
python-version: "3.5"
tensorflow-version: "1.13.1"
filters:
branches:
only: master
tags:
only: /.*/
- build-linux:
name: build-linux-py3.5-tf1.13.2
python-version: "3.5"
tensorflow-version: "1.13.2"
filters:
branches:
only: master
tags:
only: /.*/
- build-linux:
name: build-linux-py3.5-tf1.14.0
python-version: "3.5"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
filters:
branches:
only: master
Expand All @@ -369,41 +351,17 @@ workflows:
name: bundle-linux-py3.5
python-version: "3.5"
requires:
- build-linux-py3.5-tf1.13.1
- build-linux-py3.5-tf1.13.2
- build-linux-py3.5-tf1.14.0
- build-linux-py3.5-tf2.1.0
filters:
branches:
only: master
tags:
only: /.*/

- whltest-linux:
name: whltest-linux-py3.5-tf1.13.1
python-version: "3.5"
tensorflow-version: "1.13.1"
requires:
- bundle-linux-py3.5
filters:
branches:
only: master
tags:
only: /.*/
- whltest-linux:
name: whltest-linux-py3.5-tf1.13.2
python-version: "3.5"
tensorflow-version: "1.13.2"
requires:
- bundle-linux-py3.5
filters:
branches:
only: master
tags:
only: /.*/
- whltest-linux:
name: whltest-linux-py3.5-tf1.14.0
name: whltest-linux-py3.5-tf2.1.0
python-version: "3.5"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
requires:
- bundle-linux-py3.5
filters:
Expand All @@ -415,9 +373,7 @@ workflows:
- store:
name: store-linux-py3.5
requires:
- whltest-linux-py3.5-tf1.13.1
- whltest-linux-py3.5-tf1.13.2
- whltest-linux-py3.5-tf1.14.0
- whltest-linux-py3.5-tf2.1.0
filters:
branches:
only: master
Expand Down Expand Up @@ -448,27 +404,9 @@ workflows:
linux-py3.6:
jobs:
- build-linux:
name: build-linux-py3.6-tf1.13.1
python-version: "3.6"
tensorflow-version: "1.13.1"
filters:
branches:
only: master
tags:
only: /.*/
- build-linux:
name: build-linux-py3.6-tf1.13.2
python-version: "3.6"
tensorflow-version: "1.13.2"
filters:
branches:
only: master
tags:
only: /.*/
- build-linux:
name: build-linux-py3.6-tf1.14.0
name: build-linux-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
filters:
branches:
only: master
Expand All @@ -479,41 +417,17 @@ workflows:
name: bundle-linux-py3.6
python-version: "3.6"
requires:
- build-linux-py3.6-tf1.13.1
- build-linux-py3.6-tf1.13.2
- build-linux-py3.6-tf1.14.0
- build-linux-py3.6-tf2.1.0
filters:
branches:
only: master
tags:
only: /.*/

- whltest-linux:
name: whltest-linux-py3.6-tf1.13.1
python-version: "3.6"
tensorflow-version: "1.13.1"
requires:
- bundle-linux-py3.6
filters:
branches:
only: master
tags:
only: /.*/
- whltest-linux:
name: whltest-linux-py3.6-tf1.13.2
python-version: "3.6"
tensorflow-version: "1.13.2"
requires:
- bundle-linux-py3.6
filters:
branches:
only: master
tags:
only: /.*/
- whltest-linux:
name: whltest-linux-py3.6-tf1.14.0
name: whltest-linux-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
requires:
- bundle-linux-py3.6
filters:
Expand All @@ -525,9 +439,7 @@ workflows:
- store:
name: store-linux-py3.6
requires:
- whltest-linux-py3.6-tf1.13.1
- whltest-linux-py3.6-tf1.13.2
- whltest-linux-py3.6-tf1.14.0
- whltest-linux-py3.6-tf2.1.0
filters:
branches:
only: master
Expand Down Expand Up @@ -558,27 +470,9 @@ workflows:
macos-py3.6:
jobs:
- build-macos:
name: build-macos-py3.6-tf1.13.1
python-version: "3.6"
tensorflow-version: "1.13.1"
filters:
branches:
only: master
tags:
only: /.*/
- build-macos:
name: build-macos-py3.6-tf1.13.2
python-version: "3.6"
tensorflow-version: "1.13.2"
filters:
branches:
only: master
tags:
only: /.*/
- build-macos:
name: build-macos-py3.6-tf1.14.0
name: build-macos-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
filters:
branches:
only: master
Expand All @@ -589,41 +483,17 @@ workflows:
name: bundle-macos-py3.6
python-version: "3.6"
requires:
- build-macos-py3.6-tf1.13.1
- build-macos-py3.6-tf1.13.2
- build-macos-py3.6-tf1.14.0
- build-macos-py3.6-tf2.1.0
filters:
branches:
only: master
tags:
only: /.*/

- whltest-macos:
name: whltest-macos-py3.6-tf1.13.1
python-version: "3.6"
tensorflow-version: "1.13.1"
requires:
- bundle-macos-py3.6
filters:
branches:
only: master
tags:
only: /.*/
- whltest-macos:
name: whltest-macos-py3.6-tf1.13.2
python-version: "3.6"
tensorflow-version: "1.13.2"
requires:
- bundle-macos-py3.6
filters:
branches:
only: master
tags:
only: /.*/
- whltest-macos:
name: whltest-macos-py3.6-tf1.14.0
name: whltest-macos-py3.6-tf2.1.0
python-version: "3.6"
tensorflow-version: "1.14.0"
tensorflow-version: "2.1.0"
requires:
- bundle-macos-py3.6
filters:
Expand All @@ -635,9 +505,7 @@ workflows:
- store:
name: store-macos-py3.6
requires:
- whltest-macos-py3.6-tf1.13.1
- whltest-macos-py3.6-tf1.13.2
- whltest-macos-py3.6-tf1.14.0
- whltest-macos-py3.6-tf2.1.0
filters:
branches:
only: master
Expand Down
Loading

0 comments on commit 0df074c

Please sign in to comment.