mirror of
https://github.com/huggingface/transformers.git
synced 2025-07-06 06:10:04 +06:00

* current changes
* nit
* Add cross_attenttion_mask to processor
* multi-image fixed
* Add cross_attenttion_mask to processor
* cross attn works in all cases
* WIP refactoring function for image processor
* WIP refactoring image processor functions
* Refactor preprocess to use global loops instead of list nested list comps
* Docstrings
* Add channels unification
* fix dtype issues
* Update docsrings and format
* Consistent max_image_tiles
* current script
* updates
* Add convert to rgb
* Add image processor tests
* updates!
* update
* god damn it I am dumb sometimes
* Precompute aspect ratios
* now this works, full match
* fix 😉
* nits
* style
* fix model and conversion
* nit
* nit
* kinda works
* hack for sdpa non-contiguous bias
* nits here and there
* latest c hanges
* merge?
* run forward
* Add aspect_ratio_mask
* vision attention mask
* update script and config variable names
* nit
* nits
* be able to load
* style
* nits
* there
* nits
* make forward run
* small update
* enable generation multi-turn
* nit
* nit
* Clean up a bit for errors and typos
* A bit more constant fixes
* 90B keys and shapes match
* Fix for 11B model
* Fixup, remove debug part
* Docs
* Make max_aspect_ratio_id to be minimal
* Update image processing code to match new implementation
* Adjust conversion for final checkpoint state
* Change dim in repeat_interleave (accordig to meta code)
* tmp fix for num_tiles
* Fix for conversion (gate<->up, q/k_proj rope permute)
* nits
* codestyle
* Vision encoder fixes
* pass cross attn mask further
* Refactor aspect ratio mask
* Disable text-only generation
* Fix cross attention layers order, remove q/k norm rotation for cross atention layers
* Refactor gated position embeddings
* fix bugs but needs test with new weights
* rope scaling should be llama3
* Fix rope scaling name
* Remove debug for linear layer
* fix copies
* Make mask prepare private func
* Remove linear patch embed
* Make precomputed embeddings as nn.Embedding module
* MllamaPrecomputedAspectRatioEmbedding with config init
* Remove unused self.output_dim
* nit, intermediate layers
* Rename ln and pos_embed
* vision_chunk_size -> image_size
* return_intermediate -> intermediate_layers_indices
* vision_input_dim -> hidden_size
* Fix copied from statements
* fix most tests
* Fix more copied from
* layer_id->layer_idx
* Comment
* Fix tests for processor
* Copied from for _prepare_4d_causal_attention_mask_with_cache_position
* Style fix
* Add MllamaForCausalLM
* WIP fixing tests
* Remove duplicated layers
* Remove dummy file
* Fix style
* Fix consistency
* Fix some TODOs
* fix language_model instantiation, add docstring
* Move docstring, remove todos for precomputed embeds (we cannot init them properly)
* Add initial docstrings
* Fix
* fix some tests
* lets skip these
* nits, remove print, style
* Add one more copied from
* Improve test message
* Make validate func private
* Fix dummy objects
* Refactor `data_format` a bit + add comment
* typos/nits
Co-authored-by: Pablo Montalvo <39954772+molbap@users.noreply.github.com>
* fix dummy objects and imports
* Add chat template config json
* remove num_kv_heads from vision attention
* fix
* move some commits and add more tests
* fix test
* Remove `update_key_name` from modeling utils
* remove num-kv-heads again
* some prelimiary docs
* Update chat template + tests
* nit, conversion script max_num_tiles from params
* Fix warning for text-only generation
* Update conversion script for instruct models
* Update chat template in converstion + test
* add tests for CausalLM model
* model_max_length, avoid null chat_template
* Refactor conversion script
* Fix forward
* Fix integration tests
* Refactor vision config + docs
* Fix default
* Refactor text config
* Doc fixes
* Remove unused args, fix docs example
* Squashed commit of the following:
commit b51ce5a2efffbecdefbf6fc92ee87372ec9d8830
Author: qubvel <qubvel@gmail.com>
Date: Wed Sep 18 13:39:15 2024 +0000
Move model + add output hidden states and output attentions
* Fix num_channels
* Add mllama text and mllama vision models
* Fixing repo consistency
* Style fix
* Fixing repo consistency
* Fixing unused config params
* Fix failed tests after refactoring
* hidden_activation -> hidden_act for text mlp
* Remove from_pretrained from sub-configs
* Apply suggestions from code review
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Update src/transformers/models/mllama/convert_mllama_weights_to_hf.py
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Reuse lambda in conversion script
* Remove run.py
* Update docs/source/en/model_doc/mllama.md
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Update src/transformers/models/mllama/processing_mllama.py
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Remove unused LlamaTokenizerFast
* Fix logging
* Refactor gating
* Remove cycle for collecting intermediate states
* Refactor text-only check, add integration test for text-only
* Revert from pretrained to configs
* Fix example
* Add auto `bos_token` adding in processor
* Fix tips
* Update src/transformers/models/auto/tokenization_auto.py
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Enable supports_gradient_checkpointing model flag
* add eager/sdpa options
* don't skip attn tests and bring back GC skips (did i really remove those?)
* Fix signature, but get error with None gradient
* Fix output attention tests
* Disable GC back
* Change no split modules
* Fix dropout
* Style
* Add Mllama to sdpa list
* Add post init for vision model
* Refine config for MllamaForCausalLMModelTest and skipped tests for CausalLM model
* if skipped, say it, don't pass
* Clean vision tester config
* Doc for args
* Update tests/models/mllama/test_modeling_mllama.py
Co-authored-by: Arthur <48595927+ArthurZucker@users.noreply.github.com>
* Add cross_attention_mask to test
* typehint
* Remove todo
* Enable gradient checkpointing
* Docstring
* Style
* Fixing and skipping some tests for new cache
* Mark flaky test
* Skip `test_sdpa_can_compile_dynamic` test
* Fixing some offload tests
* Add direct GenerationMixin inheritance
* Remove unused code
* Add initializer_range to vision config
* update the test to make sure we show if split
* fix gc?
* Fix repo consistency
* Undo modeling utils debug changes
* Fix link
* mllama -> Mllama
* [mllama] -> [Mllama]
* Enable compile test for CausalLM model (text-only)
* Fix TextModel prefix
* Update doc
* Docs for forward, type hints, and vision model prefix
* make sure to reset
* fix init
* small script refactor and styling
* nit
* updates!
* some nits
* Interpolate embeddings for 560 size and update integration tests
* nit
* does not suppor static cache!
* update
* fix
* nit2
* this?
* Fix conversion
* Style
* 4x memory improvement with image cache AFAIK
* Token decorator for tests
* Skip failing tests
* update processor errors
* fix split issues
* style
* weird
* style
* fix failing tests
* update
* nit fixing the whisper tests
* fix path
* update
---------
Co-authored-by: raushan <raushan@huggingface.co>
Co-authored-by: pavel <ubuntu@ip-10-90-0-11.ec2.internal>
Co-authored-by: qubvel <qubvel@gmail.com>
Co-authored-by: Pablo Montalvo <39954772+molbap@users.noreply.github.com>
Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>
Co-authored-by: Pedro Cuenca <pedro@huggingface.co>
356 lines
15 KiB
Python
356 lines
15 KiB
Python
# coding=utf-8
|
|
# Copyright 2024 HuggingFace Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
|
|
import unittest
|
|
|
|
import numpy as np
|
|
|
|
from transformers.testing_utils import require_torch, require_vision
|
|
from transformers.utils import is_torch_available, is_vision_available
|
|
|
|
from ...test_image_processing_common import ImageProcessingTestMixin
|
|
|
|
|
|
if is_vision_available():
|
|
from PIL import Image
|
|
|
|
from transformers import MllamaImageProcessor
|
|
|
|
|
|
if is_torch_available():
|
|
import torch
|
|
|
|
|
|
class MllamaImageProcessingTester(unittest.TestCase):
|
|
def __init__(
|
|
self,
|
|
parent,
|
|
batch_size=7,
|
|
num_channels=3,
|
|
image_size=18,
|
|
num_images=18,
|
|
min_resolution=30,
|
|
max_resolution=400,
|
|
do_resize=True,
|
|
size=None,
|
|
do_rescale=True,
|
|
rescale_factor=1 / 255,
|
|
do_normalize=True,
|
|
image_mean=[0.5, 0.5, 0.5],
|
|
image_std=[0.5, 0.5, 0.5],
|
|
do_convert_rgb=True,
|
|
do_pad=True,
|
|
max_image_tiles=4,
|
|
):
|
|
super().__init__()
|
|
size = size if size is not None else {"height": 224, "width": 224}
|
|
self.parent = parent
|
|
self.batch_size = batch_size
|
|
self.num_channels = num_channels
|
|
self.max_image_tiles = max_image_tiles
|
|
self.image_size = image_size
|
|
self.num_images = num_images
|
|
self.min_resolution = min_resolution
|
|
self.max_resolution = max_resolution
|
|
self.do_resize = do_resize
|
|
self.size = size
|
|
self.do_normalize = do_normalize
|
|
self.image_mean = image_mean
|
|
self.image_std = image_std
|
|
self.do_rescale = do_rescale
|
|
self.rescale_factor = rescale_factor
|
|
self.do_convert_rgb = do_convert_rgb
|
|
self.do_pad = do_pad
|
|
|
|
def prepare_image_processor_dict(self):
|
|
return {
|
|
"do_convert_rgb": self.do_convert_rgb,
|
|
"do_resize": self.do_resize,
|
|
"size": self.size,
|
|
"do_rescale": self.do_rescale,
|
|
"rescale_factor": self.rescale_factor,
|
|
"do_normalize": self.do_normalize,
|
|
"image_mean": self.image_mean,
|
|
"image_std": self.image_std,
|
|
"do_pad": self.do_pad,
|
|
"max_image_tiles": self.max_image_tiles,
|
|
}
|
|
|
|
def prepare_image_inputs(
|
|
self,
|
|
batch_size=None,
|
|
min_resolution=None,
|
|
max_resolution=None,
|
|
num_channels=None,
|
|
num_images=None,
|
|
size_divisor=None,
|
|
equal_resolution=False,
|
|
numpify=False,
|
|
torchify=False,
|
|
):
|
|
"""This function prepares a list of PIL images, or a list of numpy arrays if one specifies numpify=True,
|
|
or a list of PyTorch tensors if one specifies torchify=True.
|
|
|
|
One can specify whether the images are of the same resolution or not.
|
|
"""
|
|
assert not (numpify and torchify), "You cannot specify both numpy and PyTorch tensors at the same time"
|
|
|
|
batch_size = batch_size if batch_size is not None else self.batch_size
|
|
min_resolution = min_resolution if min_resolution is not None else self.min_resolution
|
|
max_resolution = max_resolution if max_resolution is not None else self.max_resolution
|
|
num_channels = num_channels if num_channels is not None else self.num_channels
|
|
num_images = num_images if num_images is not None else self.num_images
|
|
|
|
images_list = []
|
|
for i in range(batch_size):
|
|
images = []
|
|
for j in range(num_images):
|
|
if equal_resolution:
|
|
width = height = max_resolution
|
|
else:
|
|
# To avoid getting image width/height 0
|
|
if size_divisor is not None:
|
|
# If `size_divisor` is defined, the image needs to have width/size >= `size_divisor`
|
|
min_resolution = max(size_divisor, min_resolution)
|
|
width, height = np.random.choice(np.arange(min_resolution, max_resolution), 2)
|
|
images.append(np.random.randint(255, size=(num_channels, width, height), dtype=np.uint8))
|
|
images_list.append(images)
|
|
|
|
if not numpify and not torchify:
|
|
# PIL expects the channel dimension as last dimension
|
|
images_list = [[Image.fromarray(np.moveaxis(image, 0, -1)) for image in images] for images in images_list]
|
|
|
|
if torchify:
|
|
images_list = [[torch.from_numpy(image) for image in images] for images in images_list]
|
|
|
|
return images_list
|
|
|
|
def expected_output_image_shape(self, images):
|
|
expected_output_image_shape = (
|
|
max(len(images) for images in images),
|
|
self.max_image_tiles,
|
|
self.num_channels,
|
|
self.size["height"],
|
|
self.size["width"],
|
|
)
|
|
return expected_output_image_shape
|
|
|
|
|
|
@require_torch
|
|
@require_vision
|
|
class MllamaImageProcessingTest(ImageProcessingTestMixin, unittest.TestCase):
|
|
image_processing_class = MllamaImageProcessor if is_vision_available() else None
|
|
|
|
def setUp(self):
|
|
super().setUp()
|
|
self.image_processor_tester = MllamaImageProcessingTester(self)
|
|
|
|
@property
|
|
def image_processor_dict(self):
|
|
return self.image_processor_tester.prepare_image_processor_dict()
|
|
|
|
def test_image_processor_properties(self):
|
|
image_processing = self.image_processing_class(**self.image_processor_dict)
|
|
self.assertTrue(hasattr(image_processing, "do_convert_rgb"))
|
|
self.assertTrue(hasattr(image_processing, "do_resize"))
|
|
self.assertTrue(hasattr(image_processing, "size"))
|
|
self.assertTrue(hasattr(image_processing, "do_rescale"))
|
|
self.assertTrue(hasattr(image_processing, "rescale_factor"))
|
|
self.assertTrue(hasattr(image_processing, "do_normalize"))
|
|
self.assertTrue(hasattr(image_processing, "image_mean"))
|
|
self.assertTrue(hasattr(image_processing, "image_std"))
|
|
self.assertTrue(hasattr(image_processing, "do_pad"))
|
|
self.assertTrue(hasattr(image_processing, "max_image_tiles"))
|
|
|
|
def test_call_numpy(self):
|
|
# Initialize image_processing
|
|
image_processing = self.image_processing_class(**self.image_processor_dict)
|
|
# create random numpy tensors
|
|
image_inputs = self.image_processor_tester.prepare_image_inputs(equal_resolution=False, numpify=True)
|
|
for sample_images in image_inputs:
|
|
for image in sample_images:
|
|
self.assertIsInstance(image, np.ndarray)
|
|
|
|
expected_output_image_shape = (
|
|
max(len(images) for images in image_inputs),
|
|
self.image_processor_tester.max_image_tiles,
|
|
self.image_processor_tester.num_channels,
|
|
self.image_processor_tester.size["height"],
|
|
self.image_processor_tester.size["width"],
|
|
)
|
|
|
|
# Test not batched input
|
|
encoded_images = image_processing(image_inputs[0], return_tensors="pt").pixel_values
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape([image_inputs[0]])
|
|
self.assertEqual(tuple(encoded_images.shape), (1, *expected_output_image_shape))
|
|
|
|
# Test batched
|
|
encoded_images = image_processing(image_inputs, return_tensors="pt").pixel_values
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape(image_inputs)
|
|
self.assertEqual(
|
|
tuple(encoded_images.shape), (self.image_processor_tester.batch_size, *expected_output_image_shape)
|
|
)
|
|
|
|
def test_call_pil(self):
|
|
# Initialize image_processing
|
|
image_processing = self.image_processing_class(**self.image_processor_dict)
|
|
# create random PIL images
|
|
image_inputs = self.image_processor_tester.prepare_image_inputs(equal_resolution=False)
|
|
for images in image_inputs:
|
|
for image in images:
|
|
self.assertIsInstance(image, Image.Image)
|
|
|
|
# Test not batched input
|
|
encoded_images = image_processing(image_inputs[0], return_tensors="pt").pixel_values
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape([image_inputs[0]])
|
|
self.assertEqual(tuple(encoded_images.shape), (1, *expected_output_image_shape))
|
|
|
|
# Test batched
|
|
encoded_images = image_processing(image_inputs, return_tensors="pt").pixel_values
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape(image_inputs)
|
|
self.assertEqual(
|
|
tuple(encoded_images.shape), (self.image_processor_tester.batch_size, *expected_output_image_shape)
|
|
)
|
|
|
|
def test_call_pytorch(self):
|
|
# Initialize image_processing
|
|
image_processing = self.image_processing_class(**self.image_processor_dict)
|
|
# create random PyTorch tensors
|
|
image_inputs = self.image_processor_tester.prepare_image_inputs(equal_resolution=False, torchify=True)
|
|
|
|
for images in image_inputs:
|
|
for image in images:
|
|
self.assertIsInstance(image, torch.Tensor)
|
|
|
|
# Test not batched input
|
|
encoded_images = image_processing(image_inputs[0], return_tensors="pt").pixel_values
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape([image_inputs[0]])
|
|
self.assertEqual(tuple(encoded_images.shape), (1, *expected_output_image_shape))
|
|
|
|
# Test batched
|
|
expected_output_image_shape = self.image_processor_tester.expected_output_image_shape(image_inputs)
|
|
encoded_images = image_processing(image_inputs, return_tensors="pt").pixel_values
|
|
self.assertEqual(
|
|
tuple(encoded_images.shape),
|
|
(self.image_processor_tester.batch_size, *expected_output_image_shape),
|
|
)
|
|
|
|
def test_call_numpy_4_channels(self):
|
|
self.skipTest("4 channels input is not supported yet")
|
|
|
|
def test_image_correctly_tiled(self):
|
|
def get_empty_tiles(pixel_values):
|
|
# image has shape batch_size, max_num_images, max_image_tiles, num_channels, height, width
|
|
# we want to get a binary mask of shape batch_size, max_num_images, max_image_tiles
|
|
# of empty tiles, i.e. tiles that are completely zero
|
|
return np.all(pixel_values == 0, axis=(3, 4, 5))
|
|
|
|
image_processor_dict = {**self.image_processor_dict, "size": {"height": 50, "width": 50}, "max_image_tiles": 4}
|
|
image_processor = self.image_processing_class(**image_processor_dict)
|
|
|
|
# image fits 2x2 tiles grid (width x height)
|
|
image = Image.new("RGB", (80, 95))
|
|
inputs = image_processor(image, return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values)[0, 0].tolist()
|
|
self.assertEqual(empty_tiles, [False, False, False, False])
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids[0, 0]
|
|
self.assertEqual(aspect_ratio_ids, 6)
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask[0, 0].tolist()
|
|
self.assertEqual(aspect_ratio_mask, [1, 1, 1, 1])
|
|
|
|
# image fits 3x1 grid (width x height)
|
|
image = Image.new("RGB", (101, 50))
|
|
inputs = image_processor(image, return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values)[0, 0].tolist()
|
|
self.assertEqual(empty_tiles, [False, False, False, True])
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids[0, 0]
|
|
self.assertEqual(aspect_ratio_ids, 3)
|
|
num_tiles = inputs.aspect_ratio_mask[0, 0].sum()
|
|
self.assertEqual(num_tiles, 3)
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask[0, 0].tolist()
|
|
self.assertEqual(aspect_ratio_mask, [1, 1, 1, 0])
|
|
|
|
# image fits 1x1 grid (width x height)
|
|
image = Image.new("RGB", (20, 39))
|
|
inputs = image_processor(image, return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values)[0, 0].tolist()
|
|
self.assertEqual(empty_tiles, [False, True, True, True])
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids[0, 0]
|
|
self.assertEqual(aspect_ratio_ids, 1)
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask[0, 0].tolist()
|
|
self.assertEqual(aspect_ratio_mask, [1, 0, 0, 0])
|
|
|
|
# image fits 2x1 grid (width x height)
|
|
image = Image.new("RGB", (51, 20))
|
|
inputs = image_processor(image, return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values)[0, 0].tolist()
|
|
self.assertEqual(empty_tiles, [False, False, True, True])
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids[0, 0]
|
|
self.assertEqual(aspect_ratio_ids, 2)
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask[0, 0].tolist()
|
|
self.assertEqual(aspect_ratio_mask, [1, 1, 0, 0])
|
|
|
|
# image is greater than 2x2 tiles grid (width x height)
|
|
image = Image.new("RGB", (150, 150))
|
|
inputs = image_processor(image, return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values)[0, 0].tolist()
|
|
self.assertEqual(empty_tiles, [False, False, False, False])
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids[0, 0]
|
|
self.assertEqual(aspect_ratio_ids, 6) # (2 - 1) * 4 + 2 = 6
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask[0, 0].tolist()
|
|
self.assertEqual(aspect_ratio_mask, [1, 1, 1, 1])
|
|
|
|
# batch of images
|
|
image1 = Image.new("RGB", (80, 95))
|
|
image2 = Image.new("RGB", (101, 50))
|
|
image3 = Image.new("RGB", (23, 49))
|
|
inputs = image_processor([[image1], [image2, image3]], return_tensors="np")
|
|
pixel_values = inputs.pixel_values
|
|
empty_tiles = get_empty_tiles(pixel_values).tolist()
|
|
expected_empty_tiles = [
|
|
# sample 1 with 1 image 2x2 grid
|
|
[
|
|
[False, False, False, False],
|
|
[True, True, True, True], # padding
|
|
],
|
|
# sample 2
|
|
[
|
|
[False, False, False, True], # 3x1
|
|
[False, True, True, True], # 1x1
|
|
],
|
|
]
|
|
self.assertEqual(empty_tiles, expected_empty_tiles)
|
|
aspect_ratio_ids = inputs.aspect_ratio_ids.tolist()
|
|
expected_aspect_ratio_ids = [[6, 0], [3, 1]]
|
|
self.assertEqual(aspect_ratio_ids, expected_aspect_ratio_ids)
|
|
aspect_ratio_mask = inputs.aspect_ratio_mask.tolist()
|
|
expected_aspect_ratio_mask = [
|
|
[
|
|
[1, 1, 1, 1],
|
|
[1, 0, 0, 0],
|
|
],
|
|
[
|
|
[1, 1, 1, 0],
|
|
[1, 0, 0, 0],
|
|
],
|
|
]
|
|
self.assertEqual(aspect_ratio_mask, expected_aspect_ratio_mask)
|