Unverified Commit ec344b56 authored by amyeroberts's avatar amyeroberts Committed by GitHub
Browse files

Separate out kwargs in processor (#30193)

* Separate out kwargs in processor

* Fix up
parent fc8eda36
...@@ -92,15 +92,21 @@ class CLIPProcessor(ProcessorMixin): ...@@ -92,15 +92,21 @@ class CLIPProcessor(ProcessorMixin):
`None`). `None`).
- **pixel_values** -- Pixel values to be fed to a model. Returned when `images` is not `None`. - **pixel_values** -- Pixel values to be fed to a model. Returned when `images` is not `None`.
""" """
tokenizer_kwargs, image_processor_kwargs = {}, {}
if kwargs:
tokenizer_kwargs = {k: v for k, v in kwargs.items() if k not in self.image_processor._valid_processor_keys}
image_processor_kwargs = {
k: v for k, v in kwargs.items() if k in self.image_processor._valid_processor_keys
}
if text is None and images is None: if text is None and images is None:
raise ValueError("You have to specify either text or images. Both cannot be none.") raise ValueError("You have to specify either text or images. Both cannot be none.")
if text is not None: if text is not None:
encoding = self.tokenizer(text, return_tensors=return_tensors, **kwargs) encoding = self.tokenizer(text, return_tensors=return_tensors, **tokenizer_kwargs)
if images is not None: if images is not None:
image_features = self.image_processor(images, return_tensors=return_tensors, **kwargs) image_features = self.image_processor(images, return_tensors=return_tensors, **image_processor_kwargs)
if text is not None and images is not None: if text is not None and images is not None:
encoding["pixel_values"] = image_features.pixel_values encoding["pixel_values"] = image_features.pixel_values
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment