From 61e191987d8aa0778e0f44613deaf7ad99253cab Mon Sep 17 00:00:00 2001 From: Stas Bekman Date: Wed, 9 Jun 2021 11:02:52 -0700 Subject: [PATCH] rm require_version_examples (#12088) --- .../legacy/pytorch-lightning/lightning_base.py | 4 ++-- .../rag-end2end-retriever/lightning_base.py | 4 ++-- examples/research_projects/rag/lightning_base.py | 4 ++-- .../seq2seq-distillation/lightning_base.py | 4 ++-- src/transformers/utils/versions.py | 6 ------ tests/test_versions_utils.py | 15 +-------------- 6 files changed, 9 insertions(+), 28 deletions(-) diff --git a/examples/legacy/pytorch-lightning/lightning_base.py b/examples/legacy/pytorch-lightning/lightning_base.py index a9a05fbf96..b7f53076e3 100644 --- a/examples/legacy/pytorch-lightning/lightning_base.py +++ b/examples/legacy/pytorch-lightning/lightning_base.py @@ -28,12 +28,12 @@ from transformers.optimization import ( get_linear_schedule_with_warmup, get_polynomial_decay_schedule_with_warmup, ) -from transformers.utils.versions import require_version_examples +from transformers.utils.versions import require_version logger = logging.getLogger(__name__) -require_version_examples("pytorch_lightning>=1.0.4") +require_version("pytorch_lightning>=1.0.4") MODEL_MODES = { "base": AutoModel, diff --git a/examples/research_projects/rag-end2end-retriever/lightning_base.py b/examples/research_projects/rag-end2end-retriever/lightning_base.py index 6f10fcaf7e..1df0fae584 100644 --- a/examples/research_projects/rag-end2end-retriever/lightning_base.py +++ b/examples/research_projects/rag-end2end-retriever/lightning_base.py @@ -29,12 +29,12 @@ from transformers.optimization import ( get_linear_schedule_with_warmup, get_polynomial_decay_schedule_with_warmup, ) -from transformers.utils.versions import require_version_examples +from transformers.utils.versions import require_version logger = logging.getLogger(__name__) -require_version_examples("pytorch_lightning>=1.0.4") +require_version("pytorch_lightning>=1.0.4") MODEL_MODES = { "base": AutoModel, diff --git a/examples/research_projects/rag/lightning_base.py b/examples/research_projects/rag/lightning_base.py index 04f82eb9e1..0d93626677 100644 --- a/examples/research_projects/rag/lightning_base.py +++ b/examples/research_projects/rag/lightning_base.py @@ -28,12 +28,12 @@ from transformers.optimization import ( get_linear_schedule_with_warmup, get_polynomial_decay_schedule_with_warmup, ) -from transformers.utils.versions import require_version_examples +from transformers.utils.versions import require_version logger = logging.getLogger(__name__) -require_version_examples("pytorch_lightning>=1.0.4") +require_version("pytorch_lightning>=1.0.4") MODEL_MODES = { "base": AutoModel, diff --git a/examples/research_projects/seq2seq-distillation/lightning_base.py b/examples/research_projects/seq2seq-distillation/lightning_base.py index a9a05fbf96..b7f53076e3 100644 --- a/examples/research_projects/seq2seq-distillation/lightning_base.py +++ b/examples/research_projects/seq2seq-distillation/lightning_base.py @@ -28,12 +28,12 @@ from transformers.optimization import ( get_linear_schedule_with_warmup, get_polynomial_decay_schedule_with_warmup, ) -from transformers.utils.versions import require_version_examples +from transformers.utils.versions import require_version logger = logging.getLogger(__name__) -require_version_examples("pytorch_lightning>=1.0.4") +require_version("pytorch_lightning>=1.0.4") MODEL_MODES = { "base": AutoModel, diff --git a/src/transformers/utils/versions.py b/src/transformers/utils/versions.py index 36125d8681..cb2fbdb9d8 100644 --- a/src/transformers/utils/versions.py +++ b/src/transformers/utils/versions.py @@ -118,9 +118,3 @@ def require_version_core(requirement): """require_version wrapper which emits a core-specific hint on failure""" hint = "Try: pip install transformers -U or pip install -e '.[dev]' if you're working with git master" return require_version(requirement, hint) - - -def require_version_examples(requirement): - """require_version wrapper which emits examples-specific hint on failure""" - hint = "Try: pip install -r examples/requirements.txt" - return require_version(requirement, hint) diff --git a/tests/test_versions_utils.py b/tests/test_versions_utils.py index 1d488b980b..6bd77218d6 100644 --- a/tests/test_versions_utils.py +++ b/tests/test_versions_utils.py @@ -15,12 +15,7 @@ import sys from transformers.testing_utils import TestCasePlus -from transformers.utils.versions import ( - importlib_metadata, - require_version, - require_version_core, - require_version_examples, -) +from transformers.utils.versions import importlib_metadata, require_version, require_version_core numpy_ver = importlib_metadata.version("numpy") @@ -88,14 +83,6 @@ class DependencyVersionCheckTest(TestCasePlus): except ValueError as e: self.assertIn("need one of ", str(e)) - def test_examples(self): - # the main functionality is tested in `test_core`, this is just the hint check - try: - require_version_examples("numpy>1000.4.5") - except ImportError as e: - self.assertIn("is required", str(e)) - self.assertIn("pip install -r examples/requirements.txt", str(e)) - def test_python(self): # matching requirement