[Trainer] Undo #29896 (#30129)

* Undo

* Use tokenizer

* Undo data collator

examples/pytorch/image-classification/run_image_classification.py

@@ -411,7 +411,7 @@ def main():
         train_dataset=dataset["train"] if training_args.do_train else None,
         eval_dataset=dataset["validation"] if training_args.do_eval else None,
         compute_metrics=compute_metrics,
-        image_processor=image_processor,
+        tokenizer=image_processor,
         data_collator=collate_fn,
     )
 

examples/pytorch/image-pretraining/run_mae.py

@@ -369,7 +369,7 @@ def main():
         args=training_args,
         train_dataset=ds["train"] if training_args.do_train else None,
         eval_dataset=ds["validation"] if training_args.do_eval else None,
-        image_processor=image_processor,
+        tokenizer=image_processor,
         data_collator=collate_fn,
     )
 

examples/pytorch/image-pretraining/run_mim.py

@@ -458,7 +458,7 @@ def main():
         args=training_args,
         train_dataset=ds["train"] if training_args.do_train else None,
         eval_dataset=ds["validation"] if training_args.do_eval else None,
-        image_processor=image_processor,
+        tokenizer=image_processor,
         data_collator=collate_fn,
     )
 

examples/pytorch/semantic-segmentation/run_semantic_segmentation.py

@@ -510,7 +510,7 @@ def main():
         train_dataset=dataset["train"] if training_args.do_train else None,
         eval_dataset=dataset["validation"] if training_args.do_eval else None,
         compute_metrics=compute_metrics,
-        image_processor=image_processor,
+        tokenizer=image_processor,
         data_collator=default_data_collator,
     )