From 0e353a4c8a49edea7df14f867f806dbffa1c0efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Mon, 20 Feb 2023 10:18:26 +0100 Subject: [PATCH 1/4] Removed useless check for backend --- src/transformers/models/graphormer/collating_graphormer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/transformers/models/graphormer/collating_graphormer.py b/src/transformers/models/graphormer/collating_graphormer.py index 53046e9026d0..e80b31e12a97 100644 --- a/src/transformers/models/graphormer/collating_graphormer.py +++ b/src/transformers/models/graphormer/collating_graphormer.py @@ -24,7 +24,6 @@ def convert_to_single_emb(x, offset: int = 512): def preprocess_item(item, keep_features=True): - requires_backends(preprocess_item, ["Cython"]) if not is_cython_available(): raise ImportError("Graphormer preprocessing needs Cython (pyximport)") From be3bf79aa44840a789448bd6266c6fa80525e05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Mon, 20 Feb 2023 10:28:13 +0100 Subject: [PATCH 2/4] fix style check for graphormer --- src/transformers/models/graphormer/collating_graphormer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transformers/models/graphormer/collating_graphormer.py b/src/transformers/models/graphormer/collating_graphormer.py index e80b31e12a97..b3dad30fa513 100644 --- a/src/transformers/models/graphormer/collating_graphormer.py +++ b/src/transformers/models/graphormer/collating_graphormer.py @@ -6,7 +6,7 @@ import numpy as np import torch -from ...utils import is_cython_available, requires_backends +from ...utils import is_cython_available if is_cython_available(): From 3d461e42e6881649814180b45b1fa0bafc330ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Wed, 22 Feb 2023 20:08:10 +0100 Subject: [PATCH 3/4] Reverted change and corrected requires_backend for cython --- src/transformers/models/graphormer/collating_graphormer.py | 5 ++--- src/transformers/utils/import_utils.py | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/transformers/models/graphormer/collating_graphormer.py b/src/transformers/models/graphormer/collating_graphormer.py index b3dad30fa513..e2cccc6668a4 100644 --- a/src/transformers/models/graphormer/collating_graphormer.py +++ b/src/transformers/models/graphormer/collating_graphormer.py @@ -6,7 +6,7 @@ import numpy as np import torch -from ...utils import is_cython_available +from ...utils import is_cython_available, requires_backends if is_cython_available(): @@ -24,8 +24,7 @@ def convert_to_single_emb(x, offset: int = 512): def preprocess_item(item, keep_features=True): - if not is_cython_available(): - raise ImportError("Graphormer preprocessing needs Cython (pyximport)") + requires_backends(preprocess_item, ["cython"]) if keep_features and "edge_attr" in item.keys(): # edge_attr edge_attr = np.asarray(item["edge_attr"], dtype=np.int64) diff --git a/src/transformers/utils/import_utils.py b/src/transformers/utils/import_utils.py index 628605aaf924..d2fb6c3cf763 100644 --- a/src/transformers/utils/import_utils.py +++ b/src/transformers/utils/import_utils.py @@ -992,6 +992,11 @@ def is_cython_available(): decord`. Please note that you may need to restart your runtime after installation. """ +CYTHON_IMPORT_ERROR = """ +{0} requires the Cython library but it was not found in your environment. You can install it with pip: `pip install +Cython`. Please note that you may need to restart your runtime after installation. +""" + BACKENDS_MAPPING = OrderedDict( [ ("bs4", (is_bs4_available, BS4_IMPORT_ERROR)), @@ -1023,6 +1028,7 @@ def is_cython_available(): ("accelerate", (is_accelerate_available, ACCELERATE_IMPORT_ERROR)), ("oneccl_bind_pt", (is_ccl_available, CCL_IMPORT_ERROR)), ("decord", (is_decord_available, DECORD_IMPORT_ERROR)), + ("cython", (is_cython_available, CYTHON_IMPORT_ERROR)) ] ) From efb559e00245cf63235d29eb07c1b5f8e7e55ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine?= Date: Wed, 22 Feb 2023 20:11:33 +0100 Subject: [PATCH 4/4] code qual --- src/transformers/utils/import_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transformers/utils/import_utils.py b/src/transformers/utils/import_utils.py index d2fb6c3cf763..45ee725778ab 100644 --- a/src/transformers/utils/import_utils.py +++ b/src/transformers/utils/import_utils.py @@ -1028,7 +1028,7 @@ def is_cython_available(): ("accelerate", (is_accelerate_available, ACCELERATE_IMPORT_ERROR)), ("oneccl_bind_pt", (is_ccl_available, CCL_IMPORT_ERROR)), ("decord", (is_decord_available, DECORD_IMPORT_ERROR)), - ("cython", (is_cython_available, CYTHON_IMPORT_ERROR)) + ("cython", (is_cython_available, CYTHON_IMPORT_ERROR)), ] )