From 9618cd696443ebaa3ab82eeb352cc2d8594e5274 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 9 Oct 2020 09:13:22 -0700 Subject: [PATCH] Import integration libraries first (#7650) * Import intergration libraries first * isort and black happiness * flake8 happiness * Add a test * Black reformat * Ignore import order in tests * A heavy-handed method of disabling comet for tests * Remove comet_ml tests * Run black on setup.py --- setup.py | 4 +--- src/transformers/integrations.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 7768012e9c..4be03b285b 100644 --- a/setup.py +++ b/setup.py @@ -134,9 +134,7 @@ setup( "sacremoses", ], extras_require=extras, - entry_points={ - "console_scripts": ["transformers-cli=transformers.commands.transformers_cli:main"] - }, + entry_points={"console_scripts": ["transformers-cli=transformers.commands.transformers_cli:main"]}, python_requires=">=3.6.0", classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/src/transformers/integrations.py b/src/transformers/integrations.py index 9e0ee0cbb0..27f815bd18 100644 --- a/src/transformers/integrations.py +++ b/src/transformers/integrations.py @@ -2,13 +2,11 @@ import math import os -from .file_utils import is_torch_tpu_available -from .trainer_callback import TrainerCallback -from .trainer_utils import PREFIX_CHECKPOINT_DIR, BestRun -from .utils import logging +# Import 3rd-party integrations first: try: + # Comet needs to be imported before any ML frameworks import comet_ml # noqa: F401 _has_comet = True @@ -53,6 +51,14 @@ except ImportError: except ImportError: _has_tensorboard = False +# No transformer imports above this point + +from .file_utils import is_torch_tpu_available +from .trainer_callback import TrainerCallback +from .trainer_utils import PREFIX_CHECKPOINT_DIR, BestRun +from .utils import logging + + logger = logging.get_logger(__name__)