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.

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

maira2 support #1145

Merged
merged 2 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/source/openvino/models.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Here is the list of the supported architectures :
- Llava
- Llava-Next
- M2-M100
- MAIRA-2
- MBart
- MPNet
- MPT
Expand Down
9 changes: 9 additions & 0 deletions optimum/exporters/openvino/model_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,7 @@ def __init__(
float_dtype: str = "fp32",
behavior: LlavaConfigBehavior = LlavaConfigBehavior.VISION_EMBEDDINGS,
preprocessors: Optional[List[Any]] = None,
**kwargs,
):
super().__init__(
config=config,
Expand Down Expand Up @@ -1584,6 +1585,14 @@ class LlavaNextOpenVINOConfig(LlavaOpenVINOConfig):
MIN_TRANSFORMERS_VERSION = version.parse("4.40.0")


@register_in_tasks_manager(
"maira2", *["image-text-to-text", "text-generation", "text-generation-with-past"], library_name="transformers"
)
class MairaOpenVINOConfig(LlavaOpenVINOConfig):
MIN_TRANSFORMERS_VERSION = version.parse("4.46.0")
SUPPORTS_PAST = True


class InternVLChatConfigBehavior(str, enum.Enum):
LANGUAGE = "language"
VISION_EMBEDDINGS = "vision_embeddings"
Expand Down
1 change: 1 addition & 0 deletions optimum/exporters/openvino/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ def get_submodels(model):
"llava-next",
"llava-qwen2",
"internvl-chat",
"maira2",
"minicpmv",
"phi3-v",
"qwen2-vl",
Expand Down
22 changes: 22 additions & 0 deletions optimum/intel/openvino/modeling_visual_language.py
Original file line number Diff line number Diff line change
Expand Up @@ -2331,11 +2331,33 @@ def preprocess_inputs(
return inputs


class _OVMaira2ForCausalLM(_OVLlavaForCausalLM):
@staticmethod
def preprocess_inputs(
text: str,
image: Optional["Image"] = None,
processor: Optional[AutoImageProcessor] = None,
tokenizer: Optional[PreTrainedTokenizer] = None,
config: Optional[PretrainedConfig] = None,
):
if processor is None:
raise ValueError("processor is required")
if image is None:
return processor(text=text, return_tensors="pt")
processed_inputs = processor.format_and_preprocess_phrase_grounding_input(
frontal_image=image,
phrase=text,
return_tensors="pt",
)
return processed_inputs


MODEL_TYPE_TO_CLS_MAPPING = {
"llava": _OVLlavaForCausalLM,
"llava_next": _OVLlavaNextForCausalLM,
"minicpmv": _OVMiniCPMVForCausalLM,
"llava-qwen2": _OVNanoLlavaForCausalLM,
"maira2": _OVMaira2ForCausalLM,
"phi3_v": _OVPhi3VisionForCausalLM,
"internvl_chat": _OVInternVLForCausalLM,
"qwen2_vl": _OVQwen2VLForCausalLM,
Expand Down
6 changes: 3 additions & 3 deletions tests/openvino/test_modeling.py
Original file line number Diff line number Diff line change
Expand Up @@ -2110,9 +2110,9 @@ class OVModelForVisualCausalLMIntegrationTest(unittest.TestCase):
if is_transformers_version(">=", "4.40.0"):
SUPPORTED_ARCHITECTURES += ["llava_next", "nanollava"]
if is_transformers_version(">=", "4.45.0"):
SUPPORTED_ARCHITECTURES += ["minicpmv", "internvl2", "phi3_v", "qwen2_vl"]
SUPPORTED_ARCHITECTURES += ["minicpmv", "internvl2", "phi3_v", "qwen2_vl", "maira2"]
TASK = "image-text-to-text"
REMOTE_CODE_MODELS = ["internvl2", "minicpmv", "nanollava", "phi3_v"]
REMOTE_CODE_MODELS = ["internvl2", "minicpmv", "nanollava", "phi3_v", "maira2"]

IMAGE = Image.open(
requests.get(
Expand Down Expand Up @@ -2192,7 +2192,7 @@ def test_compare_to_transformers(self, model_arch):
with torch.no_grad():
transformers_outputs = transformers_model(**transformers_inputs)
self.assertTrue(
torch.allclose(ov_outputs.logits, transformers_outputs.logits, atol=1e-4),
torch.allclose(ov_outputs.logits, transformers_outputs.logits, atol=4e-3),
f"Max abs diff {(torch.abs(ov_outputs.logits - transformers_outputs.logits).max())}",
)

Expand Down
1 change: 1 addition & 0 deletions tests/openvino/utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
"opt": "hf-internal-testing/tiny-random-OPTModel",
"opt125m": "facebook/opt-125m",
"opt_gptq": "ybelkada/opt-125m-gptq-4bit",
"maira2": "katuni4ka/tiny-random-maira2",
"marian": "sshleifer/tiny-marian-en-de",
"mbart": "hf-internal-testing/tiny-random-mbart",
"minicpm": "katuni4ka/tiny-random-minicpm",
Expand Down
Loading