From 9d1116e9951686f937d17697820117636bfc05a5 Mon Sep 17 00:00:00 2001 From: Sylvain Gugger <35901082+sgugger@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:57:24 -0500 Subject: [PATCH] Update deprecated load_module (#21651) --- src/transformers/processing_utils.py | 5 ++++- tests/pipelines/test_pipelines_common.py | 4 +++- utils/check_config_attributes.py | 5 ++++- utils/check_config_docstrings.py | 5 ++++- utils/check_copies.py | 5 ++++- utils/check_inits.py | 5 ++++- utils/check_repo.py | 5 ++++- utils/check_table.py | 5 ++++- utils/check_task_guides.py | 5 ++++- utils/update_metadata.py | 5 ++++- 10 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/transformers/processing_utils.py b/src/transformers/processing_utils.py index 4ad814a4c1..2cb4837e04 100644 --- a/src/transformers/processing_utils.py +++ b/src/transformers/processing_utils.py @@ -18,6 +18,7 @@ import importlib.util import os +import sys from pathlib import Path from .dynamic_module_utils import custom_object_save @@ -31,7 +32,9 @@ logger = logging.get_logger(__name__) spec = importlib.util.spec_from_file_location( "transformers", Path(__file__).parent / "__init__.py", submodule_search_locations=[Path(__file__).parent] ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] AUTO_TO_BASE_CLASS_MAPPING = { diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index 8e38c6dcd6..5f63caf6be 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -74,7 +74,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), submodule_search_locations=[PATH_TO_TRANSFORMERS], ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] class ANY: diff --git a/utils/check_config_attributes.py b/utils/check_config_attributes.py index 8f5b0999fb..d60e393dfb 100644 --- a/utils/check_config_attributes.py +++ b/utils/check_config_attributes.py @@ -17,6 +17,7 @@ import importlib import inspect import os import re +import sys # All paths are set with the intent you should run this script from the root of the repo with the command @@ -30,7 +31,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), submodule_search_locations=[PATH_TO_TRANSFORMERS], ) -transformers = spec.loader.load_module() +transformers = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers) +transformers = sys.modules["transformers"] CONFIG_MAPPING = transformers.models.auto.configuration_auto.CONFIG_MAPPING diff --git a/utils/check_config_docstrings.py b/utils/check_config_docstrings.py index ba6b1b72fc..de1c7cc036 100644 --- a/utils/check_config_docstrings.py +++ b/utils/check_config_docstrings.py @@ -17,6 +17,7 @@ import importlib import inspect import os import re +import sys # All paths are set with the intent you should run this script from the root of the repo with the command @@ -30,7 +31,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), submodule_search_locations=[PATH_TO_TRANSFORMERS], ) -transformers = spec.loader.load_module() +transformers = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers) +transformers = sys.modules["transformers"] CONFIG_MAPPING = transformers.models.auto.configuration_auto.CONFIG_MAPPING diff --git a/utils/check_copies.py b/utils/check_copies.py index b10da732d3..54ca2d67b5 100644 --- a/utils/check_copies.py +++ b/utils/check_copies.py @@ -18,6 +18,7 @@ import glob import importlib.util import os import re +import sys import black from doc_builder.style_doc import style_docstrings_in_code @@ -103,7 +104,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(TRANSFORMERS_PATH, "__init__.py"), submodule_search_locations=[TRANSFORMERS_PATH], ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] def _should_continue(line, indent): diff --git a/utils/check_inits.py b/utils/check_inits.py index 9495746c9f..e5044487f8 100644 --- a/utils/check_inits.py +++ b/utils/check_inits.py @@ -17,6 +17,7 @@ import collections import importlib.util import os import re +import sys from pathlib import Path @@ -279,7 +280,9 @@ def check_submodules(): os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), submodule_search_locations=[PATH_TO_TRANSFORMERS], ) - transformers = spec.loader.load_module() + transformers = importlib.util.module_from_spec(spec) + spec.loader.exec_module(transformers) + transformers = sys.modules["transformers"] module_not_registered = [ module diff --git a/utils/check_repo.py b/utils/check_repo.py index 77750530c0..641baee93e 100644 --- a/utils/check_repo.py +++ b/utils/check_repo.py @@ -17,6 +17,7 @@ import importlib import inspect import os import re +import sys import warnings from collections import OrderedDict from difflib import get_close_matches @@ -311,7 +312,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(PATH_TO_TRANSFORMERS, "__init__.py"), submodule_search_locations=[PATH_TO_TRANSFORMERS], ) -transformers = spec.loader.load_module() +transformers = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers) +transformers = sys.modules["transformers"] def check_model_list(): diff --git a/utils/check_table.py b/utils/check_table.py index 96d0cf23d2..3307209b66 100644 --- a/utils/check_table.py +++ b/utils/check_table.py @@ -18,6 +18,7 @@ import collections import importlib.util import os import re +import sys # All paths are set with the intent you should run this script from the root of the repo with the command @@ -68,7 +69,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(TRANSFORMERS_PATH, "__init__.py"), submodule_search_locations=[TRANSFORMERS_PATH], ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] # Thanks to https://stackoverflow.com/questions/29916065/how-to-do-camelcase-split-in-python diff --git a/utils/check_task_guides.py b/utils/check_task_guides.py index 78d3bbaa21..b7975cc4a2 100644 --- a/utils/check_task_guides.py +++ b/utils/check_task_guides.py @@ -16,6 +16,7 @@ import argparse import importlib.util import os +import sys # All paths are set with the intent you should run this script from the root of the repo with the command @@ -56,7 +57,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(TRANSFORMERS_PATH, "__init__.py"), submodule_search_locations=[TRANSFORMERS_PATH], ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] TASK_GUIDE_TO_MODELS = { "asr.mdx": transformers_module.models.auto.modeling_auto.MODEL_FOR_CTC_MAPPING_NAMES, diff --git a/utils/update_metadata.py b/utils/update_metadata.py index e52d93fe62..e6bc4d8593 100644 --- a/utils/update_metadata.py +++ b/utils/update_metadata.py @@ -18,6 +18,7 @@ import collections import importlib.util import os import re +import sys import tempfile import pandas as pd @@ -36,7 +37,9 @@ spec = importlib.util.spec_from_file_location( os.path.join(TRANSFORMERS_PATH, "__init__.py"), submodule_search_locations=[TRANSFORMERS_PATH], ) -transformers_module = spec.loader.load_module() +transformers_module = importlib.util.module_from_spec(spec) +spec.loader.exec_module(transformers_module) +transformers_module = sys.modules["transformers"] # Regexes that match TF/Flax/PT model names.