Skip to content

Upgrade to Tensorflow 2.13 #1305

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.

Sign up for GitHub

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 4 commits into from
Sep 25, 2023
Merged

Upgrade to Tensorflow 2.13 #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
426347e
Upgrade to Tensorflow 2.13
djherbis Sep 21, 2023
83a60db
remove wordbatch
djherbis Sep 21, 2023
61a0c85
Remove wordbatch test
djherbis Sep 21, 2023
b95c1cb
tf converter test fix
djherbis Sep 25, 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
8 changes: 3 additions & 5 deletions Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
{{ end }}

# Keep these variables in sync if base image is updated.
ENV TENSORFLOW_VERSION=2.12.0
ENV TENSORFLOW_VERSION=2.13.0
# See https://github.com/tensorflow/io#tensorflow-version-compatibility
ENV TENSORFLOW_IO_VERSION=0.32.0
ENV TENSORFLOW_IO_VERSION=0.34.0

# We need to redefine the ARG here to get the ARG value defined above the FROM instruction.
# See: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
Expand Down Expand Up @@ -406,7 +406,6 @@ RUN pip install annoy \
# Pandas data reader
pandas-datareader \
wordsegment \
wordbatch \
emoji \
# Add Japanese morphological analysis engine
janome \
Expand Down Expand Up @@ -520,8 +519,7 @@ RUN pip install flashtext \
pyarabic \
pandasql \
tensorflow_hub \
# b/300552705 Remove pin once we upgrade to TensorFlow 2.13
tensorflowjs==4.10 \
tensorflowjs \
jieba \
# ggplot is broken and main repo does not merge and release https://github.com/yhat/ggpy/pull/668
https://github.com/hbasria/ggpy/archive/0.11.5.zip \
Expand Down
6 changes: 3 additions & 3 deletions config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BASE_IMAGE_REPO=gcr.io/deeplearning-platform-release
BASE_IMAGE_TAG=m109
CPU_BASE_IMAGE_NAME=tf2-cpu.2-12.py310
GPU_BASE_IMAGE_NAME=tf2-gpu.2-12.py310
BASE_IMAGE_TAG=m111
CPU_BASE_IMAGE_NAME=tf2-cpu.2-13.py310
GPU_BASE_IMAGE_NAME=tf2-gpu.2-13.py310
LIGHTGBM_VERSION=3.3.2
TORCH_VERSION=2.0.0
TORCHAUDIO_VERSION=2.0.1
Expand Down
4 changes: 2 additions & 2 deletions tests/test_tensorflowjs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ class TestTensorflowjs(unittest.TestCase):
def test_version(self):
result = subprocess.run([
'tensorflowjs_converter',
'--version',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://b.corp.google.com/issues/301473408#comment3 for why I made this change, version is trying to load version from some Keras lib, but that doesn't exist so it exits with code 1.

'--help',
],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)

print("tensorflowjs_converter version: ", result)
print("tensorflowjs_converter help: ", result)

self.assertEqual(0, result.returncode)
self.assertIn(b'tensorflowjs', result.stdout)
14 changes: 0 additions & 14 deletions tests/test_wordbatch.py
View file
Open in desktop

This file was deleted.