Unverified Commit c962c2ad authored by Jonas Kuball's avatar Jonas Kuball Committed by GitHub
Browse files

Adds missing module_specs for usages of _LazyModule (#15230)

* Add missing __spec__ for transformers.models.auto

* Moves the __spec__-test to the UnitTest class

* Adds module_spec to all instances of _LazyModule

* Refactors an old test from pytest to unittest
parent 6c7b68d4
...@@ -76,4 +76,4 @@ if TYPE_CHECKING: ...@@ -76,4 +76,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -78,4 +78,4 @@ if TYPE_CHECKING: ...@@ -78,4 +78,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -47,4 +47,4 @@ if TYPE_CHECKING: ...@@ -47,4 +47,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -50,4 +50,4 @@ if TYPE_CHECKING: ...@@ -50,4 +50,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -54,4 +54,4 @@ if TYPE_CHECKING: ...@@ -54,4 +54,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -49,4 +49,4 @@ if TYPE_CHECKING: ...@@ -49,4 +49,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -58,4 +58,4 @@ if TYPE_CHECKING: ...@@ -58,4 +58,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -73,4 +73,4 @@ if TYPE_CHECKING: ...@@ -73,4 +73,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -50,4 +50,4 @@ if TYPE_CHECKING: ...@@ -50,4 +50,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -97,4 +97,4 @@ if TYPE_CHECKING: ...@@ -97,4 +97,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -32,4 +32,4 @@ if TYPE_CHECKING: ...@@ -32,4 +32,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -32,4 +32,4 @@ if TYPE_CHECKING: ...@@ -32,4 +32,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -52,4 +52,4 @@ if TYPE_CHECKING: ...@@ -52,4 +52,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -86,4 +86,4 @@ if TYPE_CHECKING: ...@@ -86,4 +86,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -60,4 +60,4 @@ if TYPE_CHECKING: ...@@ -60,4 +60,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -104,4 +104,4 @@ if TYPE_CHECKING: ...@@ -104,4 +104,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -104,4 +104,4 @@ if TYPE_CHECKING: ...@@ -104,4 +104,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -47,4 +47,4 @@ if TYPE_CHECKING: ...@@ -47,4 +47,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -210,4 +210,4 @@ if TYPE_CHECKING: ...@@ -210,4 +210,4 @@ if TYPE_CHECKING:
else: else:
import sys import sys
sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure) sys.modules[__name__] = _LazyModule(__name__, globals()["__file__"], _import_structure, module_spec=__spec__)
...@@ -13,10 +13,12 @@ ...@@ -13,10 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import importlib
import os import os
import tempfile import tempfile
import unittest import unittest
import transformers.models.auto
from transformers.models.auto.configuration_auto import CONFIG_MAPPING, AutoConfig from transformers.models.auto.configuration_auto import CONFIG_MAPPING, AutoConfig
from transformers.models.bert.configuration_bert import BertConfig from transformers.models.bert.configuration_bert import BertConfig
from transformers.models.roberta.configuration_roberta import RobertaConfig from transformers.models.roberta.configuration_roberta import RobertaConfig
...@@ -31,6 +33,10 @@ class NewModelConfig(BertConfig): ...@@ -31,6 +33,10 @@ class NewModelConfig(BertConfig):
class AutoConfigTest(unittest.TestCase): class AutoConfigTest(unittest.TestCase):
def test_module_spec(self):
self.assertIsNotNone(transformers.models.auto.__spec__)
self.assertIsNotNone(importlib.util.find_spec("transformers.models.auto"))
def test_config_from_model_shortcut(self): def test_config_from_model_shortcut(self):
config = AutoConfig.from_pretrained("bert-base-uncased") config = AutoConfig.from_pretrained("bert-base-uncased")
self.assertIsInstance(config, BertConfig) self.assertIsInstance(config, BertConfig)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment