Skip to content

compat: avoid tf.__version__ in tf2 API lazy loader #3525

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
nfelt merged 1 commit into from
Apr 16, 2020
Merged

compat: avoid tf.__version__ in tf2 API lazy loader #3525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions tensorboard/compat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,9 @@ def tf2():
Raises:
ImportError: if a TF-2.0 API is not available.
"""
# Import the `tf` compat API from this file and check if it's already TF 2.0.
if tf.__version__.startswith("2."):
return tf
elif hasattr(tf, "compat") and hasattr(tf.compat, "v2"):
# As a fallback, try `tensorflow.compat.v2` if it's defined.
# Resolve the lazy `tf` compat API from earlier in this file and try to find
# tf.compat.v2. Don't check tf.__version__ since this is not always reliable
# if TF was built with tf_api_version!=2.
if hasattr(tf, "compat") and hasattr(tf.compat, "v2"):
return tf.compat.v2
raise ImportError("cannot import tensorflow 2.0 API")