Add compile test for fast image processor (#35184)
* add compile test for fast image processor * override pixtral test
This commit is contained in:
@@ -346,4 +346,7 @@ class PixtralImageProcessorFast(BaseImageProcessorFast):
|
|||||||
batch_images.append(images)
|
batch_images.append(images)
|
||||||
batch_image_sizes.append(image_sizes)
|
batch_image_sizes.append(image_sizes)
|
||||||
|
|
||||||
return BatchMixFeature(data={"pixel_values": batch_images, "image_sizes": batch_image_sizes}, tensor_type=None)
|
return BatchMixFeature(
|
||||||
|
data={"pixel_values": batch_images, "image_sizes": batch_image_sizes},
|
||||||
|
tensor_type=None,
|
||||||
|
)
|
||||||
|
|||||||
@@ -19,8 +19,15 @@ import unittest
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import requests
|
import requests
|
||||||
|
from packaging import version
|
||||||
|
|
||||||
from transformers.testing_utils import require_torch, require_vision
|
from transformers.testing_utils import (
|
||||||
|
require_torch,
|
||||||
|
require_torch_gpu,
|
||||||
|
require_vision,
|
||||||
|
slow,
|
||||||
|
torch_device,
|
||||||
|
)
|
||||||
from transformers.utils import is_torch_available, is_torchvision_available, is_vision_available
|
from transformers.utils import is_torch_available, is_torchvision_available, is_vision_available
|
||||||
|
|
||||||
from ...test_image_processing_common import ImageProcessingTestMixin, prepare_image_inputs
|
from ...test_image_processing_common import ImageProcessingTestMixin, prepare_image_inputs
|
||||||
@@ -157,6 +164,9 @@ class PixtralImageProcessingTest(ImageProcessingTestMixin, unittest.TestCase):
|
|||||||
self.assertTrue(hasattr(image_processing, "image_std"))
|
self.assertTrue(hasattr(image_processing, "image_std"))
|
||||||
self.assertTrue(hasattr(image_processing, "do_convert_rgb"))
|
self.assertTrue(hasattr(image_processing, "do_convert_rgb"))
|
||||||
|
|
||||||
|
# The following tests are overriden as PixtralImageProcessor can return images of different sizes
|
||||||
|
# and thus doesn't support returning batched tensors
|
||||||
|
|
||||||
def test_call_pil(self):
|
def test_call_pil(self):
|
||||||
for image_processing_class in self.image_processor_list:
|
for image_processing_class in self.image_processor_list:
|
||||||
# Initialize image_processing
|
# Initialize image_processing
|
||||||
@@ -273,6 +283,25 @@ class PixtralImageProcessingTest(ImageProcessingTestMixin, unittest.TestCase):
|
|||||||
|
|
||||||
self.assertTrue(torch.allclose(encoding_slow.pixel_values[0][0], encoding_fast.pixel_values[0][0], atol=1e-2))
|
self.assertTrue(torch.allclose(encoding_slow.pixel_values[0][0], encoding_fast.pixel_values[0][0], atol=1e-2))
|
||||||
|
|
||||||
|
@slow
|
||||||
|
@require_torch_gpu
|
||||||
|
@require_vision
|
||||||
|
def test_can_compile_fast_image_processor(self):
|
||||||
|
if self.fast_image_processing_class is None:
|
||||||
|
self.skipTest("Skipping compilation test as fast image processor is not defined")
|
||||||
|
if version.parse(torch.__version__) < version.parse("2.3"):
|
||||||
|
self.skipTest(reason="This test requires torch >= 2.3 to run.")
|
||||||
|
|
||||||
|
torch.compiler.reset()
|
||||||
|
input_image = torch.randint(0, 255, (3, 224, 224), dtype=torch.uint8)
|
||||||
|
image_processor = self.fast_image_processing_class(**self.image_processor_dict)
|
||||||
|
output_eager = image_processor(input_image, device=torch_device, return_tensors="pt")
|
||||||
|
|
||||||
|
image_processor = torch.compile(image_processor, mode="reduce-overhead")
|
||||||
|
output_compiled = image_processor(input_image, device=torch_device, return_tensors="pt")
|
||||||
|
|
||||||
|
self.assertTrue(torch.allclose(output_eager.pixel_values[0][0], output_compiled.pixel_values[0][0], atol=1e-4))
|
||||||
|
|
||||||
@unittest.skip(reason="PixtralImageProcessor doesn't treat 4 channel PIL and numpy consistently yet") # FIXME Amy
|
@unittest.skip(reason="PixtralImageProcessor doesn't treat 4 channel PIL and numpy consistently yet") # FIXME Amy
|
||||||
def test_call_numpy_4_channels(self):
|
def test_call_numpy_4_channels(self):
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -23,10 +23,18 @@ import warnings
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import requests
|
import requests
|
||||||
|
from packaging import version
|
||||||
|
|
||||||
from transformers import AutoImageProcessor, BatchFeature
|
from transformers import AutoImageProcessor, BatchFeature
|
||||||
from transformers.image_utils import AnnotationFormat, AnnotionFormat
|
from transformers.image_utils import AnnotationFormat, AnnotionFormat
|
||||||
from transformers.testing_utils import check_json_file_has_correct_format, require_torch, require_vision
|
from transformers.testing_utils import (
|
||||||
|
check_json_file_has_correct_format,
|
||||||
|
require_torch,
|
||||||
|
require_torch_gpu,
|
||||||
|
require_vision,
|
||||||
|
slow,
|
||||||
|
torch_device,
|
||||||
|
)
|
||||||
from transformers.utils import is_torch_available, is_vision_available
|
from transformers.utils import is_torch_available, is_vision_available
|
||||||
|
|
||||||
|
|
||||||
@@ -463,6 +471,25 @@ class ImageProcessingTestMixin:
|
|||||||
if not is_tested:
|
if not is_tested:
|
||||||
self.skipTest(reason="No validation found for `preprocess` method")
|
self.skipTest(reason="No validation found for `preprocess` method")
|
||||||
|
|
||||||
|
@slow
|
||||||
|
@require_torch_gpu
|
||||||
|
@require_vision
|
||||||
|
def test_can_compile_fast_image_processor(self):
|
||||||
|
if self.fast_image_processing_class is None:
|
||||||
|
self.skipTest("Skipping compilation test as fast image processor is not defined")
|
||||||
|
if version.parse(torch.__version__) < version.parse("2.3"):
|
||||||
|
self.skipTest(reason="This test requires torch >= 2.3 to run.")
|
||||||
|
|
||||||
|
torch.compiler.reset()
|
||||||
|
input_image = torch.randint(0, 255, (3, 224, 224), dtype=torch.uint8)
|
||||||
|
image_processor = self.fast_image_processing_class(**self.image_processor_dict)
|
||||||
|
output_eager = image_processor(input_image, device=torch_device, return_tensors="pt")
|
||||||
|
|
||||||
|
image_processor = torch.compile(image_processor, mode="reduce-overhead")
|
||||||
|
output_compiled = image_processor(input_image, device=torch_device, return_tensors="pt")
|
||||||
|
|
||||||
|
self.assertTrue(torch.allclose(output_eager.pixel_values, output_compiled.pixel_values, atol=1e-4))
|
||||||
|
|
||||||
|
|
||||||
class AnnotationFormatTestMixin:
|
class AnnotationFormatTestMixin:
|
||||||
# this mixin adds a test to assert that usages of the
|
# this mixin adds a test to assert that usages of the
|
||||||
|
|||||||
Reference in New Issue
Block a user