"tests/vscode:/vscode.git/clone" did not exist on "b19d64d852804b6bf36763f8429352cf7b5ce0cb"
Unverified Commit c70c88a2 authored by amyeroberts's avatar amyeroberts Committed by GitHub
Browse files

Fix processor __init__ bug if image processor undefined (#24554)

Make sure feature_extractor is defined in all cases
parent 903b97d8
...@@ -40,6 +40,7 @@ class AltCLIPProcessor(ProcessorMixin): ...@@ -40,6 +40,7 @@ class AltCLIPProcessor(ProcessorMixin):
tokenizer_class = ("XLMRobertaTokenizer", "XLMRobertaTokenizerFast") tokenizer_class = ("XLMRobertaTokenizer", "XLMRobertaTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -41,6 +41,7 @@ class ChineseCLIPProcessor(ProcessorMixin): ...@@ -41,6 +41,7 @@ class ChineseCLIPProcessor(ProcessorMixin):
tokenizer_class = ("BertTokenizer", "BertTokenizerFast") tokenizer_class = ("BertTokenizer", "BertTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -40,6 +40,7 @@ class CLIPProcessor(ProcessorMixin): ...@@ -40,6 +40,7 @@ class CLIPProcessor(ProcessorMixin):
tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast") tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -40,6 +40,7 @@ class CLIPSegProcessor(ProcessorMixin): ...@@ -40,6 +40,7 @@ class CLIPSegProcessor(ProcessorMixin):
tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast") tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -42,6 +42,7 @@ class DonutProcessor(ProcessorMixin): ...@@ -42,6 +42,7 @@ class DonutProcessor(ProcessorMixin):
tokenizer_class = "AutoTokenizer" tokenizer_class = "AutoTokenizer"
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -41,6 +41,7 @@ class FlavaProcessor(ProcessorMixin): ...@@ -41,6 +41,7 @@ class FlavaProcessor(ProcessorMixin):
tokenizer_class = ("BertTokenizer", "BertTokenizerFast") tokenizer_class = ("BertTokenizer", "BertTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -48,6 +48,7 @@ class LayoutLMv2Processor(ProcessorMixin): ...@@ -48,6 +48,7 @@ class LayoutLMv2Processor(ProcessorMixin):
tokenizer_class = ("LayoutLMv2Tokenizer", "LayoutLMv2TokenizerFast") tokenizer_class = ("LayoutLMv2Tokenizer", "LayoutLMv2TokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -48,6 +48,7 @@ class LayoutLMv3Processor(ProcessorMixin): ...@@ -48,6 +48,7 @@ class LayoutLMv3Processor(ProcessorMixin):
tokenizer_class = ("LayoutLMv3Tokenizer", "LayoutLMv3TokenizerFast") tokenizer_class = ("LayoutLMv3Tokenizer", "LayoutLMv3TokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -54,6 +54,7 @@ class MgpstrProcessor(ProcessorMixin): ...@@ -54,6 +54,7 @@ class MgpstrProcessor(ProcessorMixin):
char_tokenizer_class = "MgpstrTokenizer" char_tokenizer_class = "MgpstrTokenizer"
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -43,6 +43,7 @@ class OwlViTProcessor(ProcessorMixin): ...@@ -43,6 +43,7 @@ class OwlViTProcessor(ProcessorMixin):
tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast") tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -40,6 +40,7 @@ class TrOCRProcessor(ProcessorMixin): ...@@ -40,6 +40,7 @@ class TrOCRProcessor(ProcessorMixin):
tokenizer_class = "AutoTokenizer" tokenizer_class = "AutoTokenizer"
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -42,6 +42,7 @@ class ViltProcessor(ProcessorMixin): ...@@ -42,6 +42,7 @@ class ViltProcessor(ProcessorMixin):
tokenizer_class = ("BertTokenizer", "BertTokenizerFast") tokenizer_class = ("BertTokenizer", "BertTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -42,6 +42,7 @@ class VisionTextDualEncoderProcessor(ProcessorMixin): ...@@ -42,6 +42,7 @@ class VisionTextDualEncoderProcessor(ProcessorMixin):
tokenizer_class = "AutoTokenizer" tokenizer_class = "AutoTokenizer"
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
...@@ -40,6 +40,7 @@ class XCLIPProcessor(ProcessorMixin): ...@@ -40,6 +40,7 @@ class XCLIPProcessor(ProcessorMixin):
tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast") tokenizer_class = ("CLIPTokenizer", "CLIPTokenizerFast")
def __init__(self, image_processor=None, tokenizer=None, **kwargs): def __init__(self, image_processor=None, tokenizer=None, **kwargs):
feature_extractor = None
if "feature_extractor" in kwargs: if "feature_extractor" in kwargs:
warnings.warn( warnings.warn(
"The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`" "The `feature_extractor` argument is deprecated and will be removed in v5, use `image_processor`"
......
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