From 45c598bea32615b49ef5efa983202fe5485f8f05 Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Wed, 13 Jan 2021 17:47:00 +0100 Subject: [PATCH 1/2] Compliancy with tf-nightly --- src/transformers/file_utils.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/transformers/file_utils.py b/src/transformers/file_utils.py index a194b38b84c8..85bb9af60989 100644 --- a/src/transformers/file_utils.py +++ b/src/transformers/file_utils.py @@ -89,10 +89,13 @@ try: _tf_version = importlib_metadata.version("tensorflow-cpu") except importlib_metadata.PackageNotFoundError: - _tf_version = None - _tf_available = False + try: + _tf_version = importlib_metadata.version("tf-nightly") + except importlib_metadata.PackageNotFoundError: + _tf_version = None + _tf_available = False if _tf_available: - if version.parse(_tf_version) < version.parse("2"): + if version.parse(_tf_version) < version.parse("2.3"): logger.info(f"TensorFlow found but with version {_tf_version}. Transformers requires version 2 minimum.") _tf_available = False else: From f672b13bf21bcb3a787e52d6b83df28f2ebd20fd Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Thu, 14 Jan 2021 10:30:28 +0100 Subject: [PATCH 2/2] Add more version + restore min version check --- src/transformers/file_utils.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/transformers/file_utils.py b/src/transformers/file_utils.py index 85bb9af60989..f365e469c31f 100644 --- a/src/transformers/file_utils.py +++ b/src/transformers/file_utils.py @@ -90,12 +90,21 @@ _tf_version = importlib_metadata.version("tensorflow-cpu") except importlib_metadata.PackageNotFoundError: try: - _tf_version = importlib_metadata.version("tf-nightly") + _tf_version = importlib_metadata.version("tensorflow-gpu") except importlib_metadata.PackageNotFoundError: - _tf_version = None - _tf_available = False + try: + _tf_version = importlib_metadata.version("tf-nightly") + except importlib_metadata.PackageNotFoundError: + try: + _tf_version = importlib_metadata.version("tf-nightly-cpu") + except importlib_metadata.PackageNotFoundError: + try: + _tf_version = importlib_metadata.version("tf-nightly-gpu") + except importlib_metadata.PackageNotFoundError: + _tf_version = None + _tf_available = False if _tf_available: - if version.parse(_tf_version) < version.parse("2.3"): + if version.parse(_tf_version) < version.parse("2"): logger.info(f"TensorFlow found but with version {_tf_version}. Transformers requires version 2 minimum.") _tf_available = False else: