diff --git a/modelscope/models/cv/object_detection/mmdet_model.py b/modelscope/models/cv/object_detection/mmdet_model.py index cc01b60c..53745f75 100644 --- a/modelscope/models/cv/object_detection/mmdet_model.py +++ b/modelscope/models/cv/object_detection/mmdet_model.py @@ -15,7 +15,8 @@ from .mmdet_ms.roi_heads import FCNMaskNHead, Shared4Conv1FCBBoxNHead @MODELS.register_module(Tasks.human_detection, module_name=Models.detection) -@MODELS.register_module(Tasks.object_detection, module_name=Models.detection) +@MODELS.register_module( + Tasks.image_object_detection, module_name=Models.detection) class DetectionModel(TorchModel): def __init__(self, model_dir: str, *args, **kwargs): diff --git a/modelscope/pipelines/builder.py b/modelscope/pipelines/builder.py index 577a7b57..6e2f9c14 100644 --- a/modelscope/pipelines/builder.py +++ b/modelscope/pipelines/builder.py @@ -37,8 +37,8 @@ DEFAULT_MODEL_FOR_PIPELINE = { 'damo/cv_unet_image-matting'), Tasks.human_detection: (Pipelines.human_detection, 'damo/cv_resnet18_human-detection'), - Tasks.object_detection: (Pipelines.object_detection, - 'damo/cv_vit_object-detection_coco'), + Tasks.image_object_detection: (Pipelines.object_detection, + 'damo/cv_vit_object-detection_coco'), Tasks.image_denoise: (Pipelines.image_denoise, 'damo/cv_nafnet_image-denoise_sidd'), Tasks.text_classification: (Pipelines.sentiment_analysis, diff --git a/modelscope/pipelines/cv/__init__.py b/modelscope/pipelines/cv/__init__.py index 655e9f85..ee081fee 100644 --- a/modelscope/pipelines/cv/__init__.py +++ b/modelscope/pipelines/cv/__init__.py @@ -7,7 +7,7 @@ if TYPE_CHECKING: from .action_recognition_pipeline import ActionRecognitionPipeline from .animal_recognition_pipeline import AnimalRecognitionPipeline from .cmdssl_video_embedding_pipeline import CMDSSLVideoEmbeddingPipeline - from .object_detection_pipeline import ObjectDetectionPipeline + from .image_detection_pipeline import ImageDetectionPipeline from .face_detection_pipeline import FaceDetectionPipeline from .face_recognition_pipeline import FaceRecognitionPipeline from .face_image_generation_pipeline import FaceImageGenerationPipeline @@ -33,7 +33,7 @@ else: 'action_recognition_pipeline': ['ActionRecognitionPipeline'], 'animal_recognition_pipeline': ['AnimalRecognitionPipeline'], 'cmdssl_video_embedding_pipeline': ['CMDSSLVideoEmbeddingPipeline'], - 'object_detection_pipeline': ['ObjectDetectionPipeline'], + 'image_detection_pipeline': ['ImageDetectionPipeline'], 'face_detection_pipeline': ['FaceDetectionPipeline'], 'face_image_generation_pipeline': ['FaceImageGenerationPipeline'], 'face_recognition_pipeline': ['FaceRecognitionPipeline'], diff --git a/modelscope/pipelines/cv/object_detection_pipeline.py b/modelscope/pipelines/cv/image_detection_pipeline.py similarity index 92% rename from modelscope/pipelines/cv/object_detection_pipeline.py rename to modelscope/pipelines/cv/image_detection_pipeline.py index a604fb17..8df10d45 100644 --- a/modelscope/pipelines/cv/object_detection_pipeline.py +++ b/modelscope/pipelines/cv/image_detection_pipeline.py @@ -14,8 +14,8 @@ from modelscope.utils.logger import get_logger @PIPELINES.register_module( Tasks.human_detection, module_name=Pipelines.human_detection) @PIPELINES.register_module( - Tasks.object_detection, module_name=Pipelines.object_detection) -class ObjectDetectionPipeline(Pipeline): + Tasks.image_object_detection, module_name=Pipelines.object_detection) +class ImageDetectionPipeline(Pipeline): def __init__(self, model: str, **kwargs): """ diff --git a/modelscope/utils/constant.py b/modelscope/utils/constant.py index 25f6e5f8..0cc43e00 100644 --- a/modelscope/utils/constant.py +++ b/modelscope/utils/constant.py @@ -20,6 +20,7 @@ class CVTasks(object): image_classification = 'image-classification' image_tagging = 'image-tagging' object_detection = 'object-detection' + image_object_detection = 'image-object-detection' human_detection = 'human-detection' image_segmentation = 'image-segmentation' image_editing = 'image-editing' diff --git a/tests/pipelines/test_object_detection.py b/tests/pipelines/test_object_detection.py index 8e4630a3..f3819ab7 100644 --- a/tests/pipelines/test_object_detection.py +++ b/tests/pipelines/test_object_detection.py @@ -13,7 +13,7 @@ class ObjectDetectionTest(unittest.TestCase): def test_object_detection(self): input_location = 'data/test/images/image_detection.jpg' model_id = 'damo/cv_vit_object-detection_coco' - object_detect = pipeline(Tasks.object_detection, model=model_id) + object_detect = pipeline(Tasks.image_object_detection, model=model_id) result = object_detect(input_location) if result: print(result) @@ -23,7 +23,7 @@ class ObjectDetectionTest(unittest.TestCase): @unittest.skipUnless(test_level() >= 2, 'skip test in current test level') def test_object_detection_with_default_task(self): input_location = 'data/test/images/image_detection.jpg' - object_detect = pipeline(Tasks.object_detection) + object_detect = pipeline(Tasks.image_object_detection) result = object_detect(input_location) if result: print(result)