Unverified Commit 065729a6 authored by Matt's avatar Matt Committed by GitHub
Browse files

Remove ConversationalPipeline and Conversation object (#31165)

* Remove ConversationalPipeline and Conversation object, as they have been deprecated for some time and are due for removal

* Update not-doctested.txt

* Fix JA and ZH docs

* Fix JA and ZH docs some more

* Fix JA and ZH docs some more
parent 3a100582
...@@ -248,7 +248,6 @@ class TFT5ModelTest(TFModelTesterMixin, PipelineTesterMixin, unittest.TestCase): ...@@ -248,7 +248,6 @@ class TFT5ModelTest(TFModelTesterMixin, PipelineTesterMixin, unittest.TestCase):
all_generative_model_classes = (TFT5ForConditionalGeneration,) if is_tf_available() else () all_generative_model_classes = (TFT5ForConditionalGeneration,) if is_tf_available() else ()
pipeline_model_mapping = ( pipeline_model_mapping = (
{ {
"conversational": TFT5ForConditionalGeneration,
"feature-extraction": TFT5Model, "feature-extraction": TFT5Model,
"summarization": TFT5ForConditionalGeneration, "summarization": TFT5ForConditionalGeneration,
"text2text-generation": TFT5ForConditionalGeneration, "text2text-generation": TFT5ForConditionalGeneration,
...@@ -314,10 +313,6 @@ class TFT5ModelTest(TFModelTesterMixin, PipelineTesterMixin, unittest.TestCase): ...@@ -314,10 +313,6 @@ class TFT5ModelTest(TFModelTesterMixin, PipelineTesterMixin, unittest.TestCase):
def test_keras_save_load(self): def test_keras_save_load(self):
pass pass
@unittest.skip("Does not support conversations.")
def test_pipeline_conversational(self):
pass
class TFT5EncoderOnlyModelTester: class TFT5EncoderOnlyModelTester:
def __init__( def __init__(
...@@ -611,10 +606,6 @@ class TFT5GenerationIntegrationTests(unittest.TestCase): ...@@ -611,10 +606,6 @@ class TFT5GenerationIntegrationTests(unittest.TestCase):
expected_output_string = ["Ich liebe es so sehr!", "die Transformatoren sind wirklich erstaunlich"] expected_output_string = ["Ich liebe es so sehr!", "die Transformatoren sind wirklich erstaunlich"]
self.assertListEqual(expected_output_string, output_strings) self.assertListEqual(expected_output_string, output_strings)
@unittest.skip("Does not support conversations.")
def test_pipeline_conversational(self):
pass
@require_tf @require_tf
@require_sentencepiece @require_sentencepiece
......
...@@ -297,7 +297,6 @@ class UMT5ModelTest(ModelTesterMixin, GenerationTesterMixin, PipelineTesterMixin ...@@ -297,7 +297,6 @@ class UMT5ModelTest(ModelTesterMixin, GenerationTesterMixin, PipelineTesterMixin
all_generative_model_classes = (UMT5ForConditionalGeneration,) if is_torch_available() else () all_generative_model_classes = (UMT5ForConditionalGeneration,) if is_torch_available() else ()
pipeline_model_mapping = ( pipeline_model_mapping = (
{ {
"conversational": UMT5ForConditionalGeneration,
"feature-extraction": UMT5Model, "feature-extraction": UMT5Model,
"question-answering": UMT5ForQuestionAnswering, "question-answering": UMT5ForQuestionAnswering,
"summarization": UMT5ForConditionalGeneration, "summarization": UMT5ForConditionalGeneration,
......
This diff is collapsed.
...@@ -33,7 +33,6 @@ from transformers.utils import direct_transformers_import, logging ...@@ -33,7 +33,6 @@ from transformers.utils import direct_transformers_import, logging
from .pipelines.test_pipelines_audio_classification import AudioClassificationPipelineTests from .pipelines.test_pipelines_audio_classification import AudioClassificationPipelineTests
from .pipelines.test_pipelines_automatic_speech_recognition import AutomaticSpeechRecognitionPipelineTests from .pipelines.test_pipelines_automatic_speech_recognition import AutomaticSpeechRecognitionPipelineTests
from .pipelines.test_pipelines_conversational import ConversationalPipelineTests
from .pipelines.test_pipelines_depth_estimation import DepthEstimationPipelineTests from .pipelines.test_pipelines_depth_estimation import DepthEstimationPipelineTests
from .pipelines.test_pipelines_document_question_answering import DocumentQuestionAnsweringPipelineTests from .pipelines.test_pipelines_document_question_answering import DocumentQuestionAnsweringPipelineTests
from .pipelines.test_pipelines_feature_extraction import FeatureExtractionPipelineTests from .pipelines.test_pipelines_feature_extraction import FeatureExtractionPipelineTests
...@@ -65,7 +64,6 @@ from .pipelines.test_pipelines_zero_shot_object_detection import ZeroShotObjectD ...@@ -65,7 +64,6 @@ from .pipelines.test_pipelines_zero_shot_object_detection import ZeroShotObjectD
pipeline_test_mapping = { pipeline_test_mapping = {
"audio-classification": {"test": AudioClassificationPipelineTests}, "audio-classification": {"test": AudioClassificationPipelineTests},
"automatic-speech-recognition": {"test": AutomaticSpeechRecognitionPipelineTests}, "automatic-speech-recognition": {"test": AutomaticSpeechRecognitionPipelineTests},
"conversational": {"test": ConversationalPipelineTests},
"depth-estimation": {"test": DepthEstimationPipelineTests}, "depth-estimation": {"test": DepthEstimationPipelineTests},
"document-question-answering": {"test": DocumentQuestionAnsweringPipelineTests}, "document-question-answering": {"test": DocumentQuestionAnsweringPipelineTests},
"feature-extraction": {"test": FeatureExtractionPipelineTests}, "feature-extraction": {"test": FeatureExtractionPipelineTests},
...@@ -314,10 +312,6 @@ class PipelineTesterMixin: ...@@ -314,10 +312,6 @@ class PipelineTesterMixin:
yield copy.deepcopy(random.choice(examples)) yield copy.deepcopy(random.choice(examples))
out = [] out = []
if task == "conversational":
for item in pipeline(data(10), batch_size=4, max_new_tokens=5):
out.append(item)
else:
for item in pipeline(data(10), batch_size=4): for item in pipeline(data(10), batch_size=4):
out.append(item) out.append(item)
self.assertEqual(len(out), 10) self.assertEqual(len(out), 10)
...@@ -332,10 +326,6 @@ class PipelineTesterMixin: ...@@ -332,10 +326,6 @@ class PipelineTesterMixin:
def test_pipeline_automatic_speech_recognition(self): def test_pipeline_automatic_speech_recognition(self):
self.run_task_tests(task="automatic-speech-recognition") self.run_task_tests(task="automatic-speech-recognition")
@is_pipeline_test
def test_pipeline_conversational(self):
self.run_task_tests(task="conversational")
@is_pipeline_test @is_pipeline_test
@require_vision @require_vision
@require_timm @require_timm
......
...@@ -128,7 +128,6 @@ OBJECTS_TO_IGNORE = [ ...@@ -128,7 +128,6 @@ OBJECTS_TO_IGNORE = [
"ConvBertTokenizerFast", "ConvBertTokenizerFast",
"ConvNextConfig", "ConvNextConfig",
"ConvNextV2Config", "ConvNextV2Config",
"ConversationalPipeline",
"CpmAntTokenizer", "CpmAntTokenizer",
"CvtConfig", "CvtConfig",
"CvtModel", "CvtModel",
......
...@@ -918,7 +918,6 @@ src/transformers/pipelines/audio_classification.py ...@@ -918,7 +918,6 @@ src/transformers/pipelines/audio_classification.py
src/transformers/pipelines/audio_utils.py src/transformers/pipelines/audio_utils.py
src/transformers/pipelines/automatic_speech_recognition.py src/transformers/pipelines/automatic_speech_recognition.py
src/transformers/pipelines/base.py src/transformers/pipelines/base.py
src/transformers/pipelines/conversational.py
src/transformers/pipelines/depth_estimation.py src/transformers/pipelines/depth_estimation.py
src/transformers/pipelines/document_question_answering.py src/transformers/pipelines/document_question_answering.py
src/transformers/pipelines/feature_extraction.py src/transformers/pipelines/feature_extraction.py
......
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