Skip to content

Commit 223b137

Browse files
itamarofacebook-github-bot
authored andcommitted
Cleanup transformers3 mess
Summary: transformers (as imported internally) has a convoluted and bloody history. the current state is that "transformers3" exists alongside "transformers", and makes things messy for upgrades and rollouts, especially considering the hacks applied to "transformers3" historically. this diff attempts to get closer to a cleaner state, by deleting "transformers3" after existing usage was migrated to "transformers" in the previous diff Reviewed By: lisroach, diliop Differential Revision: D68842833 fbshipit-source-id: 13b80b92ee1005f26e6a60907566bd5cc6167a86
1 parent a66c952 commit 223b137

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

mmf/modules/vit.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@
88
from omegaconf import OmegaConf
99
from packaging import version
1010
from torch import nn
11-
12-
try:
13-
from transformers3 import __version__ as transformers_version
14-
from transformers3.modeling_bert import BertSelfAttention
15-
except ImportError:
16-
from transformers import __version__ as transformers_version
17-
from transformers.modeling_bert import BertSelfAttention
11+
from transformers import __version__ as transformers_version
12+
from transformers.modeling_bert import BertSelfAttention
1813

1914

2015
if version.parse(transformers_version) >= version.parse("4.5.0"):
21-
try:
22-
import transformers3.models.vit.modeling_vit as vit
23-
except ImportError:
24-
import transformers.models.vit.modeling_vit as vit
16+
import transformers.models.vit.modeling_vit as vit
2517

2618
has_VIT = True
2719
else:

mmf/utils/patch.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ def patch_transformers(log_incompatible=False):
2929
to look for local folder at the last in path resolver. This is
3030
reverted back to original behavior at the end of the function.
3131
"""
32-
try:
33-
import transformers3 as transformers
34-
except ImportError:
35-
import transformers
32+
import transformers
3633

3734
# pl uses importlib to find_transformers spec throwing if None
3835
# this prevents mmf/__init__() from raising and value error

tests/modules/test_vit.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
@skip_if_old_transformers(min_version="4.5.0")
1313
class TestViT(unittest.TestCase):
1414
def setUp(self):
15-
try:
16-
import transformers3.models.vit.modeling_vit as vit
17-
except ImportError:
18-
import transformers.models.vit.modeling_vit as vit
15+
import transformers.models.vit.modeling_vit as vit
1916

2017
setup_proxy()
2118
config = {

0 commit comments

Comments
 (0)