From 76f4bc5ce7d8c4b07cec318f74b67de22440e351 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 9 Apr 2022 13:06:02 +0200 Subject: [PATCH 1/2] fix import failer --- pytorch_lightning/utilities/imports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytorch_lightning/utilities/imports.py b/pytorch_lightning/utilities/imports.py index dd14e6b5057dc..a332e2cfaf2f6 100644 --- a/pytorch_lightning/utilities/imports.py +++ b/pytorch_lightning/utilities/imports.py @@ -54,7 +54,7 @@ def _module_available(module_path: str) -> bool: return False try: importlib.import_module(module_path) - except ModuleNotFoundError: + except (ImportError, ModuleNotFoundError): return False return True @@ -67,7 +67,7 @@ def _compare_version(package: str, op: Callable, version: str, use_base_version: """ try: pkg = importlib.import_module(package) - except (ModuleNotFoundError, DistributionNotFound): + except (ImportError, ModuleNotFoundError, DistributionNotFound): return False try: if hasattr(pkg, "__version__"): From b8f9149da119ea7951fc359e1825ca70b4ac7189 Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Sun, 10 Apr 2022 13:37:56 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Akihiro Nitta --- pytorch_lightning/utilities/imports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytorch_lightning/utilities/imports.py b/pytorch_lightning/utilities/imports.py index a332e2cfaf2f6..455008d9aab4a 100644 --- a/pytorch_lightning/utilities/imports.py +++ b/pytorch_lightning/utilities/imports.py @@ -54,7 +54,7 @@ def _module_available(module_path: str) -> bool: return False try: importlib.import_module(module_path) - except (ImportError, ModuleNotFoundError): + except ImportError: return False return True @@ -67,7 +67,7 @@ def _compare_version(package: str, op: Callable, version: str, use_base_version: """ try: pkg = importlib.import_module(package) - except (ImportError, ModuleNotFoundError, DistributionNotFound): + except (ImportError, DistributionNotFound): return False try: if hasattr(pkg, "__version__"):