Skip to content

Commit

Permalink
Cleanup transformers3 mess
Browse files Browse the repository at this point in the history
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
  • Loading branch information
itamaro authored and facebook-github-bot committed Feb 3, 2025
1 parent a66c952 commit 223b137
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
14 changes: 3 additions & 11 deletions mmf/modules/vit.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,12 @@
from omegaconf import OmegaConf
from packaging import version
from torch import nn

try:
from transformers3 import __version__ as transformers_version
from transformers3.modeling_bert import BertSelfAttention
except ImportError:
from transformers import __version__ as transformers_version
from transformers.modeling_bert import BertSelfAttention
from transformers import __version__ as transformers_version
from transformers.modeling_bert import BertSelfAttention


if version.parse(transformers_version) >= version.parse("4.5.0"):
try:
import transformers3.models.vit.modeling_vit as vit
except ImportError:
import transformers.models.vit.modeling_vit as vit
import transformers.models.vit.modeling_vit as vit

has_VIT = True
else:
Expand Down
5 changes: 1 addition & 4 deletions mmf/utils/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ def patch_transformers(log_incompatible=False):
to look for local folder at the last in path resolver. This is
reverted back to original behavior at the end of the function.
"""
try:
import transformers3 as transformers
except ImportError:
import transformers
import transformers

# pl uses importlib to find_transformers spec throwing if None
# this prevents mmf/__init__() from raising and value error
Expand Down
5 changes: 1 addition & 4 deletions tests/modules/test_vit.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
@skip_if_old_transformers(min_version="4.5.0")
class TestViT(unittest.TestCase):
def setUp(self):
try:
import transformers3.models.vit.modeling_vit as vit
except ImportError:
import transformers.models.vit.modeling_vit as vit
import transformers.models.vit.modeling_vit as vit

setup_proxy()
config = {
Expand Down

0 comments on commit 223b137

Please sign in to comment.