From e325862be8fe4ad25d2cb18cebb18285b6fd01d9 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Mon, 15 May 2023 17:46:32 +0800 Subject: [PATCH] add pop for base class parameters Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/12622643 --- .../pipelines/nlp/dialog_intent_prediction_pipeline.py | 3 ++- .../nlp/document_grounded_dialog_generate_pipeline.py | 3 ++- .../nlp/document_grounded_dialog_rerank_pipeline.py | 3 ++- .../nlp/document_grounded_dialog_retrieval_pipeline.py | 3 ++- modelscope/pipelines/nlp/feature_extraction_pipeline.py | 3 ++- modelscope/pipelines/nlp/fill_mask_pipeline.py | 3 ++- .../pipelines/nlp/named_entity_recognition_pipeline.py | 3 ++- modelscope/pipelines/nlp/sentence_embedding_pipeline.py | 3 ++- modelscope/pipelines/nlp/siamese_uie_pipeline.py | 5 +++-- .../pipelines/nlp/table_question_answering_pipeline.py | 3 ++- modelscope/pipelines/nlp/text_generation_pipeline.py | 3 ++- modelscope/pipelines/nlp/text_ranking_pipeline.py | 3 ++- modelscope/pipelines/nlp/token_classification_pipeline.py | 4 +++- .../pipelines/nlp/user_satisfaction_estimation_pipeline.py | 3 ++- .../pipelines/nlp/zero_shot_classification_pipeline.py | 3 ++- 15 files changed, 32 insertions(+), 16 deletions(-) diff --git a/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py b/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py index fa7b23b8..a0e75638 100644 --- a/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py +++ b/modelscope/pipelines/nlp/dialog_intent_prediction_pipeline.py @@ -41,7 +41,8 @@ class DialogIntentPredictionPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) if preprocessor is None: self.preprocessor = DialogIntentPredictionPreprocessor( self.model.model_dir, **kwargs) diff --git a/modelscope/pipelines/nlp/document_grounded_dialog_generate_pipeline.py b/modelscope/pipelines/nlp/document_grounded_dialog_generate_pipeline.py index 8c773dfe..dfcd95e6 100644 --- a/modelscope/pipelines/nlp/document_grounded_dialog_generate_pipeline.py +++ b/modelscope/pipelines/nlp/document_grounded_dialog_generate_pipeline.py @@ -47,7 +47,8 @@ class DocumentGroundedDialogGeneratePipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) if preprocessor is None: self.preprocessor = DocumentGroundedDialogGeneratePreprocessor( diff --git a/modelscope/pipelines/nlp/document_grounded_dialog_rerank_pipeline.py b/modelscope/pipelines/nlp/document_grounded_dialog_rerank_pipeline.py index 8fdef380..29993594 100644 --- a/modelscope/pipelines/nlp/document_grounded_dialog_rerank_pipeline.py +++ b/modelscope/pipelines/nlp/document_grounded_dialog_rerank_pipeline.py @@ -65,7 +65,8 @@ class DocumentGroundedDialogRerankPipeline(Pipeline): device=device, auto_collate=auto_collate, seed=seed, - **kwarg) + compile=kwarg.pop('compile', False), + compile_options=kwarg.pop('compile_options', {})) self.model = model self.preprocessor = preprocessor self.device = device diff --git a/modelscope/pipelines/nlp/document_grounded_dialog_retrieval_pipeline.py b/modelscope/pipelines/nlp/document_grounded_dialog_retrieval_pipeline.py index c3fb1a32..31890a73 100644 --- a/modelscope/pipelines/nlp/document_grounded_dialog_retrieval_pipeline.py +++ b/modelscope/pipelines/nlp/document_grounded_dialog_retrieval_pipeline.py @@ -56,7 +56,8 @@ class DocumentGroundedDialogRetrievalPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) if preprocessor is None: self.preprocessor = DocumentGroundedDialogRetrievalPreprocessor( diff --git a/modelscope/pipelines/nlp/feature_extraction_pipeline.py b/modelscope/pipelines/nlp/feature_extraction_pipeline.py index 0f6979ba..c82db03c 100644 --- a/modelscope/pipelines/nlp/feature_extraction_pipeline.py +++ b/modelscope/pipelines/nlp/feature_extraction_pipeline.py @@ -54,7 +54,8 @@ class FeatureExtractionPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/fill_mask_pipeline.py b/modelscope/pipelines/nlp/fill_mask_pipeline.py index 6bc7622f..7b034786 100644 --- a/modelscope/pipelines/nlp/fill_mask_pipeline.py +++ b/modelscope/pipelines/nlp/fill_mask_pipeline.py @@ -63,7 +63,8 @@ class FillMaskPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py b/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py index 2cf30037..d035802b 100644 --- a/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py +++ b/modelscope/pipelines/nlp/named_entity_recognition_pipeline.py @@ -56,7 +56,8 @@ class NamedEntityRecognitionPipeline(TokenClassificationPipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/sentence_embedding_pipeline.py b/modelscope/pipelines/nlp/sentence_embedding_pipeline.py index 4e01397d..9d5cc80f 100644 --- a/modelscope/pipelines/nlp/sentence_embedding_pipeline.py +++ b/modelscope/pipelines/nlp/sentence_embedding_pipeline.py @@ -43,7 +43,8 @@ class SentenceEmbeddingPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/siamese_uie_pipeline.py b/modelscope/pipelines/nlp/siamese_uie_pipeline.py index cdbd9119..d548d2e8 100644 --- a/modelscope/pipelines/nlp/siamese_uie_pipeline.py +++ b/modelscope/pipelines/nlp/siamese_uie_pipeline.py @@ -21,7 +21,7 @@ from modelscope.outputs import OutputKeys from modelscope.pipelines.base import Pipeline from modelscope.pipelines.builder import PIPELINES from modelscope.preprocessors import Preprocessor, SiameseUiePreprocessor -from modelscope.utils.constant import Tasks +from modelscope.utils.constant import ModelFile, Tasks Input = Union[str, tuple, MsDataset, 'Image.Image', 'numpy.ndarray'] @@ -68,7 +68,8 @@ class SiameseUiePipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/table_question_answering_pipeline.py b/modelscope/pipelines/nlp/table_question_answering_pipeline.py index e174b762..7c064f57 100644 --- a/modelscope/pipelines/nlp/table_question_answering_pipeline.py +++ b/modelscope/pipelines/nlp/table_question_answering_pipeline.py @@ -52,7 +52,8 @@ class TableQuestionAnsweringPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/text_generation_pipeline.py b/modelscope/pipelines/nlp/text_generation_pipeline.py index 2b851dc4..d1aa5ff6 100644 --- a/modelscope/pipelines/nlp/text_generation_pipeline.py +++ b/modelscope/pipelines/nlp/text_generation_pipeline.py @@ -59,7 +59,8 @@ class TextGenerationPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/text_ranking_pipeline.py b/modelscope/pipelines/nlp/text_ranking_pipeline.py index a42baaa2..7539634e 100644 --- a/modelscope/pipelines/nlp/text_ranking_pipeline.py +++ b/modelscope/pipelines/nlp/text_ranking_pipeline.py @@ -44,7 +44,8 @@ class TextRankingPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/token_classification_pipeline.py b/modelscope/pipelines/nlp/token_classification_pipeline.py index daa4823c..9fd8e325 100644 --- a/modelscope/pipelines/nlp/token_classification_pipeline.py +++ b/modelscope/pipelines/nlp/token_classification_pipeline.py @@ -51,7 +51,9 @@ class TokenClassificationPipeline(Pipeline): preprocessor=preprocessor, config_file=config_file, device=device, - auto_collate=auto_collate) + auto_collate=auto_collate, + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) assert isinstance(self.model, Model), \ f'please check whether model config exists in {ModelFile.CONFIGURATION}' diff --git a/modelscope/pipelines/nlp/user_satisfaction_estimation_pipeline.py b/modelscope/pipelines/nlp/user_satisfaction_estimation_pipeline.py index 76fcd7a8..197a941f 100644 --- a/modelscope/pipelines/nlp/user_satisfaction_estimation_pipeline.py +++ b/modelscope/pipelines/nlp/user_satisfaction_estimation_pipeline.py @@ -51,7 +51,8 @@ class UserSatisfactionEstimationPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) if hasattr(self.preprocessor, 'id2label'): self.id2label = self.preprocessor.id2label diff --git a/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py b/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py index 9cd27adc..18ba40c8 100644 --- a/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py +++ b/modelscope/pipelines/nlp/zero_shot_classification_pipeline.py @@ -67,7 +67,8 @@ class ZeroShotClassificationPipeline(Pipeline): config_file=config_file, device=device, auto_collate=auto_collate, - **kwargs) + compile=kwargs.pop('compile', False), + compile_options=kwargs.pop('compile_options', {})) self.entailment_id = 0 self.contradiction_id = 2