Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VideoLlava imports #30867

Merged
merged 2 commits into from
May 16, 2024
Merged

Fix VideoLlava imports #30867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84ea6d4
Fix VideoLlava imports
amyeroberts May 16, 2024
651a1da
Update dummy objects
amyeroberts May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/transformers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,7 @@
_import_structure["models.swin2sr"].append("Swin2SRImageProcessor")
_import_structure["models.tvlt"].append("TvltImageProcessor")
_import_structure["models.tvp"].append("TvpImageProcessor")
_import_structure["models.video_llava"].append("VideoLlavaImageProcessor")
_import_structure["models.videomae"].extend(["VideoMAEFeatureExtractor", "VideoMAEImageProcessor"])
_import_structure["models.vilt"].extend(["ViltFeatureExtractor", "ViltImageProcessor", "ViltProcessor"])
_import_structure["models.vit"].extend(["ViTFeatureExtractor", "ViTImageProcessor"])
Expand Down Expand Up @@ -3243,7 +3244,6 @@
_import_structure["models.video_llava"].extend(
[
"VideoLlavaForConditionalGeneration",
"VideoLlavaImageProcessor",
"VideoLlavaPreTrainedModel",
"VideoLlavaProcessor",
]
Expand Down Expand Up @@ -5759,6 +5759,7 @@
from .models.swin2sr import Swin2SRImageProcessor
from .models.tvlt import TvltImageProcessor
from .models.tvp import TvpImageProcessor
from .models.video_llava import VideoLlavaImageProcessor
from .models.videomae import VideoMAEFeatureExtractor, VideoMAEImageProcessor
from .models.vilt import ViltFeatureExtractor, ViltImageProcessor, ViltProcessor
from .models.vit import ViTFeatureExtractor, ViTImageProcessor
Expand Down Expand Up @@ -7437,7 +7438,6 @@
)
from .models.video_llava import (
VideoLlavaForConditionalGeneration,
VideoLlavaImageProcessor,
VideoLlavaPreTrainedModel,
VideoLlavaProcessor,
)
Expand Down
7 changes: 0 additions & 7 deletions src/transformers/utils/dummy_pt_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8417,13 +8417,6 @@ def __init__(self, *args, **kwargs):
requires_backends(self, ["torch"])


class VideoLlavaImageProcessor(metaclass=DummyObject):
_backends = ["torch"]

def __init__(self, *args, **kwargs):
requires_backends(self, ["torch"])


class VideoLlavaPreTrainedModel(metaclass=DummyObject):
_backends = ["torch"]

Expand Down
7 changes: 7 additions & 0 deletions src/transformers/utils/dummy_vision_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,13 @@ def __init__(self, *args, **kwargs):
requires_backends(self, ["vision"])


class VideoLlavaImageProcessor(metaclass=DummyObject):
_backends = ["vision"]

def __init__(self, *args, **kwargs):
requires_backends(self, ["vision"])


class VideoMAEFeatureExtractor(metaclass=DummyObject):
_backends = ["vision"]

Expand Down
Loading