Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
transformers
Commits
c70c88a2
Unverified
Commit
c70c88a2
authored
Jun 28, 2023
by
amyeroberts
Committed by
GitHub
Jun 28, 2023
Browse files
Fix processor __init__ bug if image processor undefined (#24554)
Make sure feature_extractor is defined in all cases
parent
903b97d8
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
14 additions
and
0 deletions
+14
-0
src/transformers/models/altclip/processing_altclip.py
src/transformers/models/altclip/processing_altclip.py
+1
-0
src/transformers/models/chinese_clip/processing_chinese_clip.py
...ansformers/models/chinese_clip/processing_chinese_clip.py
+1
-0
src/transformers/models/clip/processing_clip.py
src/transformers/models/clip/processing_clip.py
+1
-0
src/transformers/models/clipseg/processing_clipseg.py
src/transformers/models/clipseg/processing_clipseg.py
+1
-0
src/transformers/models/donut/processing_donut.py
src/transformers/models/donut/processing_donut.py
+1
-0
src/transformers/models/flava/processing_flava.py
src/transformers/models/flava/processing_flava.py
+1
-0
src/transformers/models/layoutlmv2/processing_layoutlmv2.py
src/transformers/models/layoutlmv2/processing_layoutlmv2.py
+1
-0
src/transformers/models/layoutlmv3/processing_layoutlmv3.py
src/transformers/models/layoutlmv3/processing_layoutlmv3.py
+1
-0
src/transformers/models/mgp_str/processing_mgp_str.py
src/transformers/models/mgp_str/processing_mgp_str.py
+1
-0
src/transformers/models/owlvit/processing_owlvit.py
src/transformers/models/owlvit/processing_owlvit.py
+1
-0
src/transformers/models/trocr/processing_trocr.py
src/transformers/models/trocr/processing_trocr.py
+1
-0
src/transformers/models/vilt/processing_vilt.py
src/transformers/models/vilt/processing_vilt.py
+1
-0
src/transformers/models/vision_text_dual_encoder/processing_vision_text_dual_encoder.py
..._text_dual_encoder/processing_vision_text_dual_encoder.py
+1
-0
src/transformers/models/x_clip/processing_x_clip.py
src/transformers/models/x_clip/processing_x_clip.py
+1
-0
No files found.
src/transformers/models/altclip/processing_altclip.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/chinese_clip/processing_chinese_clip.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/clip/processing_clip.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/clipseg/processing_clipseg.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/donut/processing_donut.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/flava/processing_flava.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/layoutlmv2/processing_layoutlmv2.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/layoutlmv3/processing_layoutlmv3.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/mgp_str/processing_mgp_str.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/owlvit/processing_owlvit.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/trocr/processing_trocr.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/vilt/processing_vilt.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/vision_text_dual_encoder/processing_vision_text_dual_encoder.py
View file @
c70c88a2
...
@@ -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`"
...
...
src/transformers/models/x_clip/processing_x_clip.py
View file @
c70c88a2
...
@@ -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`"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment